From 3016f72851213659656c6ce2cd2dcee6625b06bb Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 25 Sep 2013 23:28:16 -0600 Subject: Fix CheckIfInOutsideMap comments. Pointed out by 80C. --- main.asm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.asm b/main.asm index b6aa60b8..254806ff 100644 --- a/main.asm +++ b/main.asm @@ -928,7 +928,7 @@ WarpFound2: ; 073c (0:073c) ld [$d73b],a ; save ID of used warp ld a,[W_CURMAP] ld [$d73c],a - call CheckIfInOutsideMap ; check if the tileset number is 0 or the map is Route 12 + call CheckIfInOutsideMap jr nz,.indoorMaps ; this is for handling "outside" maps that can't have the 0xFF destination map ld a,[W_CURMAP] @@ -1144,13 +1144,12 @@ PlayMapChangeSound: ; 08c9 (0:08c9) ret nz jp GBFadeIn1 -; function to set the Z flag if the tileset number is 0 or the map is Route 12 -; strangely, Route 12 has tileset 0, so the check is redundant CheckIfInOutsideMap: ; 08e1 (0:08e1) +; If the player is in an outside map (a town or route), set the z flag ld a,[W_CURMAPTILESET] - and a + and a ; most towns/routes have tileset 0 ret z - cp a,ROUTE_12 + cp a,$17 ; Route 23 / Indigo Plateau ret ; this function is an extra check that sometimes has to pass in order to warp, beyond just standing on a warp -- cgit v1.2.3 From 8edfcc4b1e36111d400b5f104a04001c66416426 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sat, 12 Oct 2013 14:40:37 -0400 Subject: All music and sfx --- Makefile | 2 +- constants.asm | 285 +- main.asm | 2485 +++++- music.asm | 13268 ---------------------------- music/bikeriding.asm | 705 ++ music/blue/sfx_1f_5d.asm | 52 + music/celadon.asm | 412 + music/cinnabar.asm | 355 + music/cinnabarmansion.asm | 173 + music/cities1.asm | 658 ++ music/cities2.asm | 417 + music/credits.asm | 821 ++ music/defeatedgymleader.asm | 608 ++ music/defeatedtrainer.asm | 267 + music/defeatedwildmon.asm | 303 + music/dungeon1.asm | 676 ++ music/dungeon2.asm | 318 + music/dungeon3.asm | 757 ++ music/finalbattle.asm | 1345 +++ music/gamecorner.asm | 628 ++ music/gym.asm | 358 + music/gymleaderbattle.asm | 1401 +++ music/halloffame.asm | 97 + music/headers/musicheaders02.asm | 186 + music/headers/musicheaders08.asm | 57 + music/headers/musicheaders1f.asm | 160 + music/headers/sfxheaders02.asm | 564 ++ music/headers/sfxheaders08.asm | 708 ++ music/headers/sfxheaders1f.asm | 598 ++ music/indigoplateau.asm | 322 + music/introbattle.asm | 330 + music/jigglypuffsong.asm | 41 + music/lavender.asm | 200 + music/meeteviltrainer.asm | 81 + music/meetfemaletrainer.asm | 119 + music/meetmaletrainer.asm | 191 + music/meetprofoak.asm | 424 + music/meetrival.asm | 395 + music/museumguy.asm | 338 + music/oakslab.asm | 394 + music/pallettown.asm | 315 + music/pkmnhealed.asm | 48 + music/pokecenter.asm | 376 + music/pokemontower.asm | 459 + music/pokeredmusicdisasm/AbstractData.cpp | 37 - music/pokeredmusicdisasm/AbstractData.h | 23 - music/pokeredmusicdisasm/Call.cpp | 71 - music/pokeredmusicdisasm/Call.h | 34 - music/pokeredmusicdisasm/Console.cpp | 45 - music/pokeredmusicdisasm/Console.h | 41 - music/pokeredmusicdisasm/Duty.cpp | 93 - music/pokeredmusicdisasm/Duty.h | 40 - music/pokeredmusicdisasm/File.h | 26 - music/pokeredmusicdisasm/Jump.cpp | 83 - music/pokeredmusicdisasm/Jump.h | 33 - music/pokeredmusicdisasm/Makefile | 68 - music/pokeredmusicdisasm/Modulation.cpp | 96 - music/pokeredmusicdisasm/Modulation.h | 37 - music/pokeredmusicdisasm/Note.cpp | 174 - music/pokeredmusicdisasm/Note.h | 73 - music/pokeredmusicdisasm/Octave.cpp | 97 - music/pokeredmusicdisasm/Octave.h | 43 - music/pokeredmusicdisasm/Parser.cpp | 300 - music/pokeredmusicdisasm/Parser.h | 93 - music/pokeredmusicdisasm/README.txt | 26 - music/pokeredmusicdisasm/Stop.cpp | 47 - music/pokeredmusicdisasm/Stop.h | 21 - music/pokeredmusicdisasm/Tempo.cpp | 80 - music/pokeredmusicdisasm/Tempo.h | 32 - music/pokeredmusicdisasm/UnkCode.cpp | 55 - music/pokeredmusicdisasm/UnkCode.h | 29 - music/pokeredmusicdisasm/UnkEB.cpp | 57 - music/pokeredmusicdisasm/UnkEB.h | 29 - music/pokeredmusicdisasm/Velocity.cpp | 82 - music/pokeredmusicdisasm/Velocity.h | 32 - music/pokeredmusicdisasm/Volume.cpp | 67 - music/pokeredmusicdisasm/Volume.h | 28 - music/pokeredmusicdisasm/args.cpp | 93 - music/pokeredmusicdisasm/args.h | 38 - music/pokeredmusicdisasm/main.cpp | 122 - music/pokeredwavptnvis/Console.cpp | 54 - music/pokeredwavptnvis/Console.h | 29 - music/pokeredwavptnvis/Makefile | 18 - music/pokeredwavptnvis/README.txt | 17 - music/pokeredwavptnvis/main.cpp | 156 - music/routes1.asm | 405 + music/routes2.asm | 426 + music/routes3.asm | 516 ++ music/routes4.asm | 682 ++ music/safarizone.asm | 112 + music/sfx/sfx_02_01.asm | 6 + music/sfx/sfx_02_02.asm | 6 + music/sfx/sfx_02_03.asm | 6 + music/sfx/sfx_02_04.asm | 6 + music/sfx/sfx_02_05.asm | 21 + music/sfx/sfx_02_06.asm | 6 + music/sfx/sfx_02_07.asm | 9 + music/sfx/sfx_02_08.asm | 6 + music/sfx/sfx_02_09.asm | 6 + music/sfx/sfx_02_0a.asm | 6 + music/sfx/sfx_02_0b.asm | 6 + music/sfx/sfx_02_0c.asm | 6 + music/sfx/sfx_02_0d.asm | 6 + music/sfx/sfx_02_0e.asm | 6 + music/sfx/sfx_02_0f.asm | 9 + music/sfx/sfx_02_10.asm | 9 + music/sfx/sfx_02_11.asm | 6 + music/sfx/sfx_02_12.asm | 6 + music/sfx/sfx_02_13.asm | 6 + music/sfx/sfx_02_14.asm | 46 + music/sfx/sfx_02_15.asm | 55 + music/sfx/sfx_02_16.asm | 35 + music/sfx/sfx_02_17.asm | 78 + music/sfx/sfx_02_18.asm | 81 + music/sfx/sfx_02_19.asm | 42 + music/sfx/sfx_02_1a.asm | 51 + music/sfx/sfx_02_1b.asm | 45 + music/sfx/sfx_02_1c.asm | 51 + music/sfx/sfx_02_1d.asm | 83 + music/sfx/sfx_02_1e.asm | 94 + music/sfx/sfx_02_1f.asm | 98 + music/sfx/sfx_02_20.asm | 80 + music/sfx/sfx_02_21.asm | 106 + music/sfx/sfx_02_22.asm | 54 + music/sfx/sfx_02_23.asm | 75 + music/sfx/sfx_02_24.asm | 83 + music/sfx/sfx_02_25.asm | 87 + music/sfx/sfx_02_26.asm | 52 + music/sfx/sfx_02_27.asm | 74 + music/sfx/sfx_02_28.asm | 44 + music/sfx/sfx_02_29.asm | 76 + music/sfx/sfx_02_2a.asm | 44 + music/sfx/sfx_02_2b.asm | 56 + music/sfx/sfx_02_2c.asm | 90 + music/sfx/sfx_02_2d.asm | 38 + music/sfx/sfx_02_2e.asm | 74 + music/sfx/sfx_02_2f.asm | 61 + music/sfx/sfx_02_30.asm | 80 + music/sfx/sfx_02_31.asm | 72 + music/sfx/sfx_02_32.asm | 105 + music/sfx/sfx_02_33.asm | 54 + music/sfx/sfx_02_34.asm | 53 + music/sfx/sfx_02_35.asm | 71 + music/sfx/sfx_02_36.asm | 56 + music/sfx/sfx_02_37.asm | 59 + music/sfx/sfx_02_38.asm | 88 + music/sfx/sfx_02_39.asm | 63 + music/sfx/sfx_02_3a.asm | 48 + music/sfx/sfx_02_3b.asm | 70 + music/sfx/sfx_02_3c.asm | 18 + music/sfx/sfx_02_3d.asm | 15 + music/sfx/sfx_02_3e.asm | 22 + music/sfx/sfx_02_3f.asm | 9 + music/sfx/sfx_02_40.asm | 18 + music/sfx/sfx_02_41.asm | 78 + music/sfx/sfx_02_42.asm | 60 + music/sfx/sfx_02_43.asm | 17 + music/sfx/sfx_02_44.asm | 15 + music/sfx/sfx_02_45.asm | 44 + music/sfx/sfx_02_46.asm | 17 + music/sfx/sfx_02_47.asm | 18 + music/sfx/sfx_02_48.asm | 27 + music/sfx/sfx_02_49.asm | 24 + music/sfx/sfx_02_4a.asm | 22 + music/sfx/sfx_02_4b.asm | 27 + music/sfx/sfx_02_4c.asm | 27 + music/sfx/sfx_02_4d.asm | 11 + music/sfx/sfx_02_4e.asm | 12 + music/sfx/sfx_02_4f.asm | 15 + music/sfx/sfx_02_50.asm | 50 + music/sfx/sfx_02_51.asm | 41 + music/sfx/sfx_02_52.asm | 11 + music/sfx/sfx_02_53.asm | 27 + music/sfx/sfx_02_54.asm | 55 + music/sfx/sfx_02_55.asm | 30 + music/sfx/sfx_02_56.asm | 18 + music/sfx/sfx_02_57.asm | 8 + music/sfx/sfx_02_58.asm | 21 + music/sfx/sfx_02_59.asm | 21 + music/sfx/sfx_02_5a.asm | 29 + music/sfx/sfx_02_5b.asm | 12 + music/sfx/sfx_02_5c.asm | 18 + music/sfx/sfx_02_5d.asm | 67 + music/sfx/sfx_02_5e.asm | 22 + music/sfx/sfx_02_5f.asm | 28 + music/sfx/sfx_08_01.asm | 6 + music/sfx/sfx_08_02.asm | 6 + music/sfx/sfx_08_03.asm | 6 + music/sfx/sfx_08_04.asm | 6 + music/sfx/sfx_08_05.asm | 21 + music/sfx/sfx_08_06.asm | 6 + music/sfx/sfx_08_07.asm | 9 + music/sfx/sfx_08_08.asm | 6 + music/sfx/sfx_08_09.asm | 6 + music/sfx/sfx_08_0a.asm | 6 + music/sfx/sfx_08_0b.asm | 6 + music/sfx/sfx_08_0c.asm | 6 + music/sfx/sfx_08_0d.asm | 6 + music/sfx/sfx_08_0e.asm | 6 + music/sfx/sfx_08_0f.asm | 9 + music/sfx/sfx_08_10.asm | 9 + music/sfx/sfx_08_11.asm | 6 + music/sfx/sfx_08_12.asm | 6 + music/sfx/sfx_08_13.asm | 6 + music/sfx/sfx_08_14.asm | 46 + music/sfx/sfx_08_15.asm | 55 + music/sfx/sfx_08_16.asm | 35 + music/sfx/sfx_08_17.asm | 78 + music/sfx/sfx_08_18.asm | 81 + music/sfx/sfx_08_19.asm | 42 + music/sfx/sfx_08_1a.asm | 51 + music/sfx/sfx_08_1b.asm | 45 + music/sfx/sfx_08_1c.asm | 51 + music/sfx/sfx_08_1d.asm | 83 + music/sfx/sfx_08_1e.asm | 94 + music/sfx/sfx_08_1f.asm | 98 + music/sfx/sfx_08_20.asm | 80 + music/sfx/sfx_08_21.asm | 106 + music/sfx/sfx_08_22.asm | 54 + music/sfx/sfx_08_23.asm | 75 + music/sfx/sfx_08_24.asm | 83 + music/sfx/sfx_08_25.asm | 87 + music/sfx/sfx_08_26.asm | 52 + music/sfx/sfx_08_27.asm | 74 + music/sfx/sfx_08_28.asm | 44 + music/sfx/sfx_08_29.asm | 76 + music/sfx/sfx_08_2a.asm | 44 + music/sfx/sfx_08_2b.asm | 56 + music/sfx/sfx_08_2c.asm | 90 + music/sfx/sfx_08_2d.asm | 38 + music/sfx/sfx_08_2e.asm | 74 + music/sfx/sfx_08_2f.asm | 61 + music/sfx/sfx_08_30.asm | 80 + music/sfx/sfx_08_31.asm | 72 + music/sfx/sfx_08_32.asm | 105 + music/sfx/sfx_08_33.asm | 54 + music/sfx/sfx_08_34.asm | 53 + music/sfx/sfx_08_35.asm | 71 + music/sfx/sfx_08_36.asm | 56 + music/sfx/sfx_08_37.asm | 59 + music/sfx/sfx_08_38.asm | 88 + music/sfx/sfx_08_39.asm | 63 + music/sfx/sfx_08_3a.asm | 64 + music/sfx/sfx_08_3b.asm | 70 + music/sfx/sfx_08_3c.asm | 18 + music/sfx/sfx_08_3d.asm | 15 + music/sfx/sfx_08_3e.asm | 22 + music/sfx/sfx_08_3f.asm | 9 + music/sfx/sfx_08_40.asm | 18 + music/sfx/sfx_08_41.asm | 19 + music/sfx/sfx_08_42.asm | 19 + music/sfx/sfx_08_43.asm | 21 + music/sfx/sfx_08_44.asm | 36 + music/sfx/sfx_08_45.asm | 30 + music/sfx/sfx_08_46.asm | 62 + music/sfx/sfx_08_47.asm | 6 + music/sfx/sfx_08_48.asm | 12 + music/sfx/sfx_08_49.asm | 12 + music/sfx/sfx_08_4a.asm | 6 + music/sfx/sfx_08_4b.asm | 6 + music/sfx/sfx_08_4c.asm | 7 + music/sfx/sfx_08_4d.asm | 12 + music/sfx/sfx_08_4e.asm | 9 + music/sfx/sfx_08_4f.asm | 15 + music/sfx/sfx_08_50.asm | 12 + music/sfx/sfx_08_51.asm | 15 + music/sfx/sfx_08_52.asm | 13 + music/sfx/sfx_08_53.asm | 15 + music/sfx/sfx_08_54.asm | 4 + music/sfx/sfx_08_55.asm | 27 + music/sfx/sfx_08_56.asm | 12 + music/sfx/sfx_08_57.asm | 15 + music/sfx/sfx_08_58.asm | 4 + music/sfx/sfx_08_59.asm | 12 + music/sfx/sfx_08_5a.asm | 9 + music/sfx/sfx_08_5b.asm | 9 + music/sfx/sfx_08_5c.asm | 12 + music/sfx/sfx_08_5d.asm | 9 + music/sfx/sfx_08_5e.asm | 32 + music/sfx/sfx_08_5f.asm | 15 + music/sfx/sfx_08_60.asm | 9 + music/sfx/sfx_08_61.asm | 18 + music/sfx/sfx_08_62.asm | 8 + music/sfx/sfx_08_63.asm | 18 + music/sfx/sfx_08_64.asm | 22 + music/sfx/sfx_08_65.asm | 18 + music/sfx/sfx_08_66.asm | 4 + music/sfx/sfx_08_67.asm | 48 + music/sfx/sfx_08_68.asm | 36 + music/sfx/sfx_08_69.asm | 40 + music/sfx/sfx_08_6a.asm | 62 + music/sfx/sfx_08_6b.asm | 51 + music/sfx/sfx_08_6c.asm | 52 + music/sfx/sfx_08_6d.asm | 52 + music/sfx/sfx_08_6e.asm | 55 + music/sfx/sfx_08_6f.asm | 31 + music/sfx/sfx_08_70.asm | 83 + music/sfx/sfx_08_71.asm | 30 + music/sfx/sfx_08_72.asm | 21 + music/sfx/sfx_08_73.asm | 49 + music/sfx/sfx_08_74.asm | 38 + music/sfx/sfx_08_75.asm | 30 + music/sfx/sfx_08_76.asm | 132 + music/sfx/sfx_08_77.asm | 24 + music/sfx/sfx_1f_01.asm | 6 + music/sfx/sfx_1f_02.asm | 6 + music/sfx/sfx_1f_03.asm | 6 + music/sfx/sfx_1f_04.asm | 6 + music/sfx/sfx_1f_05.asm | 21 + music/sfx/sfx_1f_06.asm | 6 + music/sfx/sfx_1f_07.asm | 9 + music/sfx/sfx_1f_08.asm | 6 + music/sfx/sfx_1f_09.asm | 6 + music/sfx/sfx_1f_0a.asm | 6 + music/sfx/sfx_1f_0b.asm | 6 + music/sfx/sfx_1f_0c.asm | 6 + music/sfx/sfx_1f_0d.asm | 6 + music/sfx/sfx_1f_0e.asm | 6 + music/sfx/sfx_1f_0f.asm | 9 + music/sfx/sfx_1f_10.asm | 9 + music/sfx/sfx_1f_11.asm | 6 + music/sfx/sfx_1f_12.asm | 6 + music/sfx/sfx_1f_13.asm | 6 + music/sfx/sfx_1f_14.asm | 46 + music/sfx/sfx_1f_15.asm | 55 + music/sfx/sfx_1f_16.asm | 35 + music/sfx/sfx_1f_17.asm | 78 + music/sfx/sfx_1f_18.asm | 81 + music/sfx/sfx_1f_19.asm | 42 + music/sfx/sfx_1f_1a.asm | 51 + music/sfx/sfx_1f_1b.asm | 45 + music/sfx/sfx_1f_1c.asm | 51 + music/sfx/sfx_1f_1d.asm | 83 + music/sfx/sfx_1f_1e.asm | 94 + music/sfx/sfx_1f_1f.asm | 98 + music/sfx/sfx_1f_20.asm | 80 + music/sfx/sfx_1f_21.asm | 106 + music/sfx/sfx_1f_22.asm | 54 + music/sfx/sfx_1f_23.asm | 75 + music/sfx/sfx_1f_24.asm | 83 + music/sfx/sfx_1f_25.asm | 87 + music/sfx/sfx_1f_26.asm | 52 + music/sfx/sfx_1f_27.asm | 74 + music/sfx/sfx_1f_28.asm | 44 + music/sfx/sfx_1f_29.asm | 76 + music/sfx/sfx_1f_2a.asm | 44 + music/sfx/sfx_1f_2b.asm | 56 + music/sfx/sfx_1f_2c.asm | 90 + music/sfx/sfx_1f_2d.asm | 38 + music/sfx/sfx_1f_2e.asm | 74 + music/sfx/sfx_1f_2f.asm | 61 + music/sfx/sfx_1f_30.asm | 80 + music/sfx/sfx_1f_31.asm | 72 + music/sfx/sfx_1f_32.asm | 105 + music/sfx/sfx_1f_33.asm | 54 + music/sfx/sfx_1f_34.asm | 53 + music/sfx/sfx_1f_35.asm | 71 + music/sfx/sfx_1f_36.asm | 56 + music/sfx/sfx_1f_37.asm | 59 + music/sfx/sfx_1f_38.asm | 88 + music/sfx/sfx_1f_39.asm | 63 + music/sfx/sfx_1f_3a.asm | 48 + music/sfx/sfx_1f_3b.asm | 70 + music/sfx/sfx_1f_3c.asm | 18 + music/sfx/sfx_1f_3d.asm | 15 + music/sfx/sfx_1f_3e.asm | 22 + music/sfx/sfx_1f_3f.asm | 9 + music/sfx/sfx_1f_40.asm | 18 + music/sfx/sfx_1f_41.asm | 78 + music/sfx/sfx_1f_42.asm | 60 + music/sfx/sfx_1f_43.asm | 17 + music/sfx/sfx_1f_44.asm | 15 + music/sfx/sfx_1f_45.asm | 48 + music/sfx/sfx_1f_46.asm | 17 + music/sfx/sfx_1f_47.asm | 18 + music/sfx/sfx_1f_48.asm | 27 + music/sfx/sfx_1f_49.asm | 24 + music/sfx/sfx_1f_4a.asm | 22 + music/sfx/sfx_1f_4b.asm | 27 + music/sfx/sfx_1f_4c.asm | 27 + music/sfx/sfx_1f_4d.asm | 11 + music/sfx/sfx_1f_4e.asm | 12 + music/sfx/sfx_1f_4f.asm | 15 + music/sfx/sfx_1f_50.asm | 50 + music/sfx/sfx_1f_51.asm | 41 + music/sfx/sfx_1f_52.asm | 11 + music/sfx/sfx_1f_53.asm | 27 + music/sfx/sfx_1f_54.asm | 55 + music/sfx/sfx_1f_55.asm | 30 + music/sfx/sfx_1f_56.asm | 18 + music/sfx/sfx_1f_57.asm | 8 + music/sfx/sfx_1f_58.asm | 21 + music/sfx/sfx_1f_59.asm | 21 + music/sfx/sfx_1f_5a.asm | 29 + music/sfx/sfx_1f_5b.asm | 12 + music/sfx/sfx_1f_5c.asm | 18 + music/sfx/sfx_1f_5d.asm | 52 + music/sfx/sfx_1f_5e.asm | 26 + music/sfx/sfx_1f_5f.asm | 12 + music/sfx/sfx_1f_60.asm | 12 + music/sfx/sfx_1f_61.asm | 12 + music/sfx/sfx_1f_62.asm | 8 + music/sfx/sfx_1f_63.asm | 17 + music/sfx/sfx_1f_64.asm | 16 + music/sfx/sfx_1f_65.asm | 12 + music/sfx/sfx_1f_66.asm | 32 + music/sfx/sfx_1f_67.asm | 44 + music/silphco.asm | 1001 +++ music/ssanne.asm | 339 + music/surfing.asm | 336 + music/titlescreen.asm | 678 ++ music/trainerbattle.asm | 1858 ++++ music/unusedsong.asm | 339 + music/vermilion.asm | 324 + music/wildbattle.asm | 739 ++ music/yellow/intro.asm | 485 + music/yellow/meetjessiejames.asm | 310 + music/yellow/surfingpikachu.asm | 691 ++ music/yellow/yellowunusedsong.asm | 327 + textpre.py | 8 +- 420 files changed, 40527 insertions(+), 16349 deletions(-) delete mode 100644 music.asm create mode 100644 music/bikeriding.asm create mode 100644 music/blue/sfx_1f_5d.asm create mode 100644 music/celadon.asm create mode 100644 music/cinnabar.asm create mode 100644 music/cinnabarmansion.asm create mode 100644 music/cities1.asm create mode 100644 music/cities2.asm create mode 100644 music/credits.asm create mode 100644 music/defeatedgymleader.asm create mode 100644 music/defeatedtrainer.asm create mode 100644 music/defeatedwildmon.asm create mode 100644 music/dungeon1.asm create mode 100644 music/dungeon2.asm create mode 100644 music/dungeon3.asm create mode 100644 music/finalbattle.asm create mode 100644 music/gamecorner.asm create mode 100644 music/gym.asm create mode 100644 music/gymleaderbattle.asm create mode 100644 music/halloffame.asm create mode 100644 music/headers/musicheaders02.asm create mode 100644 music/headers/musicheaders08.asm create mode 100644 music/headers/musicheaders1f.asm create mode 100644 music/headers/sfxheaders02.asm create mode 100644 music/headers/sfxheaders08.asm create mode 100644 music/headers/sfxheaders1f.asm create mode 100644 music/indigoplateau.asm create mode 100644 music/introbattle.asm create mode 100644 music/jigglypuffsong.asm create mode 100644 music/lavender.asm create mode 100644 music/meeteviltrainer.asm create mode 100644 music/meetfemaletrainer.asm create mode 100644 music/meetmaletrainer.asm create mode 100644 music/meetprofoak.asm create mode 100644 music/meetrival.asm create mode 100644 music/museumguy.asm create mode 100644 music/oakslab.asm create mode 100644 music/pallettown.asm create mode 100644 music/pkmnhealed.asm create mode 100644 music/pokecenter.asm create mode 100644 music/pokemontower.asm delete mode 100644 music/pokeredmusicdisasm/AbstractData.cpp delete mode 100644 music/pokeredmusicdisasm/AbstractData.h delete mode 100644 music/pokeredmusicdisasm/Call.cpp delete mode 100644 music/pokeredmusicdisasm/Call.h delete mode 100644 music/pokeredmusicdisasm/Console.cpp delete mode 100644 music/pokeredmusicdisasm/Console.h delete mode 100644 music/pokeredmusicdisasm/Duty.cpp delete mode 100644 music/pokeredmusicdisasm/Duty.h delete mode 100644 music/pokeredmusicdisasm/File.h delete mode 100644 music/pokeredmusicdisasm/Jump.cpp delete mode 100644 music/pokeredmusicdisasm/Jump.h delete mode 100644 music/pokeredmusicdisasm/Makefile delete mode 100644 music/pokeredmusicdisasm/Modulation.cpp delete mode 100644 music/pokeredmusicdisasm/Modulation.h delete mode 100644 music/pokeredmusicdisasm/Note.cpp delete mode 100644 music/pokeredmusicdisasm/Note.h delete mode 100644 music/pokeredmusicdisasm/Octave.cpp delete mode 100644 music/pokeredmusicdisasm/Octave.h delete mode 100644 music/pokeredmusicdisasm/Parser.cpp delete mode 100644 music/pokeredmusicdisasm/Parser.h delete mode 100644 music/pokeredmusicdisasm/README.txt delete mode 100644 music/pokeredmusicdisasm/Stop.cpp delete mode 100644 music/pokeredmusicdisasm/Stop.h delete mode 100644 music/pokeredmusicdisasm/Tempo.cpp delete mode 100644 music/pokeredmusicdisasm/Tempo.h delete mode 100644 music/pokeredmusicdisasm/UnkCode.cpp delete mode 100644 music/pokeredmusicdisasm/UnkCode.h delete mode 100644 music/pokeredmusicdisasm/UnkEB.cpp delete mode 100644 music/pokeredmusicdisasm/UnkEB.h delete mode 100644 music/pokeredmusicdisasm/Velocity.cpp delete mode 100644 music/pokeredmusicdisasm/Velocity.h delete mode 100644 music/pokeredmusicdisasm/Volume.cpp delete mode 100644 music/pokeredmusicdisasm/Volume.h delete mode 100644 music/pokeredmusicdisasm/args.cpp delete mode 100644 music/pokeredmusicdisasm/args.h delete mode 100644 music/pokeredmusicdisasm/main.cpp delete mode 100644 music/pokeredwavptnvis/Console.cpp delete mode 100644 music/pokeredwavptnvis/Console.h delete mode 100644 music/pokeredwavptnvis/Makefile delete mode 100644 music/pokeredwavptnvis/README.txt delete mode 100644 music/pokeredwavptnvis/main.cpp create mode 100644 music/routes1.asm create mode 100644 music/routes2.asm create mode 100644 music/routes3.asm create mode 100644 music/routes4.asm create mode 100644 music/safarizone.asm create mode 100644 music/sfx/sfx_02_01.asm create mode 100644 music/sfx/sfx_02_02.asm create mode 100644 music/sfx/sfx_02_03.asm create mode 100644 music/sfx/sfx_02_04.asm create mode 100644 music/sfx/sfx_02_05.asm create mode 100644 music/sfx/sfx_02_06.asm create mode 100644 music/sfx/sfx_02_07.asm create mode 100644 music/sfx/sfx_02_08.asm create mode 100644 music/sfx/sfx_02_09.asm create mode 100644 music/sfx/sfx_02_0a.asm create mode 100644 music/sfx/sfx_02_0b.asm create mode 100644 music/sfx/sfx_02_0c.asm create mode 100644 music/sfx/sfx_02_0d.asm create mode 100644 music/sfx/sfx_02_0e.asm create mode 100644 music/sfx/sfx_02_0f.asm create mode 100644 music/sfx/sfx_02_10.asm create mode 100644 music/sfx/sfx_02_11.asm create mode 100644 music/sfx/sfx_02_12.asm create mode 100644 music/sfx/sfx_02_13.asm create mode 100644 music/sfx/sfx_02_14.asm create mode 100644 music/sfx/sfx_02_15.asm create mode 100644 music/sfx/sfx_02_16.asm create mode 100644 music/sfx/sfx_02_17.asm create mode 100644 music/sfx/sfx_02_18.asm create mode 100644 music/sfx/sfx_02_19.asm create mode 100644 music/sfx/sfx_02_1a.asm create mode 100644 music/sfx/sfx_02_1b.asm create mode 100644 music/sfx/sfx_02_1c.asm create mode 100644 music/sfx/sfx_02_1d.asm create mode 100644 music/sfx/sfx_02_1e.asm create mode 100644 music/sfx/sfx_02_1f.asm create mode 100644 music/sfx/sfx_02_20.asm create mode 100644 music/sfx/sfx_02_21.asm create mode 100644 music/sfx/sfx_02_22.asm create mode 100644 music/sfx/sfx_02_23.asm create mode 100644 music/sfx/sfx_02_24.asm create mode 100644 music/sfx/sfx_02_25.asm create mode 100644 music/sfx/sfx_02_26.asm create mode 100644 music/sfx/sfx_02_27.asm create mode 100644 music/sfx/sfx_02_28.asm create mode 100644 music/sfx/sfx_02_29.asm create mode 100644 music/sfx/sfx_02_2a.asm create mode 100644 music/sfx/sfx_02_2b.asm create mode 100644 music/sfx/sfx_02_2c.asm create mode 100644 music/sfx/sfx_02_2d.asm create mode 100644 music/sfx/sfx_02_2e.asm create mode 100644 music/sfx/sfx_02_2f.asm create mode 100644 music/sfx/sfx_02_30.asm create mode 100644 music/sfx/sfx_02_31.asm create mode 100644 music/sfx/sfx_02_32.asm create mode 100644 music/sfx/sfx_02_33.asm create mode 100644 music/sfx/sfx_02_34.asm create mode 100644 music/sfx/sfx_02_35.asm create mode 100644 music/sfx/sfx_02_36.asm create mode 100644 music/sfx/sfx_02_37.asm create mode 100644 music/sfx/sfx_02_38.asm create mode 100644 music/sfx/sfx_02_39.asm create mode 100644 music/sfx/sfx_02_3a.asm create mode 100644 music/sfx/sfx_02_3b.asm create mode 100644 music/sfx/sfx_02_3c.asm create mode 100644 music/sfx/sfx_02_3d.asm create mode 100644 music/sfx/sfx_02_3e.asm create mode 100644 music/sfx/sfx_02_3f.asm create mode 100644 music/sfx/sfx_02_40.asm create mode 100644 music/sfx/sfx_02_41.asm create mode 100644 music/sfx/sfx_02_42.asm create mode 100644 music/sfx/sfx_02_43.asm create mode 100644 music/sfx/sfx_02_44.asm create mode 100644 music/sfx/sfx_02_45.asm create mode 100644 music/sfx/sfx_02_46.asm create mode 100644 music/sfx/sfx_02_47.asm create mode 100644 music/sfx/sfx_02_48.asm create mode 100644 music/sfx/sfx_02_49.asm create mode 100644 music/sfx/sfx_02_4a.asm create mode 100644 music/sfx/sfx_02_4b.asm create mode 100644 music/sfx/sfx_02_4c.asm create mode 100644 music/sfx/sfx_02_4d.asm create mode 100644 music/sfx/sfx_02_4e.asm create mode 100644 music/sfx/sfx_02_4f.asm create mode 100644 music/sfx/sfx_02_50.asm create mode 100644 music/sfx/sfx_02_51.asm create mode 100644 music/sfx/sfx_02_52.asm create mode 100644 music/sfx/sfx_02_53.asm create mode 100644 music/sfx/sfx_02_54.asm create mode 100644 music/sfx/sfx_02_55.asm create mode 100644 music/sfx/sfx_02_56.asm create mode 100644 music/sfx/sfx_02_57.asm create mode 100644 music/sfx/sfx_02_58.asm create mode 100644 music/sfx/sfx_02_59.asm create mode 100644 music/sfx/sfx_02_5a.asm create mode 100644 music/sfx/sfx_02_5b.asm create mode 100644 music/sfx/sfx_02_5c.asm create mode 100644 music/sfx/sfx_02_5d.asm create mode 100644 music/sfx/sfx_02_5e.asm create mode 100644 music/sfx/sfx_02_5f.asm create mode 100644 music/sfx/sfx_08_01.asm create mode 100644 music/sfx/sfx_08_02.asm create mode 100644 music/sfx/sfx_08_03.asm create mode 100644 music/sfx/sfx_08_04.asm create mode 100644 music/sfx/sfx_08_05.asm create mode 100644 music/sfx/sfx_08_06.asm create mode 100644 music/sfx/sfx_08_07.asm create mode 100644 music/sfx/sfx_08_08.asm create mode 100644 music/sfx/sfx_08_09.asm create mode 100644 music/sfx/sfx_08_0a.asm create mode 100644 music/sfx/sfx_08_0b.asm create mode 100644 music/sfx/sfx_08_0c.asm create mode 100644 music/sfx/sfx_08_0d.asm create mode 100644 music/sfx/sfx_08_0e.asm create mode 100644 music/sfx/sfx_08_0f.asm create mode 100644 music/sfx/sfx_08_10.asm create mode 100644 music/sfx/sfx_08_11.asm create mode 100644 music/sfx/sfx_08_12.asm create mode 100644 music/sfx/sfx_08_13.asm create mode 100644 music/sfx/sfx_08_14.asm create mode 100644 music/sfx/sfx_08_15.asm create mode 100644 music/sfx/sfx_08_16.asm create mode 100644 music/sfx/sfx_08_17.asm create mode 100644 music/sfx/sfx_08_18.asm create mode 100644 music/sfx/sfx_08_19.asm create mode 100644 music/sfx/sfx_08_1a.asm create mode 100644 music/sfx/sfx_08_1b.asm create mode 100644 music/sfx/sfx_08_1c.asm create mode 100644 music/sfx/sfx_08_1d.asm create mode 100644 music/sfx/sfx_08_1e.asm create mode 100644 music/sfx/sfx_08_1f.asm create mode 100644 music/sfx/sfx_08_20.asm create mode 100644 music/sfx/sfx_08_21.asm create mode 100644 music/sfx/sfx_08_22.asm create mode 100644 music/sfx/sfx_08_23.asm create mode 100644 music/sfx/sfx_08_24.asm create mode 100644 music/sfx/sfx_08_25.asm create mode 100644 music/sfx/sfx_08_26.asm create mode 100644 music/sfx/sfx_08_27.asm create mode 100644 music/sfx/sfx_08_28.asm create mode 100644 music/sfx/sfx_08_29.asm create mode 100644 music/sfx/sfx_08_2a.asm create mode 100644 music/sfx/sfx_08_2b.asm create mode 100644 music/sfx/sfx_08_2c.asm create mode 100644 music/sfx/sfx_08_2d.asm create mode 100644 music/sfx/sfx_08_2e.asm create mode 100644 music/sfx/sfx_08_2f.asm create mode 100644 music/sfx/sfx_08_30.asm create mode 100644 music/sfx/sfx_08_31.asm create mode 100644 music/sfx/sfx_08_32.asm create mode 100644 music/sfx/sfx_08_33.asm create mode 100644 music/sfx/sfx_08_34.asm create mode 100644 music/sfx/sfx_08_35.asm create mode 100644 music/sfx/sfx_08_36.asm create mode 100644 music/sfx/sfx_08_37.asm create mode 100644 music/sfx/sfx_08_38.asm create mode 100644 music/sfx/sfx_08_39.asm create mode 100644 music/sfx/sfx_08_3a.asm create mode 100644 music/sfx/sfx_08_3b.asm create mode 100644 music/sfx/sfx_08_3c.asm create mode 100644 music/sfx/sfx_08_3d.asm create mode 100644 music/sfx/sfx_08_3e.asm create mode 100644 music/sfx/sfx_08_3f.asm create mode 100644 music/sfx/sfx_08_40.asm create mode 100644 music/sfx/sfx_08_41.asm create mode 100644 music/sfx/sfx_08_42.asm create mode 100644 music/sfx/sfx_08_43.asm create mode 100644 music/sfx/sfx_08_44.asm create mode 100644 music/sfx/sfx_08_45.asm create mode 100644 music/sfx/sfx_08_46.asm create mode 100644 music/sfx/sfx_08_47.asm create mode 100644 music/sfx/sfx_08_48.asm create mode 100644 music/sfx/sfx_08_49.asm create mode 100644 music/sfx/sfx_08_4a.asm create mode 100644 music/sfx/sfx_08_4b.asm create mode 100644 music/sfx/sfx_08_4c.asm create mode 100644 music/sfx/sfx_08_4d.asm create mode 100644 music/sfx/sfx_08_4e.asm create mode 100644 music/sfx/sfx_08_4f.asm create mode 100644 music/sfx/sfx_08_50.asm create mode 100644 music/sfx/sfx_08_51.asm create mode 100644 music/sfx/sfx_08_52.asm create mode 100644 music/sfx/sfx_08_53.asm create mode 100644 music/sfx/sfx_08_54.asm create mode 100644 music/sfx/sfx_08_55.asm create mode 100644 music/sfx/sfx_08_56.asm create mode 100644 music/sfx/sfx_08_57.asm create mode 100644 music/sfx/sfx_08_58.asm create mode 100644 music/sfx/sfx_08_59.asm create mode 100644 music/sfx/sfx_08_5a.asm create mode 100644 music/sfx/sfx_08_5b.asm create mode 100644 music/sfx/sfx_08_5c.asm create mode 100644 music/sfx/sfx_08_5d.asm create mode 100644 music/sfx/sfx_08_5e.asm create mode 100644 music/sfx/sfx_08_5f.asm create mode 100644 music/sfx/sfx_08_60.asm create mode 100644 music/sfx/sfx_08_61.asm create mode 100644 music/sfx/sfx_08_62.asm create mode 100644 music/sfx/sfx_08_63.asm create mode 100644 music/sfx/sfx_08_64.asm create mode 100644 music/sfx/sfx_08_65.asm create mode 100644 music/sfx/sfx_08_66.asm create mode 100644 music/sfx/sfx_08_67.asm create mode 100644 music/sfx/sfx_08_68.asm create mode 100644 music/sfx/sfx_08_69.asm create mode 100644 music/sfx/sfx_08_6a.asm create mode 100644 music/sfx/sfx_08_6b.asm create mode 100644 music/sfx/sfx_08_6c.asm create mode 100644 music/sfx/sfx_08_6d.asm create mode 100644 music/sfx/sfx_08_6e.asm create mode 100644 music/sfx/sfx_08_6f.asm create mode 100644 music/sfx/sfx_08_70.asm create mode 100644 music/sfx/sfx_08_71.asm create mode 100644 music/sfx/sfx_08_72.asm create mode 100644 music/sfx/sfx_08_73.asm create mode 100644 music/sfx/sfx_08_74.asm create mode 100644 music/sfx/sfx_08_75.asm create mode 100644 music/sfx/sfx_08_76.asm create mode 100644 music/sfx/sfx_08_77.asm create mode 100644 music/sfx/sfx_1f_01.asm create mode 100644 music/sfx/sfx_1f_02.asm create mode 100644 music/sfx/sfx_1f_03.asm create mode 100644 music/sfx/sfx_1f_04.asm create mode 100644 music/sfx/sfx_1f_05.asm create mode 100644 music/sfx/sfx_1f_06.asm create mode 100644 music/sfx/sfx_1f_07.asm create mode 100644 music/sfx/sfx_1f_08.asm create mode 100644 music/sfx/sfx_1f_09.asm create mode 100644 music/sfx/sfx_1f_0a.asm create mode 100644 music/sfx/sfx_1f_0b.asm create mode 100644 music/sfx/sfx_1f_0c.asm create mode 100644 music/sfx/sfx_1f_0d.asm create mode 100644 music/sfx/sfx_1f_0e.asm create mode 100644 music/sfx/sfx_1f_0f.asm create mode 100644 music/sfx/sfx_1f_10.asm create mode 100644 music/sfx/sfx_1f_11.asm create mode 100644 music/sfx/sfx_1f_12.asm create mode 100644 music/sfx/sfx_1f_13.asm create mode 100644 music/sfx/sfx_1f_14.asm create mode 100644 music/sfx/sfx_1f_15.asm create mode 100644 music/sfx/sfx_1f_16.asm create mode 100644 music/sfx/sfx_1f_17.asm create mode 100644 music/sfx/sfx_1f_18.asm create mode 100644 music/sfx/sfx_1f_19.asm create mode 100644 music/sfx/sfx_1f_1a.asm create mode 100644 music/sfx/sfx_1f_1b.asm create mode 100644 music/sfx/sfx_1f_1c.asm create mode 100644 music/sfx/sfx_1f_1d.asm create mode 100644 music/sfx/sfx_1f_1e.asm create mode 100644 music/sfx/sfx_1f_1f.asm create mode 100644 music/sfx/sfx_1f_20.asm create mode 100644 music/sfx/sfx_1f_21.asm create mode 100644 music/sfx/sfx_1f_22.asm create mode 100644 music/sfx/sfx_1f_23.asm create mode 100644 music/sfx/sfx_1f_24.asm create mode 100644 music/sfx/sfx_1f_25.asm create mode 100644 music/sfx/sfx_1f_26.asm create mode 100644 music/sfx/sfx_1f_27.asm create mode 100644 music/sfx/sfx_1f_28.asm create mode 100644 music/sfx/sfx_1f_29.asm create mode 100644 music/sfx/sfx_1f_2a.asm create mode 100644 music/sfx/sfx_1f_2b.asm create mode 100644 music/sfx/sfx_1f_2c.asm create mode 100644 music/sfx/sfx_1f_2d.asm create mode 100644 music/sfx/sfx_1f_2e.asm create mode 100644 music/sfx/sfx_1f_2f.asm create mode 100644 music/sfx/sfx_1f_30.asm create mode 100644 music/sfx/sfx_1f_31.asm create mode 100644 music/sfx/sfx_1f_32.asm create mode 100644 music/sfx/sfx_1f_33.asm create mode 100644 music/sfx/sfx_1f_34.asm create mode 100644 music/sfx/sfx_1f_35.asm create mode 100644 music/sfx/sfx_1f_36.asm create mode 100644 music/sfx/sfx_1f_37.asm create mode 100644 music/sfx/sfx_1f_38.asm create mode 100644 music/sfx/sfx_1f_39.asm create mode 100644 music/sfx/sfx_1f_3a.asm create mode 100644 music/sfx/sfx_1f_3b.asm create mode 100644 music/sfx/sfx_1f_3c.asm create mode 100644 music/sfx/sfx_1f_3d.asm create mode 100644 music/sfx/sfx_1f_3e.asm create mode 100644 music/sfx/sfx_1f_3f.asm create mode 100644 music/sfx/sfx_1f_40.asm create mode 100644 music/sfx/sfx_1f_41.asm create mode 100644 music/sfx/sfx_1f_42.asm create mode 100644 music/sfx/sfx_1f_43.asm create mode 100644 music/sfx/sfx_1f_44.asm create mode 100644 music/sfx/sfx_1f_45.asm create mode 100644 music/sfx/sfx_1f_46.asm create mode 100644 music/sfx/sfx_1f_47.asm create mode 100644 music/sfx/sfx_1f_48.asm create mode 100644 music/sfx/sfx_1f_49.asm create mode 100644 music/sfx/sfx_1f_4a.asm create mode 100644 music/sfx/sfx_1f_4b.asm create mode 100644 music/sfx/sfx_1f_4c.asm create mode 100644 music/sfx/sfx_1f_4d.asm create mode 100644 music/sfx/sfx_1f_4e.asm create mode 100644 music/sfx/sfx_1f_4f.asm create mode 100644 music/sfx/sfx_1f_50.asm create mode 100644 music/sfx/sfx_1f_51.asm create mode 100644 music/sfx/sfx_1f_52.asm create mode 100644 music/sfx/sfx_1f_53.asm create mode 100644 music/sfx/sfx_1f_54.asm create mode 100644 music/sfx/sfx_1f_55.asm create mode 100644 music/sfx/sfx_1f_56.asm create mode 100644 music/sfx/sfx_1f_57.asm create mode 100644 music/sfx/sfx_1f_58.asm create mode 100644 music/sfx/sfx_1f_59.asm create mode 100644 music/sfx/sfx_1f_5a.asm create mode 100644 music/sfx/sfx_1f_5b.asm create mode 100644 music/sfx/sfx_1f_5c.asm create mode 100644 music/sfx/sfx_1f_5d.asm create mode 100644 music/sfx/sfx_1f_5e.asm create mode 100644 music/sfx/sfx_1f_5f.asm create mode 100644 music/sfx/sfx_1f_60.asm create mode 100644 music/sfx/sfx_1f_61.asm create mode 100644 music/sfx/sfx_1f_62.asm create mode 100644 music/sfx/sfx_1f_63.asm create mode 100644 music/sfx/sfx_1f_64.asm create mode 100644 music/sfx/sfx_1f_65.asm create mode 100644 music/sfx/sfx_1f_66.asm create mode 100644 music/sfx/sfx_1f_67.asm create mode 100644 music/silphco.asm create mode 100644 music/ssanne.asm create mode 100644 music/surfing.asm create mode 100644 music/titlescreen.asm create mode 100644 music/trainerbattle.asm create mode 100644 music/unusedsong.asm create mode 100644 music/vermilion.asm create mode 100644 music/wildbattle.asm create mode 100644 music/yellow/intro.asm create mode 100644 music/yellow/meetjessiejames.asm create mode 100644 music/yellow/surfingpikachu.asm create mode 100644 music/yellow/yellowunusedsong.asm diff --git a/Makefile b/Makefile index f481743e..3fd12308 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TEXTFILES := $(shell find ./ -type f -name '*.asm') all: pokered.gbc -pokered.o: pokered.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx} +pokered.o: pokered.tx main.tx constants.tx wram.tx ${TEXTFILES:.asm=.tx} rgbasm -o pokered.o pokered.tx pokeblue.o: pokeblue.tx main.tx constants.tx music.tx wram.tx ${TEXTFILES:.asm=.tx} diff --git a/constants.asm b/constants.asm index 537c3c65..352e14ec 100644 --- a/constants.asm +++ b/constants.asm @@ -3367,146 +3367,193 @@ BRUNOS_ROOM_WIDTH EQU $05 AGATHAS_ROOM_HEIGHT EQU $06 AGATHAS_ROOM_WIDTH EQU $05 -;Sound Constants (Copied from pkms.asm with modifications) -MUSIC EQU 0 -SFX EQU 4 -CH1 EQU 0 -CH2 EQU 1 -CH3 EQU 2 -CH4 EQU 3 +;1_channel EQU $00 +;2_channels EQU $40 +;3_channels EQU $80 +;4_channels EQU $C0 + +CH0 EQU 0 +CH1 EQU 1 +CH2 EQU 2 +CH3 EQU 3 +CH4 EQU 4 +CH5 EQU 5 +CH6 EQU 6 +CH7 EQU 7 ;Note Pitch -noteC EQU $0 -noteC# EQU $1 -noteD EQU $2 -noteD# EQU $3 -noteE EQU $4 -noteF EQU $5 -noteF# EQU $6 -noteG EQU $7 -noteG# EQU $8 -noteA EQU $9 -noteA# EQU $A -noteB EQU $B -noteRst EQU $C - -;Note Delay -note16 EQU $0 ;1/16 -note8 EQU $1 ;1/8 -note8_16 EQU $2 ;1/8 + 1/16 -note4 EQU $3 ;1/4 -note4_16 EQU $4 ;1/4 + 1/16 -note4_8 EQU $5 ;1/4 + 1/8 -note4_8_16 EQU $6 ;1/4 + 1/8 + 1/16 -note2 EQU $7 ;1/2 -note2_16 EQU $8 ;1/2 + 1/16 -note2_8 EQU $9 ;1/2 + 1/8 -note2_8_16 EQU $A ;1/2 + 1/8 + 1/16 -note2_4 EQU $B ;1/2 + 1/4 -note2_4_16 EQU $C ;1/2 + 1/4 + 1/16 -note2_4_8 EQU $D ;1/2 + 1/4 + 1/8 -note2_4_8_16 EQU $E ;1/2 + 1/4 + 1/8 + 1/16 -note1 EQU $F ;1 - -;Drum -dNote EQU $B0 -dRst EQU $C0 -d5d3Spd EQU $D4 -d4d3Spd EQU $D8 -dNormSpd EQU $DC -d2Spd EQU $D0 - -; octaves -oct0 EQU $E7 -oct1 EQU $E6 -oct2 EQU $E5 -oct3 EQU $E4 -oct4 EQU $E3 -oct5 EQU $E2 -oct6 EQU $E1 -oct7 EQU $E0 - -;duty -duty12_5 EQU $0 -duty25 EQU $1 -duty50 EQU $2 -duty75 EQU $3 - -;Write a music note -;format: mus_note pitch delay -mus_note: MACRO - db ((\1 << 4) | \2) +C_ EQU $0 +C# EQU $1 +D_ EQU $2 +D# EQU $3 +E_ EQU $4 +F_ EQU $5 +F# EQU $6 +G_ EQU $7 +G# EQU $8 +A_ EQU $9 +A# EQU $A +B_ EQU $B + +;drum instruments +snare1 EQU $01 +snare2 EQU $02 +snare3 EQU $03 +snare4 EQU $04 +snare5 EQU $05 +triangle1 EQU $06 +triangle2 EQU $07 +snare6 EQU $08 +snare7 EQU $09 +snare8 EQU $0a +snare9 EQU $0b +cymbal1 EQU $0c +cymbal2 EQU $0d +cymbal3 EQU $0e +mutedsnare1 EQU $0f +triangle3 EQU $10 +mutedsnare2 EQU $11 +mutedsnare3 EQU $12 +mutedsnare4 EQU $13 + +;format: note pitch, length (in 16ths) +note: MACRO + db (\1 << 4) | (\2 - 1) ENDM -;Write an octave note -;format: mus_octave octave -mus_octave: MACRO - db \1 +;format: dnote length (in 16ths), instrument +dnote: MACRO + db $B0 | (\1 - 1) + db \2 ENDM -; set velocity/note fade (\1 is velocity, \2 is note length, both 0-15) -; format: mus_vel vel, length -mus_vel: MACRO - db $DC - db ((\1 << 4) | \2) +;format: rest length (in 16ths) +rest: MACRO + db $C0 | (\1 - 1) ENDM -; stop sound -; format: mus_end -mus_end: MACRO - db $FF +; format: notetype speed, volume, fade +notetype: MACRO + db $D0 | \1 + db (\2 << 4) | \3 +ENDM + +dspeed: MACRO + db $D0 | \1 +ENDM + +octave: MACRO + db $E8 - \1 ENDM -; ??? -; format: mus_E8 -mus_E8: MACRO +unknownmusic0xe8: MACRO db $E8 ENDM -; set modulation (\1 is delay, \2 is depth, \3 is rate) -; format: mus_mod delay, depth, rate -mus_mod: MACRO - db $EA - db \1 - db ((\2 << 4) | \3) +unknownmusic0xe9: MACRO + db $E9 ENDM -; set duty cycle (\1: 0 = 12.5%, 1 = 25%, 2 = 50%, 3 = 75%) -; format: mus_duty duty -mus_duty: MACRO - db $EC - db \1 +;format: vibrato delay, rate, depth +vibrato: MACRO + db $EA + db \1 + db (\2 << 4) | \3 ENDM -; set music tempo (\1 is divider, \2 is modifier) -; format: mus_tempo divider, modifier -mus_tempo: MACRO - db $ED - db \1 - db \2 +pitchbend: MACRO + db $EB + db \1 + db \2 ENDM -; set volume (\1 is volume) -; format: mus_volume volume -; (may actually be panning?) -mus_volume: MACRO - db $F0 - db \1 +duty: MACRO + db $EC + db \1 ENDM -; call \1 -; format: mus_call offset -mus_call: MACRO - db $FD - ;dw ((\1 % $4000) + ((\1 >= $4000) * $4000)) - dw \1 +tempo: MACRO + db $ED + db \1 + db \2 +ENDM + +unknownmusic0xee: MACRO + db $EE + db \1 +ENDM + +unknownmusic0xef: MACRO + db $EF +ENDM + +stereopanning: MACRO + db $F0 + db \1 +ENDM + +unknownmusic0xf1: MACRO + db $F1 ENDM -; jump \1 \2 -; format: mus_jump loop offset -mus_jump: MACRO - db $FE - db \1 - dw \2 - ;dw ((\2 % $4000) + ((\2 >= $4000) * $4000)) +unknownmusic0xf2: MACRO + db $F2 +ENDM + +unknownmusic0xf3: MACRO + db $F3 +ENDM + +unknownmusic0xf4: MACRO + db $F4 +ENDM + +unknownmusic0xf5: MACRO + db $F5 +ENDM + +unknownmusic0xf6: MACRO + db $F6 +ENDM + +unknownmusic0xf7: MACRO + db $F7 +ENDM + +unknownmusic0xf8: MACRO + db $F8 +ENDM + +unknownmusic0xf9: MACRO + db $F9 +ENDM + +unknownmusic0xfa: MACRO + db $FA +ENDM + +unknownmusic0xfb: MACRO + db $FB +ENDM + +dutycycle: MACRO + db $FC + db \1 +ENDM + +;format: callchannel address +;callchannel: MACRO +; db $FD +; dw \1 +;ENDM + +;format: loopchannel count, address +;loopchannel: MACRO +; db $FE +; db \1 +; dw \2 +;ENDM + +endchannel: MACRO + db $FF ENDM diff --git a/main.asm b/main.asm index b6aa60b8..07230475 100644 --- a/main.asm +++ b/main.asm @@ -18346,209 +18346,1865 @@ Func_7c18: ; 7c18 (1:7c18) SECTION "bank2",ROMX,BANK[$2] -INCBIN "baserom.gbc",$8000,$822e - $8000 +INCLUDE "music/headers/sfxheaders02.tx" +INCLUDE "music/headers/musicheaders02.tx" + +INCLUDE "music/sfx/sfx_02_01.tx" +INCLUDE "music/sfx/sfx_02_02.tx" +INCLUDE "music/sfx/sfx_02_03.tx" +INCLUDE "music/sfx/sfx_02_04.tx" +INCLUDE "music/sfx/sfx_02_05.tx" +INCLUDE "music/sfx/sfx_02_06.tx" +INCLUDE "music/sfx/sfx_02_07.tx" +INCLUDE "music/sfx/sfx_02_08.tx" +INCLUDE "music/sfx/sfx_02_09.tx" +INCLUDE "music/sfx/sfx_02_0a.tx" +INCLUDE "music/sfx/sfx_02_0b.tx" +INCLUDE "music/sfx/sfx_02_0c.tx" +INCLUDE "music/sfx/sfx_02_0d.tx" +INCLUDE "music/sfx/sfx_02_0e.tx" +INCLUDE "music/sfx/sfx_02_0f.tx" +INCLUDE "music/sfx/sfx_02_10.tx" +INCLUDE "music/sfx/sfx_02_11.tx" +INCLUDE "music/sfx/sfx_02_12.tx" +INCLUDE "music/sfx/sfx_02_13.tx" + +INCBIN "baserom.gbc",$8361,$83c3 - $8361 + +INCLUDE "music/sfx/sfx_02_3f.tx" +INCLUDE "music/sfx/sfx_02_5e.tx" +INCLUDE "music/sfx/sfx_02_56.tx" +INCLUDE "music/sfx/sfx_02_57.tx" +INCLUDE "music/sfx/sfx_02_58.tx" +INCLUDE "music/sfx/sfx_02_3c.tx" +INCLUDE "music/sfx/sfx_02_59.tx" +INCLUDE "music/sfx/sfx_02_5a.tx" +INCLUDE "music/sfx/sfx_02_5b.tx" +INCLUDE "music/sfx/sfx_02_5c.tx" +INCLUDE "music/sfx/sfx_02_40.tx" +INCLUDE "music/sfx/sfx_02_5d.tx" +INCLUDE "music/sfx/sfx_02_3d.tx" +INCLUDE "music/sfx/sfx_02_43.tx" +INCLUDE "music/sfx/sfx_02_3e.tx" +INCLUDE "music/sfx/sfx_02_44.tx" +INCLUDE "music/sfx/sfx_02_45.tx" +INCLUDE "music/sfx/sfx_02_46.tx" +INCLUDE "music/sfx/sfx_02_47.tx" +INCLUDE "music/sfx/sfx_02_48.tx" +INCLUDE "music/sfx/sfx_02_49.tx" +INCLUDE "music/sfx/sfx_02_4a.tx" +INCLUDE "music/sfx/sfx_02_4b.tx" +INCLUDE "music/sfx/sfx_02_4c.tx" +INCLUDE "music/sfx/sfx_02_4d.tx" +INCLUDE "music/sfx/sfx_02_4e.tx" +INCLUDE "music/sfx/sfx_02_4f.tx" +INCLUDE "music/sfx/sfx_02_50.tx" +INCLUDE "music/sfx/sfx_02_51.tx" +INCLUDE "music/sfx/sfx_02_52.tx" +INCLUDE "music/sfx/sfx_02_53.tx" +INCLUDE "music/sfx/sfx_02_54.tx" +INCLUDE "music/sfx/sfx_02_55.tx" +INCLUDE "music/sfx/sfx_02_5f.tx" + +INCBIN "baserom.gbc",$86e3,$872f - $86e3 + +INCLUDE "music/sfx/sfx_02_1d.tx" +INCLUDE "music/sfx/sfx_02_37.tx" +INCLUDE "music/sfx/sfx_02_38.tx" +INCLUDE "music/sfx/sfx_02_25.tx" +INCLUDE "music/sfx/sfx_02_39.tx" +INCLUDE "music/sfx/sfx_02_17.tx" +INCLUDE "music/sfx/sfx_02_23.tx" +INCLUDE "music/sfx/sfx_02_24.tx" +INCLUDE "music/sfx/sfx_02_14.tx" +INCLUDE "music/sfx/sfx_02_22.tx" +INCLUDE "music/sfx/sfx_02_1a.tx" +INCLUDE "music/sfx/sfx_02_1b.tx" +INCLUDE "music/sfx/sfx_02_19.tx" +INCLUDE "music/sfx/sfx_02_1f.tx" +INCLUDE "music/sfx/sfx_02_20.tx" +INCLUDE "music/sfx/sfx_02_16.tx" +INCLUDE "music/sfx/sfx_02_21.tx" +INCLUDE "music/sfx/sfx_02_15.tx" +INCLUDE "music/sfx/sfx_02_1e.tx" +INCLUDE "music/sfx/sfx_02_1c.tx" +INCLUDE "music/sfx/sfx_02_18.tx" +INCLUDE "music/sfx/sfx_02_2d.tx" +INCLUDE "music/sfx/sfx_02_2a.tx" +INCLUDE "music/sfx/sfx_02_2f.tx" +INCLUDE "music/sfx/sfx_02_26.tx" +INCLUDE "music/sfx/sfx_02_27.tx" +INCLUDE "music/sfx/sfx_02_28.tx" +INCLUDE "music/sfx/sfx_02_32.tx" +INCLUDE "music/sfx/sfx_02_29.tx" +INCLUDE "music/sfx/sfx_02_2b.tx" +INCLUDE "music/sfx/sfx_02_30.tx" +INCLUDE "music/sfx/sfx_02_2e.tx" +INCLUDE "music/sfx/sfx_02_31.tx" +INCLUDE "music/sfx/sfx_02_2c.tx" +INCLUDE "music/sfx/sfx_02_33.tx" +INCLUDE "music/sfx/sfx_02_34.tx" +INCLUDE "music/sfx/sfx_02_35.tx" +INCLUDE "music/sfx/sfx_02_36.tx" + +Func_90c6: ; 0x90c6 + xor a + ld [$cfc7], a + ld [$d083], a + dec a + ld [$c0ee], a + call PlaySound + call DelayFrame + ld c, $8 + ld a, [$d05c] + and a + jr z, .asm_90e3 ; 0x90dd $4 + ld a, $ea + jr .asm_9100 ; 0x90e1 $1d +.asm_90e3 + ld a, [$d059] + cp $c8 + jr c, .asm_90fe ; 0x90e8 $14 + cp $f3 + jr z, .asm_90fa ; 0x90ec $c + cp $f7 + jr nz, .asm_90f6 ; 0x90f0 $4 + ld a, $ea + jr .asm_9100 ; 0x90f4 $a +.asm_90f6 + ld a, $ed + jr .asm_9100 ; 0x90f8 $6 +.asm_90fa + ld a, $f3 + jr .asm_9100 ; 0x90fc $2 +.asm_90fe + ld a, $f0 +.asm_9100 + jp PlayMusic +; 0x9103 + +Func_9103: ; 0x9103 + ld c, $0 +.asm_9105 + ld b, $0 + ld hl, $c026 + add hl, bc + ld a, [hl] + and a + jr z, .asm_9131 ; 0x910d $22 + ld a, c + cp $4 + jr nc, .asm_912e ; 0x9112 $1a + ld a, [$c002] + and a + jr z, .asm_912e ; 0x9118 $14 + bit 7, a + jr nz, .asm_9131 ; 0x911c $13 + set 7, a + ld [$c002], a + xor a + ld [$ff00+$25], a + ld [$ff00+$1a], a + ld a, $80 + ld [$ff00+$1a], a + jr .asm_9131 ; 0x912c $3 +.asm_912e + call Func_9138 +.asm_9131 + ld a, c + inc c + cp $7 + jr nz, .asm_9105 ; 0x9135 $ce + ret +; 0x9138 + +Func_9138: ; 0x9138 + ld b, $0 + ld hl, $c0b6 + add hl, bc + ld a, [hl] + cp $1 + jp z, Func_91d0 + dec a + ld [hl], a + ld a, c + cp $4 + jr nc, .asm_9154 ; 0x9149 $9 + ld hl, $c02a + add hl, bc + ld a, [hl] + and a + jr z, .asm_9154 ; 0x9151 $1 + ret +.asm_9154 + ld hl, $c02e + add hl, bc + bit 6, [hl] + jr z, .asm_915f ; 0x915a $3 + call Func_980d +.asm_915f + ld b, $0 + ld hl, $c036 + add hl, bc + bit 0, [hl] + jr nz, .asm_9171 ; 0x9167 $8 + ld hl, $c02e + add hl, bc + bit 2, [hl] + jr nz, .asm_9185 ; 0x916f $14 +.asm_9171 + ld hl, $c02e + add hl, bc + bit 4, [hl] + jr z, .asm_917c ; 0x9177 $3 + jp Func_96f9 +.asm_917c + ld hl, $c04e + add hl, bc + ld a, [hl] + and a + jr z, .asm_9186 ; 0x9182 $2 + dec [hl] +.asm_9185 + ret +.asm_9186 + ld hl, $c056 + add hl, bc + ld a, [hl] + and a + jr nz, .asm_918f ; 0x918c $1 + ret +.asm_918f + ld d, a + ld hl, $c05e + add hl, bc + ld a, [hl] + and $f + and a + jr z, .asm_919c ; 0x9198 $2 + dec [hl] + ret +.asm_919c + ld a, [hl] + swap [hl] + or [hl] + ld [hl], a + ld hl, $c066 + add hl, bc + ld e, [hl] + ld hl, $c02e + add hl, bc + bit 3, [hl] + jr z, .asm_91bc ; 0x91ac $e + res 3, [hl] + ld a, d + and $f + ld d, a + ld a, e + sub d + jr nc, .asm_91ba ; 0x91b6 $2 + ld a, $0 +.asm_91ba + jr .asm_91c8 ; 0x91ba $c +.asm_91bc + set 3, [hl] + ld a, d + and $f0 + swap a + add e + jr nc, .asm_91c8 ; 0x91c4 $2 + ld a, $ff +.asm_91c8 + ld d, a + ld b, $3 + call Func_9838 + ld [hl], d + ret +; 0x91d0 + +Func_91d0 ; 0x91d0 + ld hl, $c06e + add hl, bc + ld a, [hl] + ld hl, $c04e + add hl, bc + ld [hl], a + ld hl, $c02e + add hl, bc + res 4, [hl] + res 5, [hl] + call Func_91e6 + ret +; 0x91e6 + +Func_91e6 ; 0x91e6 + call Func_9825 + ld d, a + cp $ff + jp nz, Func_9274 + ld b, $0 + ld hl, $c02e + add hl, bc + bit 1, [hl] + jr nz, .asm_9224 ; 0x91f7 $2b + ld a, c + cp $3 + jr nc, .asm_9200 ; 0x91fc $2 + jr .asm_923f ; 0x91fe $3f +.asm_9200 + res 2, [hl] + ld hl, $c036 + add hl, bc + res 0, [hl] + cp $6 + jr nz, .asm_9214 ; 0x920a $8 + ld a, $0 + ld [$ff00+$1a], a + ld a, $80 + ld [$ff00+$1a], a +.asm_9214 + jr nz, .asm_9222 ; 0x9214 $c + ld a, [$c003] + and a + jr z, .asm_9222 ; 0x921a $6 + xor a + ld [$c003], a + jr .asm_923f ; 0x9220 $1d +.asm_9222 + jr .asm_9248 ; 0x9222 $24 +.asm_9224 + res 1, [hl] + ld d, $0 + ld a, c + add a + ld e, a + ld hl, $c006 + add hl, de + push hl + ld hl, $c016 + add hl, de + ld e, l + ld d, h + pop hl + ld a, [de] + ld [hli], a + inc de + ld a, [de] + ld [hl], a + jp Func_91e6 +.asm_923f + ld hl, $5b1f + add hl, bc + ld a, [$ff00+$25] + and [hl] + ld [$ff00+$25], a +.asm_9248 + ld a, [$c02a] + cp $14 + jr nc, .asm_9251 ; 0x924d $2 + jr .asm_926e ; 0x924f $1d +.asm_9251 + ld a, [$c02a] + cp $86 + jr z, .asm_926e ; 0x9256 $16 + jr c, .asm_925c ; 0x9258 $2 + jr .asm_926e ; 0x925a $12 +.asm_925c + ld a, c + cp $4 + jr z, .asm_9265 ; 0x925f $4 + call Func_96c7 + ret c +.asm_9265 + ld a, [$c005] + ld [$ff00+$24], a + xor a + ld [$c005], a +.asm_926e + ld hl, $c026 + add hl, bc + ld [hl], b + ret +; 0x9274 + +Func_9274: ; 0x9274 + cp $fd + jp nz, Func_92a9 + call Func_9825 + push af + call Func_9825 + ld d, a + pop af + ld e, a + push de + ld d, $0 + ld a, c + add a + ld e, a + ld hl, $c006 + add hl, de + push hl + ld hl, $c016 + add hl, de + ld e, l + ld d, h + pop hl + ld a, [hli] + ld [de], a + inc de + ld a, [hld] + ld [de], a + pop de + ld [hl], e + inc hl + ld [hl], d + ld b, $0 + ld hl, $c02e + add hl, bc + set 1, [hl] + jp Func_91e6 +; 0x92a9 + +Func_92a9: ; 0x92a9 + cp $fe + jp nz, Func_92e4 + call Func_9825 + ld e, a + and a + jr z, .asm_92cd ; 0x92b3 $18 + ld b, $0 + ld hl, $c0be + add hl, bc + ld a, [hl] + cp e + jr nz, .asm_92cb ; 0x92bd $c + ld a, $1 + ld [hl], a + call Func_9825 + call Func_9825 + jp Func_91e6 +.asm_92cb + inc a + ld [hl], a +.asm_92cd + call Func_9825 + push af + call Func_9825 + ld b, a + ld d, $0 + ld a, c + add a + ld e, a + ld hl, $c006 + add hl, de + pop af + ld [hli], a + ld [hl], b + jp Func_91e6 +; 0x92e4 + +Func_92e4: ; 0x92e4 + and $f0 + cp $d0 + jp nz, Func_9323 + ld a, d + and $f + ld b, $0 + ld hl, $c0c6 + add hl, bc + ld [hl], a + ld a, c + cp $3 + jr z, .asm_9320 ; 0x92f8 $26 + call Func_9825 + ld d, a + ld a, c + cp $2 + jr z, .asm_930c ; 0x9301 $9 + cp $6 + jr nz, .asm_9319 ; 0x9305 $12 + ld hl, $c0e7 + jr .asm_930f ; 0x930a $3 +.asm_930c + ld hl, $c0e6 +.asm_930f + ld a, d + and $f + ld [hl], a + ld a, d + and $30 + sla a + ld d, a +.asm_9319 + ld b, $0 + ld hl, $c0de + add hl, bc + ld [hl], d +.asm_9320 + jp Func_91e6 +; 0x9323 + +Func_9323: ; 0x9323 + ld a, d + cp $e8 + jr nz, .asm_9335 ; 0x9326 $d + ld b, $0 + ld hl, $c02e + add hl, bc + ld a, [hl] + xor $1 + ld [hl], a + jp Func_91e6 +.asm_9335 + cp $ea + jr nz, .asm_936d ; 0x9337 $34 + call Func_9825 + ld b, $0 + ld hl, $c04e + add hl, bc + ld [hl], a + ld hl, $c06e + add hl, bc + ld [hl], a + call Func_9825 + ld d, a + and $f0 + swap a + ld b, $0 + ld hl, $c056 + add hl, bc + srl a + ld e, a + adc b + swap a + or e + ld [hl], a + ld a, d + and $f + ld d, a + ld hl, $c05e + add hl, bc + swap a + or d + ld [hl], a + jp Func_91e6 +.asm_936d + cp $eb + jr nz, .asm_93a5 ; 0x936f $34 + call Func_9825 + ld b, $0 + ld hl, $c076 + add hl, bc + ld [hl], a + call Func_9825 + ld d, a + and $f0 + swap a + ld b, a + ld a, d + and $f + call Func_9858 + ld b, $0 + ld hl, $c0a6 + add hl, bc + ld [hl], d + ld hl, $c0ae + add hl, bc + ld [hl], e + ld b, $0 + ld hl, $c02e + add hl, bc + set 4, [hl] + call Func_9825 + ld d, a + jp Func_950a +.asm_93a5 + cp $ec + jr nz, .asm_93ba ; 0x93a7 $11 + call Func_9825 + rrca + rrca + and $c0 + ld b, $0 + ld hl, $c03e + add hl, bc + ld [hl], a + jp Func_91e6 +.asm_93ba + cp $ed + jr nz, .asm_93fa ; 0x93bc $3c + ld a, c + cp $4 + jr nc, .asm_93de ; 0x93c1 $1b + call Func_9825 + ld [$c0e8], a + call Func_9825 + ld [$c0e9], a + xor a + ld [$c0ce], a + ld [$c0cf], a + ld [$c0d0], a + ld [$c0d1], a + jr .asm_93f7 ; 0x93dc $19 +.asm_93de + call Func_9825 + ld [$c0ea], a + call Func_9825 + ld [$c0eb], a + xor a + ld [$c0d2], a + ld [$c0d3], a + ld [$c0d4], a + ld [$c0d5], a +.asm_93f7 + jp Func_91e6 +.asm_93fa + cp $ee + jr nz, .asm_9407 ; 0x93fc $9 + call Func_9825 + ld [$c004], a + jp Func_91e6 +.asm_9407 + cp $ef + jr nz, .asm_9426 ; 0x9409 $1b + call Func_9825 + push bc + call Func_9876 + pop bc + ld a, [$c003] + and a + jr nz, .asm_9423 ; 0x9417 $a + ld a, [$c02d] + ld [$c003], a + xor a + ld [$c02d], a +.asm_9423 + jp Func_91e6 +.asm_9426 + cp $fc + jr nz, .asm_9444 ; 0x9428 $1a + call Func_9825 + ld b, $0 + ld hl, $c046 + add hl, bc + ld [hl], a + and $c0 + ld hl, $c03e + add hl, bc + ld [hl], a + ld hl, $c02e + add hl, bc + set 6, [hl] + jp Func_91e6 +.asm_9444 + cp $f0 + jr nz, .asm_9450 ; 0x9446 $8 + call Func_9825 + ld [$ff00+$24], a + jp Func_91e6 +.asm_9450 + cp $f8 + jr nz, .asm_945f ; 0x9452 $b + ld b, $0 + ld hl, $c036 + add hl, bc + set 0, [hl] + jp Func_91e6 +.asm_945f + and $f0 + cp $e0 + jr nz, .asm_9472 ; 0x9463 $d + ld hl, $c0d6 + ld b, $0 + add hl, bc + ld a, d + and $f + ld [hl], a + jp Func_91e6 +.asm_9472 + cp $20 + jr nz, .asm_94bf ; 0x9474 $49 + ld a, c + cp $3 + jr c, .asm_94bf ; 0x9479 $44 + ld b, $0 + ld hl, $c036 + add hl, bc + bit 0, [hl] + jr nz, .asm_94bf ; 0x9483 $3a + call Func_950a + ld d, a + ld b, $0 + ld hl, $c03e + add hl, bc + ld a, [hl] + or d + ld d, a + ld b, $1 + call Func_9838 + ld [hl], d + call Func_9825 + ld d, a + ld b, $2 + call Func_9838 + ld [hl], d + call Func_9825 + ld e, a + ld a, c + cp $7 + ld a, $0 + jr z, .asm_94b2 ; 0x94ab $5 + push de + call Func_9825 + pop de +.asm_94b2 + ld d, a + push de + call Func_9629 + call Func_95f8 + pop de + call Func_964b + ret +.asm_94bf + ld a, c + cp $4 + jr c, .asm_94db ; 0x94c2 $17 + ld a, d + cp $10 + jr nz, .asm_94db ; 0x94c7 $12 + ld b, $0 + ld hl, $c036 + add hl, bc + bit 0, [hl] + jr nz, .asm_94db ; 0x94d1 $8 + call Func_9825 + ld [$ff00+$10], a + jp Func_91e6 +.asm_94db + ld a, c + cp $3 + jr nz, Func_950a ; 0x94de $2a + ld a, d + and $f0 + cp $b0 + jr z, .asm_94f5 ; 0x94e5 $e + jr nc, Func_950a ; 0x94e7 $21 + swap a + ld b, a + ld a, d + and $f + ld d, a + ld a, b + push de + push bc + jr .asm_94fd ; 0x94f3 $8 +.asm_94f5 + ld a, d + and $f + push af + push bc + call Func_9825 +.asm_94fd + ld d, a + ld a, [$c003] + and a + jr nz, .asm_9508 ; 0x9502 $4 + ld a, d + call Func_9876 +.asm_9508 + pop bc + pop de + +Func_950a: ; 0x950a + ld a, d + push af + and $f + inc a + ld b, $0 + ld e, a + ld d, b + ld hl, $c0c6 + add hl, bc + ld a, [hl] + ld l, b + call Func_9847 + ld a, c + cp $4 + jr nc, .asm_952b ; 0x951f $a + ld a, [$c0e8] + ld d, a + ld a, [$c0e9] + ld e, a + jr .asm_953e ; 0x9529 $13 +.asm_952b + ld d, $1 + ld e, $0 + cp $7 + jr z, .asm_953e ; 0x9531 $b + call Func_9693 + ld a, [$c0ea] + ld d, a + ld a, [$c0eb] + ld e, a +.asm_953e + ld a, l + ld b, $0 + ld hl, $c0ce + add hl, bc + ld l, [hl] + call Func_9847 + ld e, l + ld d, h + ld hl, $c0ce + add hl, bc + ld [hl], e + ld a, d + ld hl, $c0b6 + add hl, bc + ld [hl], a + ld hl, $c036 + add hl, bc + bit 0, [hl] + jr nz, .asm_9568 ; 0x955c $a + ld hl, $c02e + add hl, bc + bit 2, [hl] + jr z, .asm_9568 ; 0x9564 $2 + pop hl + ret +.asm_9568 + pop af + and $f0 + cp $c0 + jr nz, .asm_959f ; 0x956d $30 + ld a, c + cp $4 + jr nc, .asm_957c ; 0x9572 $8 + ld hl, $c02a + add hl, bc + ld a, [hl] + and a + jr nz, .asm_959e ; 0x957a $22 +.asm_957c + ld a, c + cp $2 + jr z, .asm_9585 ; 0x957f $4 + cp $6 + jr nz, .asm_9592 ; 0x9583 $d +.asm_9585 + ld b, $0 + ld hl, $5b1f + add hl, bc + ld a, [$ff00+$25] + and [hl] + ld [$ff00+$25], a + jr .asm_959e ; 0x9590 $c +.asm_9592 + ld b, $2 + call Func_9838 + ld a, $8 + ld [hli], a + inc hl + ld a, $80 + ld [hl], a +.asm_959e + ret +.asm_959f + swap a + ld b, $0 + ld hl, $c0d6 + add hl, bc + ld b, [hl] + call Func_9858 + ld b, $0 + ld hl, $c02e + add hl, bc + bit 4, [hl] + jr z, .asm_95b8 ; 0x95b3 $3 + call Func_978f +.asm_95b8 + push de + ld a, c + cp $4 + jr nc, .asm_95cd ; 0x95bc $f + ld hl, $c02a + ld d, $0 + ld e, a + add hl, de + ld a, [hl] + and a + jr nz, .asm_95cb ; 0x95c7 $2 + jr .asm_95cd ; 0x95c9 $2 +.asm_95cb + pop de + ret +.asm_95cd + ld b, $0 + ld hl, $c0de + add hl, bc + ld d, [hl] + ld b, $2 + call Func_9838 + ld [hl], d + call Func_9629 + call Func_95f8 + pop de + ld b, $0 + ld hl, $c02e + add hl, bc + bit 0, [hl] + jr z, .asm_95ef ; 0x95e9 $4 + inc e + jr nc, .asm_95ef ; 0x95ec $1 + inc d +.asm_95ef + ld hl, $c066 + add hl, bc + ld [hl], e + call Func_964b + ret +; 0x95f8 + +Func_95f8: ; 0x95f8 + ld b, $0 + ld hl, $5b27 + add hl, bc + ld a, [$ff00+$25] + or [hl] + ld d, a + ld a, c + cp $7 + jr z, .asm_9613 ; 0x9605 $c + cp $4 + jr nc, .asm_9625 ; 0x9609 $1a + ld hl, $c02a + add hl, bc + ld a, [hl] + and a + jr nz, .asm_9625 ; 0x9611 $12 +.asm_9613 + ld a, [$c004] + ld hl, $5b27 + add hl, bc + and [hl] + ld d, a + ld a, [$ff00+$25] + ld hl, $5b1f + add hl, bc + and [hl] + or d + ld d, a +.asm_9625 + ld a, d + ld [$ff00+$25], a + ret +; 0x9629 + +Func_9629: ; 0x9629 + ld b, $0 + ld hl, $c0b6 + add hl, bc + ld d, [hl] + ld a, c + cp $2 + jr z, .asm_9644 ; 0x9633 $f + cp $6 + jr z, .asm_9644 ; 0x9637 $b + ld a, d + and $3f + ld d, a + ld hl, $c03e + add hl, bc + ld a, [hl] + or d + ld d, a +.asm_9644 + ld b, $1 + call Func_9838 + ld [hl], d + ret +; 0x964b + +Func_964b: ; 0x964b + ld a, c + cp $2 + jr z, .asm_9654 ; 0x964e $4 + cp $6 + jr nz, .asm_9681 ; 0x9652 $2d +.asm_9654 + push de + ld de, $c0e6 + cp $2 + jr z, .asm_965f ; 0x965a $3 + ld de, $c0e7 +.asm_965f + ld a, [de] + add a + ld d, $0 + ld e, a + ld hl, $4361 + add hl, de + ld e, [hl] + inc hl + ld d, [hl] + ld hl, $ff30 + ld b, $f + ld a, $0 + ld [$ff00+$1a], a +.asm_9674 + ld a, [de] + inc de + ld [hli], a + ld a, b + dec b + and a + jr nz, .asm_9674 ; 0x967a $f8 + ld a, $80 + ld [$ff00+$1a], a + pop de +.asm_9681 + ld a, d + or $80 + and $c7 + ld d, a + ld b, $3 + call Func_9838 + ld [hl], e + inc hl + ld [hl], d + call Func_96b5 + ret +; 0x9693 + +Func_9693: ; 0x9693 + call Func_96e5 + jr nc, .asm_96ab ; 0x9696 $13 + ld d, $0 + ld a, [$c0f2] + add $80 + jr nc, .asm_96a2 ; 0x969f $1 + inc d +.asm_96a2 + ld [$c0eb], a + ld a, d + ld [$c0ea], a + jr .asm_96b4 ; 0x96a9 $9 +.asm_96ab + xor a + ld [$c0eb], a + ld a, $1 + ld [$c0ea], a +.asm_96b4 + ret +; 0x96b5 + +Func_96b5: ; 0x96b5 + call Func_96e5 + jr nc, .asm_96c6 ; 0x96b8 $c + ld a, [$c0f1] + add e + jr nc, .asm_96c1 ; 0x96be $1 + inc d +.asm_96c1 + dec hl + ld e, a + ld [hl], e + inc hl + ld [hl], d +.asm_96c6 + ret +; 0x96c7 + +Func_96c7: ; 0x96c7 + call Func_96e5 + jr nc, .asm_96e2 ; 0x96ca $16 + ld hl, $c006 + ld e, c + ld d, $0 + sla e + rl d + add hl, de + ld a, [hl] + sub $1 + ld [hl], a + inc hl + ld a, [hl] + sbc $0 + ld [hl], a + scf + ret +.asm_96e2 + scf + ccf + ret +; 0x96e5 + +Func_96e5: ; 0x96e5 + ld a, [$c02a] + cp $14 + jr nc, .asm_96ee ; 0x96ea $2 + jr .asm_96f4 ; 0x96ec $6 +.asm_96ee + cp $86 + jr z, .asm_96f4 ; 0x96f0 $2 + jr c, .asm_96f7 ; 0x96f2 $3 +.asm_96f4 + scf + ccf + ret +.asm_96f7 + scf + ret +; 0x96f9 + +Func_96f9: ; 0x96f9 + ld hl, $c02e + add hl, bc + bit 5, [hl] + jp nz, .asm_9740 + ld hl, $c09e + add hl, bc + ld e, [hl] + ld hl, $c096 + add hl, bc + ld d, [hl] + ld hl, $c07e + add hl, bc + ld l, [hl] + ld h, b + add hl, de + ld d, h + ld e, l + ld hl, $c08e + add hl, bc + push hl + ld hl, $c086 + add hl, bc + ld a, [hl] + pop hl + add [hl] + ld [hl], a + ld a, $0 + adc e + ld e, a + ld a, $0 + adc d + ld d, a + ld hl, $c0a6 + add hl, bc + ld a, [hl] + cp d + jp c, .asm_9786 + jr nz, .asm_9773 ; 0x9733 $3e + ld hl, $c0ae + add hl, bc + ld a, [hl] + cp e + jp c, .asm_9786 + jr .asm_9773 ; 0x973e $33 +.asm_9740 + ld hl, $c09e + add hl, bc + ld a, [hl] + ld hl, $c096 + add hl, bc + ld d, [hl] + ld hl, $c07e + add hl, bc + ld e, [hl] + sub e + ld e, a + ld a, d + sbc b + ld d, a + ld hl, $c086 + add hl, bc + ld a, [hl] + add a + ld [hl], a + ld a, e + sbc b + ld e, a + ld a, d + sbc b + ld d, a + ld hl, $c0a6 + add hl, bc + ld a, d + cp [hl] + jr c, .asm_9786 ; 0x9767 $1d + jr nz, .asm_9773 ; 0x9769 $8 + ld hl, $c0ae + add hl, bc + ld a, e + cp [hl] + jr c, .asm_9786 ; 0x9771 $13 +.asm_9773 + ld hl, $c09e + add hl, bc + ld [hl], e + ld hl, $c096 + add hl, bc + ld [hl], d + ld b, $3 + call Func_9838 + ld a, e + ld [hli], a + ld [hl], d + ret +.asm_9786 + ld hl, $c02e + add hl, bc + res 4, [hl] + res 5, [hl] + ret +; 0x978f + +Func_978f: ; 0x978f + ld hl, $c096 + add hl, bc + ld [hl], d + ld hl, $c09e + add hl, bc + ld [hl], e + ld hl, $c0b6 + add hl, bc + ld a, [hl] + ld hl, $c076 + add hl, bc + sub [hl] + jr nc, .asm_97a7 ; 0x97a3 $2 + ld a, $1 +.asm_97a7 + ld [hl], a + ld hl, $c0ae + add hl, bc + ld a, e + sub [hl] + ld e, a + ld a, d + sbc b + ld hl, $c0a6 + add hl, bc + sub [hl] + jr c, .asm_97c3 ; 0x97b6 $b + ld d, a + ld b, $0 + ld hl, $c02e + add hl, bc + set 5, [hl] + jr .asm_97e6 ; 0x97c1 $23 +.asm_97c3 + ld hl, $c096 + add hl, bc + ld d, [hl] + ld hl, $c09e + add hl, bc + ld e, [hl] + ld hl, $c0ae + add hl, bc + ld a, [hl] + sub e + ld e, a + ld a, d + sbc b + ld d, a + ld hl, $c0a6 + add hl, bc + ld a, [hl] + sub d + ld d, a + ld b, $0 + ld hl, $c02e + add hl, bc + res 5, [hl] +.asm_97e6 + ld hl, $c076 + add hl, bc +.asm_97ea + inc b + ld a, e + sub [hl] + ld e, a + jr nc, .asm_97ea ; 0x97ee $fa + ld a, d + and a + jr z, .asm_97f8 ; 0x97f2 $4 + dec a + ld d, a + jr .asm_97ea ; 0x97f6 $f2 +.asm_97f8 + ld a, e + add [hl] + ld d, b + ld b, $0 + ld hl, $c07e + add hl, bc + ld [hl], d + ld hl, $c086 + add hl, bc + ld [hl], a + ld hl, $c08e + add hl, bc + ld [hl], a + ret +; 0x980d -;Music Headers -;Pallet Town -PalletTown_mh: ; 0x822E - 0x8236 - db $80 - dw PalletTown_md_1 ;Channel 1 ($A7C5 - $A85E) - db $01 - dw PalletTown_md_2 ;Channel 2 ($A85f - $A8DD) - db $02 - dw PalletTown_md_3 ;Channel 3 ($A8DE - $AA75) - -;Pokemon Center -Pokecenter_mh: ; 0x8237 - 0x823F - db $80 - dw Pokecenter_md_1 ;Channel 1 ($BE56 - $BEF8) - db $01 - dw Pokecenter_md_2 ;Channel 2 ($BEF9 - $BF6F) - db $02 - dw Pokecenter_md_3 ;Channel 3 ($BF70 - $BFFF) - -;Gyms -Gym_mh: ; 0x8240 - 0x8248 - db $80 - dw Gym_md_1 ;Channel 1 ($BCBB - $BD6A) - db $01 - dw Gym_md_2 ;Channel 2 ($BD6B - $BDF9) - db $02 - dw Gym_md_3 ;Channel 3 ($BDFA - $BE55) - -;Viridian City, Pewter City, Saffron City -Cities1_mh: ; 0x8249 - 0x8254 - db $C0 - dw Cities1_md_1 ;Channel 1 - db $01 - dw Cities1_md_2 ;Channel 2 - db $02 - dw Cities1_md_3 ;Channel 3 - db $03 - dw Cities1_md_4 ;Channel 4 +Func_980d: ; 0x980d + ld b, $0 + ld hl, $c046 + add hl, bc + ld a, [hl] + rlca + rlca + ld [hl], a + and $c0 + ld d, a + ld b, $1 + call Func_9838 + ld a, [hl] + and $3f + or d + ld [hl], a + ret +; 0x9825 -;Cerulean City, Fuchsia City -Cities2_mh: ; 0x8255 - 0x825D - db $80 - dw Cities2_md_1 ;Channel 1 - db $01 - dw Cities2_md_2 ;Channel 2 - db $02 - dw Cities2_md_3 ;Channel 3 - -;Celadon City -Celadon_mh: ; 0x825E - 0x8266 - db $80 - dw Celadon_md_1 ;Channel 1 - db $01 - dw Celadon_md_2 ;Channel 2 - db $02 - dw Celadon_md_3 ;Channel 3 - -;Cinnabar Island -Cinnabar_mh: ; 0x8267 - 0x826F - db $80 - dw Cinnabar_md_1 ;Channel 1 - db $01 - dw Cinnabar_md_2 ;Channel 2 - db $02 - dw Cinnabar_md_3 ;Channel 3 - -;Vermilion City -Vermilion_mh: ; 0x8270 - 0x827B - db $C0 - dw Vermilion_md_1 ;Channel 1 - db $01 - dw Vermilion_md_2 ;Channel 2 - db $02 - dw Vermilion_md_3 ;Channel 3 - db $03 - dw Vermilion_md_4 ;Channel 4 +Func_9825: ; 0x9825 + ld d, $0 + ld a, c + add a + ld e, a + ld hl, $c006 + add hl, de + ld a, [hli] + ld e, a + ld a, [hld] + ld d, a + ld a, [de] + inc de + ld [hl], e + inc hl + ld [hl], d + ret +; 0x9838 -;Lavender Town -Lavender_mh: ; 0x827C - 0x8287 - db $C0 - dw Lavender_md_1 ;Channel 1 - db $01 - dw Lavender_md_2 ;Channel 2 - db $02 - dw Lavender_md_3 ;Channel 3 - db $03 - dw Lavender_md_4 ;Channel 4 +Func_9838: ; 0x9838 + ld a, c + ld hl, $5b17 + add l + jr nc, .asm_9840 ; 0x983d $1 + inc h +.asm_9840 + ld l, a + ld a, [hl] + add b + ld l, a + ld h, $ff + ret +; 0x9847 -;SS Anne -SSAnne_mh: ; 0x8288 - 0x8290 - db $80 - dw SSAnne_md_1 ;Channel 1 - db $01 - dw SSAnne_md_2 ;Channel 2 - db $02 - dw SSAnne_md_3 ;Channel 3 - -;Meet Prof. Oak -MeetProfOak_mh: ; 0x8291 - 0x8299 - db $80 - dw MeetProfOak_md_1 ;Channel 1 - db $01 - dw MeetProfOak_md_2 ;Channel 2 - db $02 - dw MeetProfOak_md_3 ;Channel 3 - -;Meet Rival -MeetRival_mh: ; 0x829A - 0x82A2 - db $80 - dw MeetRival_md_1 ;Channel 1 - db $01 - dw MeetRival_md_2 ;Channel 2 - db $02 - dw MeetRival_md_3 ;Channel 3 - -;Guy walks you to museum -MuseumGuy_mh: ; 0x82A3 - 0x82AE - db $C0 - dw MuseumGuy_md_1 ;Channel 1 - db $01 - dw MuseumGuy_md_2 ;Channel 2 - db $02 - dw MuseumGuy_md_3 ;Channel 3 - db $03 - dw MuseumGuy_md_4 ;Channel 4 +Func_9847: ; 0x9847 + ld h, $0 +.asm_9849 + srl a + jr nc, .asm_984e ; 0x984b $1 + add hl, de +.asm_984e + sla e + rl d + and a + jr z, .asm_9857 ; 0x9853 $2 + jr .asm_9849 ; 0x9855 $f2 +.asm_9857 + ret +; 0x9858 -;Safari Zone -SafariZone_mh: ; 0x82AF - 0x82B7 - db $80 - dw SafariZone_md_1 ;Channel 1 - db $01 - dw SafariZone_md_2 ;Channel 2 - db $02 - dw SafariZone_md_3 ;Channel 3 - -;Pokemon Get Healed -PkmnHealed_mh: ; 0x82B8 - 0x82C0 - db $80 - dw PkmnHealed_md_1 ;Channel 1 - db $01 - dw PkmnHealed_md_2 ;Channel 2 - db $02 - dw PkmnHealed_md_3 ;Channel 3 - -;Routes 1 and 2 -Routes1_mh: ; 0x82C1 - 0x82CC - db $C0 - dw Routes1_md_1 ;Channel 1 - db $01 - dw Routes1_md_2 ;Channel 2 - db $02 - dw Routes1_md_3 ;Channel 3 - db $03 - dw Routes1_md_4 ;Channel 4 +Func_9858: ; 0x9858 + ld h, $0 + ld l, a + add hl, hl + ld d, h + ld e, l + ld hl, $5b2f + add hl, de + ld e, [hl] + inc hl + ld d, [hl] + ld a, b +.asm_9866 + cp $7 + jr z, .asm_9871 ; 0x9868 $7 + sra d + rr e + inc a + jr .asm_9866 ; 0x986f $f5 +.asm_9871 + ld a, $8 + add d + ld d, a + ret +; 0x9876 -;Routes 24 and 25 -Routes2_mh: ; 0x82CD - 0x82D8 - db $C0 - dw Routes2_md_1 ;Channel 1 - db $01 - dw Routes2_md_2 ;Channel 2 - db $02 - dw Routes2_md_3 ;Channel 3 - db $03 - dw Routes2_md_4 ;Channel 4 +Func_9876: ; 0x9876 + ld [$c001], a + cp $ff + jp z, Func_9a34 + cp $b9 + jp z, Func_994e + jp c, Func_994e + cp $fe + jr z, .asm_988d ; 0x9888 $3 + jp nc, Func_994e +.asm_988d + xor a + ld [$c000], a + ld [$c003], a + ld [$c0e9], a + ld [$c0e6], a + ld [$c0e7], a + ld d, $8 + ld hl, $c016 + call Func_9a89 + ld hl, $c006 + call Func_9a89 + ld d, $4 + ld hl, $c026 + call Func_9a89 + ld hl, $c02e + call Func_9a89 + ld hl, $c03e + call Func_9a89 + ld hl, $c046 + call Func_9a89 + ld hl, $c04e + call Func_9a89 + ld hl, $c056 + call Func_9a89 + ld hl, $c05e + call Func_9a89 + ld hl, $c066 + call Func_9a89 + ld hl, $c06e + call Func_9a89 + ld hl, $c036 + call Func_9a89 + ld hl, $c076 + call Func_9a89 + ld hl, $c07e + call Func_9a89 + ld hl, $c086 + call Func_9a89 + ld hl, $c08e + call Func_9a89 + ld hl, $c096 + call Func_9a89 + ld hl, $c09e + call Func_9a89 + ld hl, $c0a6 + call Func_9a89 + ld hl, $c0ae + call Func_9a89 + ld a, $1 + ld hl, $c0be + call Func_9a89 + ld hl, $c0b6 + call Func_9a89 + ld hl, $c0c6 + call Func_9a89 + ld [$c0e8], a + ld a, $ff + ld [$c004], a + xor a + ld [$ff00+$24], a + ld a, $8 + ld [$ff00+$10], a + ld a, $0 + ld [$ff00+$25], a + xor a + ld [$ff00+$1a], a + ld a, $80 + ld [$ff00+$1a], a + ld a, $77 + ld [$ff00+$24], a + jp Func_9a8f +; 0x994e -;Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Routes3_mh: ; 0x82D9 - 0x82E4 - db $C0 - dw Routes3_md_1 ;Channel 1 - db $01 - dw Routes3_md_2 ;Channel 2 - db $02 - dw Routes3_md_3 ;Channel 3 - db $03 - dw Routes3_md_4 ;Channel 4 +Func_994e: ; 0x994e + ld l, a + ld e, a + ld h, $0 + ld d, h + add hl, hl + add hl, de + ld de, $4000 + add hl, de + ld a, h + ld [$c0ec], a + ld a, l + ld [$c0ed], a + ld a, [hl] + and $c0 + rlca + rlca + ld c, a +.asm_9967 + ld d, c + ld a, c + add a + add c + ld c, a + ld b, $0 + ld a, [$c0ec] + ld h, a + ld a, [$c0ed] + ld l, a + add hl, bc + ld c, d + ld a, [hl] + and $f + ld e, a + ld d, $0 + ld hl, $c026 + add hl, de + ld a, [hl] + and a + jr z, .asm_99a3 ; 0x9984 $1d + ld a, e + cp $7 + jr nz, .asm_999a ; 0x9989 $f + ld a, [$c001] + cp $14 + jr nc, .asm_9993 ; 0x9990 $1 + ret +.asm_9993 + ld a, [hl] + cp $14 + jr z, .asm_99a3 ; 0x9996 $b + jr c, .asm_99a3 ; 0x9998 $9 +.asm_999a + ld a, [$c001] + cp [hl] + jr z, .asm_99a3 ; 0x999e $3 + jr c, .asm_99a3 ; 0x99a0 $1 + ret +.asm_99a3 + xor a + push de + ld h, d + ld l, e + add hl, hl + ld d, h + ld e, l + ld hl, $c016 + add hl, de + ld [hli], a + ld [hl], a + ld hl, $c006 + add hl, de + ld [hli], a + ld [hl], a + pop de + ld hl, $c026 + add hl, de + ld [hl], a + ld hl, $c02e + add hl, de + ld [hl], a + ld hl, $c03e + add hl, de + ld [hl], a + ld hl, $c046 + add hl, de + ld [hl], a + ld hl, $c04e + add hl, de + ld [hl], a + ld hl, $c056 + add hl, de + ld [hl], a + ld hl, $c05e + add hl, de + ld [hl], a + ld hl, $c066 + add hl, de + ld [hl], a + ld hl, $c06e + add hl, de + ld [hl], a + ld hl, $c076 + add hl, de + ld [hl], a + ld hl, $c07e + add hl, de + ld [hl], a + ld hl, $c086 + add hl, de + ld [hl], a + ld hl, $c08e + add hl, de + ld [hl], a + ld hl, $c096 + add hl, de + ld [hl], a + ld hl, $c09e + add hl, de + ld [hl], a + ld hl, $c0a6 + add hl, de + ld [hl], a + ld hl, $c0ae + add hl, de + ld [hl], a + ld hl, $c036 + add hl, de + ld [hl], a + ld a, $1 + ld hl, $c0be + add hl, de + ld [hl], a + ld hl, $c0b6 + add hl, de + ld [hl], a + ld hl, $c0c6 + add hl, de + ld [hl], a + ld a, e + cp $4 + jr nz, .asm_9a2b ; 0x9a25 $4 + ld a, $8 + ld [$ff00+$10], a +.asm_9a2b + ld a, c + and a + jp z, Func_9a8f + dec c + jp .asm_9967 +; 0x9a34 -;Routes 11, 12, 13, 14, 15 -Routes4_mh: ; 0x82E5 - 0x82F0 - db $C0 - dw Routes4_md_1 ;Channel 1 - db $01 - dw Routes4_md_2 ;Channel 2 - db $02 - dw Routes4_md_3 ;Channel 3 - db $03 - dw Routes4_md_4 ;Channel 4 +Func_9a34: ; 0x9a34 + ld a, $80 + ld [$ff00+$26], a + ld [$ff00+$1a], a + xor a + ld [$ff00+$25], a + ld [$ff00+$1c], a + ld a, $8 + ld [$ff00+$10], a + ld [$ff00+$12], a + ld [$ff00+$17], a + ld [$ff00+$21], a + ld a, $40 + ld [$ff00+$14], a + ld [$ff00+$19], a + ld [$ff00+$23], a + ld a, $77 + ld [$ff00+$24], a + xor a + ld [$c000], a + ld [$c003], a + ld [$c002], a + ld [$c0e9], a + ld [$c0eb], a + ld [$c0e6], a + ld [$c0e7], a + ld d, $a0 + ld hl, $c006 + call Func_9a89 + ld a, $1 + ld d, $18 + ld hl, $c0b6 + call Func_9a89 + ld [$c0e8], a + ld [$c0ea], a + ld a, $ff + ld [$c004], a + ret +; 0x9a89 -;Indigo Plateau -IndigoPlateau_mh: ; 0x82F1 - 0x82FC - db $C0 - dw IndigoPlateau_md_1 ;Channel 1 - db $01 - dw IndigoPlateau_md_2 ;Channel 2 - db $02 - dw IndigoPlateau_md_3 ;Channel 3 - db $03 - dw IndigoPlateau_md_4 ;Channel 4 +Func_9a89: ; 0x9a89 + ld b, d +.asm_9a8a + ld [hli], a + dec b + jr nz, .asm_9a8a ; 0x9a8c $fc + ret +; 0x9a8f + +Func_9a8f: ; 0x9a8f + ld a, [$c001] + ld l, a + ld e, a + ld h, $0 + ld d, h + add hl, hl + add hl, de + ld de, $4000 + add hl, de + ld e, l + ld d, h + ld hl, $c006 + ld a, [de] + ld b, a + rlca + rlca + and $3 + ld c, a + ld a, b + and $f + ld b, c + inc b + inc de + ld c, $0 +.asm_9ab1 + cp c + jr z, .asm_9ab9 ; 0x9ab2 $5 + inc c + inc hl + inc hl + jr .asm_9ab1 ; 0x9ab7 $f8 +.asm_9ab9 + push hl + push bc + push af + ld b, $0 + ld c, a + ld hl, $c026 + add hl, bc + ld a, [$c001] + ld [hl], a + pop af + cp $3 + jr c, .asm_9ad2 ; 0x9aca $6 + ld hl, $c02e + add hl, bc + set 2, [hl] +.asm_9ad2 + pop bc + pop hl + ld a, [de] + ld [hli], a + inc de + ld a, [de] + ld [hli], a + inc de + inc c + dec b + ld a, b + and a + ld a, [de] + inc de + jr nz, .asm_9ab1 ; 0x9ae0 $cf + ld a, [$c001] + cp $14 + jr nc, .asm_9aeb ; 0x9ae7 $2 + jr .asm_9b15 ; 0x9ae9 $2a +.asm_9aeb + ld a, [$c001] + cp $86 + jr z, .asm_9b15 ; 0x9af0 $23 + jr c, .asm_9af6 ; 0x9af2 $2 + jr .asm_9b15 ; 0x9af4 $1f +.asm_9af6 + ld hl, $c02a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hl], a + ld hl, $c012 + ld de, $5b16 + ld [hl], e + inc hl + ld [hl], d + ld a, [$c005] + and a + jr nz, .asm_9b15 ; 0x9b0a $9 + ld a, [$ff00+$24] + ld [$c005], a + ld a, $77 + ld [$ff00+$24], a +.asm_9b15 + ret +; 0x9b16 + +INCBIN "baserom.gbc",$9b16,$9b47 - $9b16 + +Func_9b47: ; 0x9b47 + ld c, $2 + ld a, $de + call PlayMusic + ld hl, $c006 + ld de, $71a2 + call Func_9b60 + ld de, $721d + call Func_9b60 + ld de, $72b5 + +Func_9b60: ; 0x9b60 + ld a, e + ld [hli], a + ld a, d + ld [hli], a + ret +; 0x9b65 + +Func_9b65: ; 0x9b65 + ld c, $2 + ld a, $de + call PlayMusic + ld hl, $c006 + ld de, $7119 + jp Func_9b60 +; 0x9b75 + +Func_9b75: ; 0x9b75 + call Func_9b47 + ld hl, $c006 + ld de, $719b + jp Func_9b60 +; 0x9b81 + +Func_9b81: ; 0x9b81 + ld a, $a + ld [$cfc8], a + ld [$cfc9], a + ld a, $ff + ld [$cfc7], a + ld c, $64 + call DelayFrames + ld c, $2 + ld a, $c3 + call PlayMusic + ld hl, $c006 + ld de, $6a6f + jp Func_9b60 +; 0x9ba3 + +INCLUDE "music/pkmnhealed.tx" +INCLUDE "music/routes1.tx" +INCLUDE "music/routes2.tx" +INCLUDE "music/routes3.tx" +INCLUDE "music/routes4.tx" +INCLUDE "music/indigoplateau.tx" +INCLUDE "music/pallettown.tx" +INCLUDE "music/unusedsong.tx" +INCLUDE "music/cities1.tx" +INCLUDE "music/sfx/sfx_02_3a.tx" +INCLUDE "music/museumguy.tx" +INCLUDE "music/meetprofoak.tx" +INCLUDE "music/meetrival.tx" +INCLUDE "music/sfx/sfx_02_41.tx" +INCLUDE "music/sfx/sfx_02_3b.tx" +INCLUDE "music/sfx/sfx_02_42.tx" +INCLUDE "music/ssanne.tx" +INCLUDE "music/cities2.tx" +INCLUDE "music/celadon.tx" +INCLUDE "music/cinnabar.tx" +INCLUDE "music/vermilion.tx" +INCLUDE "music/lavender.tx" +INCLUDE "music/safarizone.tx" +INCLUDE "music/gym.tx" +INCLUDE "music/pokecenter.tx" -INCLUDE "music.asm" - SECTION "bank3",ROMX,BANK[$3] ; known jump sources: 1a4 (0:1a4) @@ -42322,14 +43978,157 @@ UnnamedText_1ecbd: ; 1ecbd (7:6cbd) SECTION "bank8",ROMX,BANK[$8] -Unknown_20000: ; 20000 (8:4000) -INCBIN "baserom.gbc",$20000,$20361 - $20000 +INCLUDE "music/headers/sfxheaders08.tx" +INCLUDE "music/headers/musicheaders08.tx" + +INCLUDE "music/sfx/sfx_08_01.tx" +INCLUDE "music/sfx/sfx_08_02.tx" +INCLUDE "music/sfx/sfx_08_03.tx" +INCLUDE "music/sfx/sfx_08_04.tx" +INCLUDE "music/sfx/sfx_08_05.tx" +INCLUDE "music/sfx/sfx_08_06.tx" +INCLUDE "music/sfx/sfx_08_07.tx" +INCLUDE "music/sfx/sfx_08_08.tx" +INCLUDE "music/sfx/sfx_08_09.tx" +INCLUDE "music/sfx/sfx_08_0a.tx" +INCLUDE "music/sfx/sfx_08_0b.tx" +INCLUDE "music/sfx/sfx_08_0c.tx" +INCLUDE "music/sfx/sfx_08_0d.tx" +INCLUDE "music/sfx/sfx_08_0e.tx" +INCLUDE "music/sfx/sfx_08_0f.tx" +INCLUDE "music/sfx/sfx_08_10.tx" +INCLUDE "music/sfx/sfx_08_11.tx" +INCLUDE "music/sfx/sfx_08_12.tx" +INCLUDE "music/sfx/sfx_08_13.tx" Unknown_20361: ; 20361 (8:4361) -INCBIN "baserom.gbc",$20361,$2049b - $20361 +INCBIN "baserom.gbc",$20361,$203c3 - $20361 + +INCLUDE "music/sfx/sfx_08_40.tx" +INCLUDE "music/sfx/sfx_08_3f.tx" +INCLUDE "music/sfx/sfx_08_3c.tx" +INCLUDE "music/sfx/sfx_08_3d.tx" +INCLUDE "music/sfx/sfx_08_3e.tx" +INCLUDE "music/sfx/sfx_08_77.tx" +INCLUDE "music/sfx/sfx_08_41.tx" +INCLUDE "music/sfx/sfx_08_42.tx" +INCLUDE "music/sfx/sfx_08_43.tx" +INCLUDE "music/sfx/sfx_08_44.tx" +INCLUDE "music/sfx/sfx_08_45.tx" Unknown_2049b: ; 2049b (8:449b) -INCBIN "baserom.gbc",$2049b,$2136e - $2049b +INCBIN "baserom.gbc",$2049b,$204aa - $2049b + +INCLUDE "music/sfx/sfx_08_47.tx" +INCLUDE "music/sfx/sfx_08_48.tx" +INCLUDE "music/sfx/sfx_08_49.tx" +INCLUDE "music/sfx/sfx_08_4a.tx" +INCLUDE "music/sfx/sfx_08_4b.tx" +INCLUDE "music/sfx/sfx_08_4c.tx" + +INCBIN "baserom.gbc",$204d1,$204d6 - $204d1 ; unknown music + +INCLUDE "music/sfx/sfx_08_4d.tx" +INCLUDE "music/sfx/sfx_08_4e.tx" +INCLUDE "music/sfx/sfx_08_4f.tx" +INCLUDE "music/sfx/sfx_08_50.tx" +INCLUDE "music/sfx/sfx_08_51.tx" +INCLUDE "music/sfx/sfx_08_52.tx" +INCLUDE "music/sfx/sfx_08_53.tx" +INCLUDE "music/sfx/sfx_08_54.tx" + +INCBIN "baserom.gbc",$20528,$20533 - $20528 ; unknown music + +INCLUDE "music/sfx/sfx_08_55.tx" +INCLUDE "music/sfx/sfx_08_56.tx" +INCLUDE "music/sfx/sfx_08_57.tx" +INCLUDE "music/sfx/sfx_08_58.tx" + +INCBIN "baserom.gbc",$20565,$2056a - $20565 ; unknown music + +INCLUDE "music/sfx/sfx_08_59.tx" +INCLUDE "music/sfx/sfx_08_5a.tx" +INCLUDE "music/sfx/sfx_08_5b.tx" +INCLUDE "music/sfx/sfx_08_5c.tx" +INCLUDE "music/sfx/sfx_08_5d.tx" +INCLUDE "music/sfx/sfx_08_5e.tx" +INCLUDE "music/sfx/sfx_08_5f.tx" +INCLUDE "music/sfx/sfx_08_60.tx" +INCLUDE "music/sfx/sfx_08_61.tx" +INCLUDE "music/sfx/sfx_08_62.tx" +INCLUDE "music/sfx/sfx_08_63.tx" +INCLUDE "music/sfx/sfx_08_64.tx" +INCLUDE "music/sfx/sfx_08_65.tx" +INCLUDE "music/sfx/sfx_08_66.tx" + +INCBIN "baserom.gbc",$20610,$20624 - $20610 ; unknown music + +INCLUDE "music/sfx/sfx_08_67.tx" +INCLUDE "music/sfx/sfx_08_68.tx" +INCLUDE "music/sfx/sfx_08_69.tx" +INCLUDE "music/sfx/sfx_08_6a.tx" +INCLUDE "music/sfx/sfx_08_6b.tx" +INCLUDE "music/sfx/sfx_08_6c.tx" +INCLUDE "music/sfx/sfx_08_6d.tx" +INCLUDE "music/sfx/sfx_08_6e.tx" +INCLUDE "music/sfx/sfx_08_6f.tx" + +INCBIN "baserom.gbc",$207f1,$207fa - $207f1 ; unknown music + +INCLUDE "music/sfx/sfx_08_70.tx" +INCLUDE "music/sfx/sfx_08_71.tx" + +INCBIN "baserom.gbc",$20862,$20875 - $20862 ; unknown music + +INCLUDE "music/sfx/sfx_08_72.tx" +INCLUDE "music/sfx/sfx_08_73.tx" +INCLUDE "music/sfx/sfx_08_74.tx" + +INCBIN "baserom.gbc",$208d5,$208e0 - $208d5 ; unknown music + +INCLUDE "music/sfx/sfx_08_75.tx" +INCLUDE "music/sfx/sfx_08_76.tx" + +INCBIN "baserom.gbc",$2098b,$209d7 - $2098b ; unknown music + +INCLUDE "music/sfx/sfx_08_1d.tx" +INCLUDE "music/sfx/sfx_08_37.tx" +INCLUDE "music/sfx/sfx_08_38.tx" +INCLUDE "music/sfx/sfx_08_25.tx" +INCLUDE "music/sfx/sfx_08_39.tx" +INCLUDE "music/sfx/sfx_08_17.tx" +INCLUDE "music/sfx/sfx_08_23.tx" +INCLUDE "music/sfx/sfx_08_24.tx" +INCLUDE "music/sfx/sfx_08_14.tx" +INCLUDE "music/sfx/sfx_08_22.tx" +INCLUDE "music/sfx/sfx_08_1a.tx" +INCLUDE "music/sfx/sfx_08_1b.tx" +INCLUDE "music/sfx/sfx_08_19.tx" +INCLUDE "music/sfx/sfx_08_1f.tx" +INCLUDE "music/sfx/sfx_08_20.tx" +INCLUDE "music/sfx/sfx_08_16.tx" +INCLUDE "music/sfx/sfx_08_21.tx" +INCLUDE "music/sfx/sfx_08_15.tx" +INCLUDE "music/sfx/sfx_08_1e.tx" +INCLUDE "music/sfx/sfx_08_1c.tx" +INCLUDE "music/sfx/sfx_08_18.tx" +INCLUDE "music/sfx/sfx_08_2d.tx" +INCLUDE "music/sfx/sfx_08_2a.tx" +INCLUDE "music/sfx/sfx_08_2f.tx" +INCLUDE "music/sfx/sfx_08_26.tx" +INCLUDE "music/sfx/sfx_08_27.tx" +INCLUDE "music/sfx/sfx_08_28.tx" +INCLUDE "music/sfx/sfx_08_32.tx" +INCLUDE "music/sfx/sfx_08_29.tx" +INCLUDE "music/sfx/sfx_08_2b.tx" +INCLUDE "music/sfx/sfx_08_30.tx" +INCLUDE "music/sfx/sfx_08_2e.tx" +INCLUDE "music/sfx/sfx_08_31.tx" +INCLUDE "music/sfx/sfx_08_2c.tx" +INCLUDE "music/sfx/sfx_08_33.tx" +INCLUDE "music/sfx/sfx_08_34.tx" +INCLUDE "music/sfx/sfx_08_35.tx" +INCLUDE "music/sfx/sfx_08_36.tx" Func_2136e: ; 2136e (8:536e) ld a, [$d083] @@ -44406,7 +46205,7 @@ Func_2210d: ; 2210d (8:610d) ld d, h add hl, hl add hl, de - ld de, Unknown_20000 ; $4000 + ld de, SFX_Headers_08 ; $4000 add hl, de ld a, h ld [$c0ec], a @@ -44610,7 +46409,7 @@ Func_2224e: ; 2224e (8:624e) ld d, h add hl, hl add hl, de - ld de, Unknown_20000 ; $4000 + ld de, SFX_Headers_08 ; $4000 add hl, de ld e, l ld d, h @@ -44735,7 +46534,18 @@ Unknown_22322: ; 22322 (8:6322) INCBIN "baserom.gbc",$22322,$22325 - $22322 Unknown_22325: ; 22325 (8:6325) -INCBIN "baserom.gbc",$22325,$23f52 - $22325 +INCBIN "baserom.gbc",$22325,$22370 - $22325 + +INCLUDE "music/gymleaderbattle.tx" +INCLUDE "music/trainerbattle.tx" +INCLUDE "music/wildbattle.tx" +INCLUDE "music/finalbattle.tx" +INCLUDE "music/sfx/sfx_08_3a.tx" +INCLUDE "music/sfx/sfx_08_3b.tx" +INCLUDE "music/sfx/sfx_08_46.tx" +INCLUDE "music/defeatedtrainer.tx" +INCLUDE "music/defeatedwildmon.tx" +INCLUDE "music/defeatedgymleader.tx" SECTION "bank9",ROMX,BANK[$9] @@ -112165,150 +113975,120 @@ TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) SECTION "bank1F",ROMX,BANK[$1F] -Unknown_7c000: ; 7c000 (1f:4000) -INCBIN "baserom.gbc",$7c000,$7c361 - $7c000 +INCLUDE "music/headers/sfxheaders1f.tx" +INCLUDE "music/headers/musicheaders1f.tx" + +INCLUDE "music/sfx/sfx_1f_01.tx" +INCLUDE "music/sfx/sfx_1f_02.tx" +INCLUDE "music/sfx/sfx_1f_03.tx" +INCLUDE "music/sfx/sfx_1f_04.tx" +INCLUDE "music/sfx/sfx_1f_05.tx" +INCLUDE "music/sfx/sfx_1f_06.tx" +INCLUDE "music/sfx/sfx_1f_07.tx" +INCLUDE "music/sfx/sfx_1f_08.tx" +INCLUDE "music/sfx/sfx_1f_09.tx" +INCLUDE "music/sfx/sfx_1f_0a.tx" +INCLUDE "music/sfx/sfx_1f_0b.tx" +INCLUDE "music/sfx/sfx_1f_0c.tx" +INCLUDE "music/sfx/sfx_1f_0d.tx" +INCLUDE "music/sfx/sfx_1f_0e.tx" +INCLUDE "music/sfx/sfx_1f_0f.tx" +INCLUDE "music/sfx/sfx_1f_10.tx" +INCLUDE "music/sfx/sfx_1f_11.tx" +INCLUDE "music/sfx/sfx_1f_12.tx" +INCLUDE "music/sfx/sfx_1f_13.tx" Unknown_7c361: ; 7c361 (1f:4361) -INCBIN "baserom.gbc",$7c361,$7c45e - $7c361 - +INCBIN "baserom.gbc",$7c361,$7c3c3 - $7c361 + +INCLUDE "music/sfx/sfx_1f_3f.tx" +INCLUDE "music/sfx/sfx_1f_56.tx" +INCLUDE "music/sfx/sfx_1f_57.tx" +INCLUDE "music/sfx/sfx_1f_58.tx" +INCLUDE "music/sfx/sfx_1f_3c.tx" +INCLUDE "music/sfx/sfx_1f_59.tx" +INCLUDE "music/sfx/sfx_1f_5a.tx" +INCLUDE "music/sfx/sfx_1f_5b.tx" +INCLUDE "music/sfx/sfx_1f_5c.tx" +INCLUDE "music/sfx/sfx_1f_40.tx" IF _RED -UnknSong_md_7c45e: ; 7c45e (1f:445e) - mus_duty duty50 - mus_note noteD, note4_16 - - db $f4 - - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note8_16 - - mus_octave oct3 - mus_note noteA#, note16 - mus_note noteC, note2 - - mus_end -UnknSong_md_7c475: ; 7c475 (1f:4475) - mus_duty duty50 - mus_note noteD, note4_16 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4 - - db $d4 - - mus_note noteC, note8 - mus_note noteC, note2 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteG#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteRst, note8 - - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteC, note8 - mus_note noteC, note2 - mus_note noteD, note8_16 - mus_note noteRst, note4_16 - - mus_note noteA#, note8 - mus_note noteC, note2 - - mus_end + INCLUDE "music/sfx/sfx_1f_5d.tx" ENDC IF _BLUE -UnknSong_md_7c45e: ; 7c45e (1f:445e) - mus_duty duty50 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note1 - - db $f2 - - mus_octave oct7 - mus_note noteC, note2 - - mus_end -UnknSong_md_7c475: ; 7c475 (1f:4475) - mus_duty duty50 - mus_note noteD, note4 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteC, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteG#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteRst, note8 - - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteRst, note4_16 - - mus_note noteC, note8 - mus_note noteC, note2 - mus_note noteD, note1 - - db $d2 - - mus_octave oct6 - mus_note noteC, note2 - - mus_end + INCLUDE "music/blue/sfx_1f_5d.tx" ENDC - -INCBIN "baserom.gbc",$7c490,$7d13b - $7c490 +INCLUDE "music/sfx/sfx_1f_3d.tx" +INCLUDE "music/sfx/sfx_1f_43.tx" +INCLUDE "music/sfx/sfx_1f_3e.tx" +INCLUDE "music/sfx/sfx_1f_44.tx" +INCLUDE "music/sfx/sfx_1f_45.tx" +INCLUDE "music/sfx/sfx_1f_46.tx" +INCLUDE "music/sfx/sfx_1f_47.tx" +INCLUDE "music/sfx/sfx_1f_48.tx" +INCLUDE "music/sfx/sfx_1f_49.tx" +INCLUDE "music/sfx/sfx_1f_4a.tx" +INCLUDE "music/sfx/sfx_1f_4b.tx" +INCLUDE "music/sfx/sfx_1f_4c.tx" +INCLUDE "music/sfx/sfx_1f_4d.tx" +INCLUDE "music/sfx/sfx_1f_4e.tx" +INCLUDE "music/sfx/sfx_1f_4f.tx" +INCLUDE "music/sfx/sfx_1f_50.tx" +INCLUDE "music/sfx/sfx_1f_51.tx" +INCLUDE "music/sfx/sfx_1f_52.tx" +INCLUDE "music/sfx/sfx_1f_53.tx" +INCLUDE "music/sfx/sfx_1f_54.tx" +INCLUDE "music/sfx/sfx_1f_55.tx" +INCLUDE "music/sfx/sfx_1f_5e.tx" +INCLUDE "music/sfx/sfx_1f_5f.tx" +INCLUDE "music/sfx/sfx_1f_60.tx" +INCLUDE "music/sfx/sfx_1f_61.tx" +INCLUDE "music/sfx/sfx_1f_62.tx" +INCLUDE "music/sfx/sfx_1f_63.tx" +INCLUDE "music/sfx/sfx_1f_64.tx" +INCLUDE "music/sfx/sfx_1f_65.tx" +INCLUDE "music/sfx/sfx_1f_66.tx" +INCLUDE "music/sfx/sfx_1f_67.tx" + +INCBIN "baserom.gbc",$7c758,$7c7a4 - $7c758 + +INCLUDE "music/sfx/sfx_1f_1d.tx" +INCLUDE "music/sfx/sfx_1f_37.tx" +INCLUDE "music/sfx/sfx_1f_38.tx" +INCLUDE "music/sfx/sfx_1f_25.tx" +INCLUDE "music/sfx/sfx_1f_39.tx" +INCLUDE "music/sfx/sfx_1f_17.tx" +INCLUDE "music/sfx/sfx_1f_23.tx" +INCLUDE "music/sfx/sfx_1f_24.tx" +INCLUDE "music/sfx/sfx_1f_14.tx" +INCLUDE "music/sfx/sfx_1f_22.tx" +INCLUDE "music/sfx/sfx_1f_1a.tx" +INCLUDE "music/sfx/sfx_1f_1b.tx" +INCLUDE "music/sfx/sfx_1f_19.tx" +INCLUDE "music/sfx/sfx_1f_1f.tx" +INCLUDE "music/sfx/sfx_1f_20.tx" +INCLUDE "music/sfx/sfx_1f_16.tx" +INCLUDE "music/sfx/sfx_1f_21.tx" +INCLUDE "music/sfx/sfx_1f_15.tx" +INCLUDE "music/sfx/sfx_1f_1e.tx" +INCLUDE "music/sfx/sfx_1f_1c.tx" +INCLUDE "music/sfx/sfx_1f_18.tx" +INCLUDE "music/sfx/sfx_1f_2d.tx" +INCLUDE "music/sfx/sfx_1f_2a.tx" +INCLUDE "music/sfx/sfx_1f_2f.tx" +INCLUDE "music/sfx/sfx_1f_26.tx" +INCLUDE "music/sfx/sfx_1f_27.tx" +INCLUDE "music/sfx/sfx_1f_28.tx" +INCLUDE "music/sfx/sfx_1f_32.tx" +INCLUDE "music/sfx/sfx_1f_29.tx" +INCLUDE "music/sfx/sfx_1f_2b.tx" +INCLUDE "music/sfx/sfx_1f_30.tx" +INCLUDE "music/sfx/sfx_1f_2e.tx" +INCLUDE "music/sfx/sfx_1f_31.tx" +INCLUDE "music/sfx/sfx_1f_2c.tx" +INCLUDE "music/sfx/sfx_1f_33.tx" +INCLUDE "music/sfx/sfx_1f_34.tx" +INCLUDE "music/sfx/sfx_1f_35.tx" +INCLUDE "music/sfx/sfx_1f_36.tx" ; known jump sources: 441b0 (11:41b0) Func_7d13b: ; 7d13b (1f:513b) @@ -113700,7 +115480,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) ld d, h add hl, hl add hl, de - ld de, Unknown_7c000 ; $4000 + ld de, SFX_Headers_1f ; $4000 add hl, de ld a, h ld [$c0ec], a @@ -113904,7 +115684,7 @@ Func_7db03: ; 7db03 (1f:5b03) ld d, h add hl, hl add hl, de - ld de, Unknown_7c000 ; $4000 + ld de, SFX_Headers_1f ; $4000 add hl, de ld e, l ld d, h @@ -114004,7 +115784,30 @@ Unknown_7db9b: ; 7db9b (1f:5b9b) INCBIN "baserom.gbc",$7db9b,$7dba3 - $7db9b Unknown_7dba3: ; 7dba3 (1f:5ba3) -INCBIN "baserom.gbc",$7dba3,$80000 - $7dba3 +INCBIN "baserom.gbc",$7dba3,$7dbbb - $7dba3 + +INCLUDE "music/bikeriding.tx" +INCLUDE "music/dungeon1.tx" +INCLUDE "music/gamecorner.tx" +INCLUDE "music/titlescreen.tx" +INCLUDE "music/sfx/sfx_1f_3a.tx" +INCLUDE "music/dungeon2.tx" +INCLUDE "music/dungeon3.tx" +INCLUDE "music/cinnabarmansion.tx" +INCLUDE "music/sfx/sfx_1f_41.tx" +INCLUDE "music/sfx/sfx_1f_3b.tx" +INCLUDE "music/sfx/sfx_1f_42.tx" +INCLUDE "music/oakslab.tx" +INCLUDE "music/pokemontower.tx" +INCLUDE "music/silphco.tx" +INCLUDE "music/meeteviltrainer.tx" +INCLUDE "music/meetfemaletrainer.tx" +INCLUDE "music/meetmaletrainer.tx" +INCLUDE "music/introbattle.tx" +INCLUDE "music/surfing.tx" +INCLUDE "music/jigglypuffsong.tx" +INCLUDE "music/halloffame.tx" +INCLUDE "music/credits.tx" SECTION "bank20",ROMX,BANK[$20] diff --git a/music.asm b/music.asm deleted file mode 100644 index 36fac48b..00000000 --- a/music.asm +++ /dev/null @@ -1,13268 +0,0 @@ -; Music Data -; The start and stop of these byte ranges were based off the theory they're lined -; consecutively (Right up against each other). - -;INCBIN "baserom.gbc",$82FD,$9ba3 - $82FD -; 82FD - -UnknSong_md_82fd: - mus_note noteD, note16 - mus_note noteRst, note8 - - mus_note noteD#, note4 - - mus_end - -UnknSong_md_8301: - mus_note noteD, note16; 8301 - mus_note noteB, note8 - mus_note noteD#, note4 - - mus_end - -UnknSong_md_8305: - mus_note noteD, note16 - mus_note noteA#, note8; 8306 - mus_note noteD#, note4 - - mus_end - -UnknSong_md_8309: - mus_note noteD, note16 - mus_note noteG#, note8 - mus_note noteD#, note4; 830B - - mus_end - -UnknSong_md_830d: - mus_note noteD, note2 - mus_note noteG#, note4_16 - mus_note noteD#, note2 - mus_note noteD, note4_8_16; 8310 - mus_note noteG#, note4_16 - mus_note noteD#, note4_8_16 - mus_note noteD, note4_8 - mus_note noteG#, note4 - mus_note noteD#, note4_8; 8315 - mus_note noteD, note4_16 - mus_note noteG#, note4 - mus_note noteD#, note4_16 - mus_note noteD, note4 - mus_note noteG#, note8_16; 831A - mus_note noteD#, note4 - mus_note noteD, note8_16 - mus_note noteG#, note8 - mus_note noteD#, note8_16 - - mus_end; 831F - -UnknSong_md_8320: - mus_note noteD, note16 - mus_note noteF, note8 - mus_note noteD, note2_8_16 - - mus_end - -UnknSong_md_8324: - mus_note noteD, note8; 8324 - mus_note noteE, note8 - mus_note noteD, note2_4 - mus_note noteD, note16 - mus_note noteF#, note8 - mus_note noteD, note2_8_16; 8329 - - mus_end - -UnknSong_md_832b: - mus_note noteD, note16 - mus_note noteG#, note8 - mus_note noteC#, note16 - - mus_end; 832E - -UnknSong_md_832f: - mus_note noteD, note16 - mus_note noteG#, note8_16 - mus_note noteD, note4 - - mus_end - -UnknSong_md_8333: - mus_note noteD, note16; 8333 - mus_note noteG#, note8_16 - mus_note noteD, note4_8 - - mus_end - -UnknSong_md_8337: - mus_note noteD, note16 - mus_note noteG#, note8_16; 8338 - mus_note noteD, note4_8_16 - - mus_end - -UnknSong_md_833b: - mus_note noteD, note16 - mus_note noteA#, note8 - mus_note noteC#, note16; 833D - - mus_end - -UnknSong_md_833f: - mus_note noteD, note16 - mus_note noteA#, note8_16 - mus_note noteC#, note8 - - mus_end; 8342 - -UnknSong_md_8343: - mus_note noteD, note16 - mus_note noteA#, note8_16 - mus_note noteF, note16 - - mus_end - -UnknSong_md_8347: - mus_note noteD, note16; 8347 - mus_note noteA#, note8 - mus_note noteC#, note2_16 - mus_note noteD, note16 - mus_note noteD#, note8 - mus_note noteD#, note4; 834C - - mus_end - -UnknSong_md_834e: - mus_note noteD, note8_16 - mus_note noteA, note8 - mus_note noteD, note2_16 - mus_note noteD, note16; 8351 - mus_note noteG, note8 - mus_note noteC#, note2_16 - - mus_end - -UnknSong_md_8355: - mus_note noteD, note16 - mus_note noteA, note8; 8356 - mus_note noteD, note8_16 - - mus_end - -UnknSong_md_8359: - mus_note noteD, note16 - mus_note noteG, note8 - mus_note noteD, note8_16; 835B - - mus_end - -UnknSong_md_835d: - mus_note noteD, note16 - mus_note noteF#, note8 - mus_note noteD, note8_16 - - mus_end; 8360 - -UnknSong_md_8361: - mus_note noteG, note4 - mus_note noteE, note4 - mus_note noteG#, note4 - mus_note noteE, note4 - mus_note noteA, note4; 8365 - mus_note noteE, note4 - mus_note noteA#, note4 - mus_note noteE, note4 - mus_note noteB, note4 - mus_note noteE, note4; 836A - mus_note noteRst, note4 - - mus_note noteE, note4 - mus_note noteRst, note4 - - mus_note noteE, note4 - mus_note noteRst, note4; 836F - - mus_note noteE, note4 - mus_note noteRst, note4 - - mus_note noteE, note4 - mus_note noteC, note8_16 - mus_note noteE, note4_8_16; 8374 - mus_note noteG#, note2_8_16 - mus_note noteRst, note2_4_8_16 - - mus_end - -UnknSong_md_8378: - mus_jump 237, $CBDC - mus_note noteA#, note2_8; 837C - mus_note noteG#, note2 - mus_note noteF#, note4_8 - mus_note noteE, note4_16 - mus_note noteD#, note4 - mus_note noteD, note8_16; 8381 - mus_note noteC#, note8 - mus_note noteC, note8_16 - mus_note noteE, note4_8_16 - mus_note noteG#, note2_8_16 - mus_note noteRst, note2_4_8_16; 8386 - - db $ef - mus_end - -UnknSong_md_8389: - mus_jump 238, $CBDD - mus_note noteA#, note2_8 - mus_note noteG#, note2; 838E - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteD, note8_16 - mus_note noteC#, note8 - mus_note noteC#, note4; 8393 - mus_note noteF#, note2_8 - mus_note noteB, note2_4_8 - - db $ee - db $ee - mus_end; 8398 - -UnknSong_md_8399: - mus_end - -UnknSong_md_839a: - mus_tempo 222, 255 - mus_end - -UnknSong_md_839e: - db $ee - db $ee; 839F - db $db - - mus_note noteA, note4_8_16 - mus_note noteD#, note8 - mus_note noteC, note8_16 - mus_note noteE, note4_8_16; 83A4 - mus_note noteG#, note2_8_16 - mus_note noteRst, note2_4_8 - - db $ef - mus_jump 222, $EEFF - mus_vel 11, 10; 83AD - mus_note noteA, note2_16 - mus_note noteG, note4_8_16 - mus_note noteF, note4_16 - mus_note noteD#, note8_16 - mus_note noteC#, note16; 83B2 - mus_note noteC, note8 - mus_note noteD, note4 - mus_note noteE, note4_8 - mus_note noteF#, note2 - mus_note noteG#, note2_8_16; 83B7 - mus_note noteRst, note2_4_8 - - db $ee - db $f7 - - mus_note noteG, note1 - - db $ee; 83BC - mus_vel 10, 8 - mus_note noteG, note4_8_16 - mus_note noteF, note4_16 - mus_note noteD#, note8_16 - mus_note noteC#, note16; 83C2 - mus_note noteD, note8 - - mus_octave oct5 - mus_note noteD#, note4 - mus_note noteD, note2_16 - - mus_octave oct6; 83C7 - mus_note noteD, note8_16 - - mus_end - -UnknSong_md_83ca: - mus_mod 16, 1, 4 - mus_vel 1, 0 - - mus_octave oct4; 83CF - mus_note noteE, note8 - mus_note noteF, note8 - mus_note noteG, note4 - mus_note noteA, note8 - mus_note noteG, note8; 83D4 - - mus_octave oct5 - mus_note noteC, note4 - mus_note noteC, note8 - mus_note noteD, note8 - mus_note noteC, note8; 83D9 - - mus_octave oct4 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteF, note8 - mus_note noteG, note2; 83DE - mus_note noteRst, note2_4 - - mus_end - -UnknSong_md_83e1: - mus_note noteD, note8_16 - - db $f7 - - mus_note noteD, note4_16; 83E3 - mus_note noteD, note8_16 - - db $f7 - - mus_note noteD#, note4_16 - mus_note noteD, note4_16 - - db $f7; 83E8 - - mus_note noteE, note4_16 - mus_note noteD, note2_16 - - db $f4 - - mus_note noteF, note4_8 - mus_note noteD, note2_16; 83ED - - db $f1 - - mus_note noteE, note4_16 - - mus_end - -UnknSong_md_83f1: - mus_note noteD, note2_8 - - db $f1; 83F2 - - mus_note noteE, note4_16 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteE, note4 - - mus_end; 83F7 - -UnknSong_md_83f8: - mus_duty duty50 - mus_note noteD, note2_16 - - mus_octave oct6 - mus_note noteE, note16 - mus_note noteC, note2; 83FD - - mus_end - -UnknSong_md_83ff: - mus_duty duty50 - mus_note noteD, note8_16 - mus_note noteC, note2_16 - mus_note noteC, note16; 8403 - mus_note noteC, note16 - mus_note noteD, note2_16 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteC, note2; 8408 - - mus_end - -UnknSong_md_840a: - mus_duty duty50 - mus_note noteC#, note16 - mus_note noteD#, note2_8_16 - mus_note noteD, note4_16; 840E - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note8_16 - mus_note noteC#, note16 - mus_note noteD, note8_16; 8413 - mus_note noteD, note2_16 - - mus_octave oct5 - mus_note noteC, note16 - mus_note noteC, note8_16 - mus_note noteC#, note16; 8418 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_841b: - mus_duty duty50 - mus_note noteD, note4_16 - - db $f1; 841E - - mus_note noteG#, note16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8422: - mus_duty duty50 - mus_note noteD, note8; 8424 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4_16 - mus_note noteA#, note8; 8429 - mus_note noteF#, note8 - mus_note noteC, note2 - - mus_end - -UnknSong_md_842d: - mus_duty duty50 - mus_note noteD, note4_16; 842F - - mus_octave oct6 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note2_16 - - db $f2; 8434 - - mus_octave oct7 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8438: - mus_duty duty50 - mus_note noteD, note8; 843A - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4_16 - mus_note noteA, note8; 843F - mus_note noteRst, note8 - - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteA#, note8_16 - mus_note noteA#, note8; 8444 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8447: - mus_duty duty50 - mus_note noteC#, note16 - mus_note noteF, note2_8_16; 844A - mus_note noteD, note1 - - db $f1 - - mus_note noteC, note16 - mus_note noteC, note4 - mus_note noteC#, note16; 844F - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_8452: - mus_note noteD, note8_16 - - db $f1 - - mus_note noteF, note4_16; 8454 - mus_note noteD, note2_4_16 - mus_note noteG, note8 - mus_note noteD, note4 - mus_note noteD, note8_16 - mus_note noteB, note8; 8459 - mus_note noteF, note4_16 - mus_note noteD, note2_4_16 - mus_note noteF#, note8 - mus_note noteD, note4 - mus_note noteD, note4_8_16; 845E - mus_note noteE, note8 - mus_note noteF, note4_16 - - mus_end - -UnknSong_md_8462: - mus_duty duty50 - mus_note noteD, note16; 8464 - mus_note noteA, note8 - mus_note noteRst, note16 - - mus_note noteC, note2 - mus_note noteD, note16 - mus_note noteG#, note8; 8469 - - db $d0 - - mus_note noteC, note2 - mus_note noteD, note16 - mus_note noteA, note8 - mus_note noteRst, note16; 846E - - mus_note noteC, note2 - mus_note noteD, note2_4_16 - mus_note noteA#, note8 - - db $d0 - - mus_note noteC, note2; 8473 - - mus_end - -UnknSong_md_8475: - mus_duty duty50 - mus_note noteD, note4_16 - - db $f4 - - mus_note noteC, note16; 8479 - mus_note noteC, note2 - mus_note noteD, note8_16 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteC, note4_8_16; 847E - mus_note noteD, note8_16 - - mus_octave oct3 - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16; 8483 - - mus_octave oct3 - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note8_16 - - mus_octave oct3; 8488 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note8_16 - - mus_octave oct3 - mus_note noteA#, note16; 848D - mus_note noteC, note2 - mus_note noteD, note1 - - db $f2 - - mus_octave oct7 - mus_note noteC, note2; 8492 - - mus_end - -UnknSong_md_8494: - mus_duty duty50 - mus_note noteD, note4_16 - mus_note noteC, note2_16 - mus_note noteC, note16; 8498 - mus_note noteC, note16 - mus_note noteD, note8_16 - - db $d4 - - mus_note noteC, note8 - mus_note noteC, note2; 849D - mus_note noteD, note8_16 - mus_note noteRst, note4_16 - - mus_note noteC, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16; 84A2 - mus_note noteRst, note4_16 - - mus_note noteG#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16 - mus_note noteRst, note4_16; 84A7 - - mus_note noteRst, note8 - - mus_note noteC, note4_8_16 - mus_note noteD, note8_16 - mus_note noteRst, note4_16 - - mus_note noteC, note8; 84AC - mus_note noteC, note2 - mus_note noteD, note8_16 - mus_note noteRst, note4_16 - - mus_note noteA#, note8 - mus_note noteC, note2; 84B1 - mus_note noteD, note1 - - db $d2 - - mus_octave oct6 - mus_note noteC, note2 - - mus_end; 84B6 - -UnknSong_md_84b7: - mus_duty duty50 - mus_note noteC#, note16 - mus_note noteC#, note2 - mus_note noteD, note1 - - mus_volume 240; 84BD - mus_note noteC, note4_16 - mus_note noteD, note1 - - db $f2 - - mus_note noteF, note16 - mus_note noteC, note4_8_16; 84C2 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_84c6: - mus_duty duty12_5 - mus_note noteC#, note16; 84C8 - mus_note noteC#, note4_16 - mus_note noteD, note4_16 - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note4_8_16; 84CD - - mus_jump 4, $44C6 - mus_note noteD, note1 - - db $f3 - - mus_note noteC, note16 - mus_note noteC, note4_8_16; 84D5 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_84d9: - mus_duty duty50 - mus_note noteC#, note16; 84DB - mus_note noteC#, note4_16 - mus_note noteD, note4_16 - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note4_8_16; 84E0 - mus_note noteD, note4_16 - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note4_8_16 - mus_note noteC#, note16; 84E5 - mus_note noteC#, note2 - mus_note noteD, note1 - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note4_8_16; 84EA - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_84ee: - mus_duty duty50 - mus_note noteC#, note16; 84F0 - mus_note noteC#, note4_8 - mus_note noteD, note1 - - mus_volume 240 - mus_note noteC, note4_16 - mus_note noteD, note1; 84F6 - - db $f2 - - mus_note noteF, note16 - mus_note noteC, note4_8_16 - mus_note noteC#, note16 - mus_note noteC, note2_16; 84FB - - mus_end - -UnknSong_md_84fd: - mus_duty duty50 - mus_note noteD, note1 - - db $f2 - - mus_note noteRst, note16; 8501 - - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16; 8506 - mus_note noteD, note4 - mus_note noteA#, note8 - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note4; 850B - mus_note noteA#, note8 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note4 - mus_note noteA#, note8; 8510 - mus_note noteE, note16 - mus_note noteC, note2 - mus_note noteD, note4 - mus_note noteA#, note8 - mus_note noteC, note16; 8515 - mus_note noteC, note2 - mus_note noteD, note4 - mus_note noteA#, note8 - mus_note noteG#, note16 - mus_note noteC, note2; 851A - mus_note noteD, note4 - mus_note noteA#, note8 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note4; 851F - mus_note noteA#, note8 - mus_note noteRst, note16 - - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteA#, note8; 8524 - mus_note noteC, note16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8528: - mus_duty duty50 - mus_note noteD, note4_16; 852A - - mus_volume 0 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - - mus_volume 0 - mus_note noteC, note4_16; 8531 - mus_note noteD, note4_16 - - mus_volume 0 - mus_note noteC, note8_16 - mus_note noteD, note8 - mus_note noteC, note16; 8537 - mus_note noteC, note16 - mus_note noteC, note16 - - mus_end - -UnknSong_md_853b: - mus_duty duty50 - mus_note noteD, note4_8_16; 853D - - mus_volume 0 - mus_note noteC, note2 - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note16; 8543 - mus_note noteC, note16 - mus_note noteD, note4_8_16 - - mus_volume 0 - mus_note noteC, note2 - mus_note noteD, note8; 8549 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16 - - mus_end - -UnknSong_md_854e: - mus_duty duty25; 854F - mus_note noteC#, note16 - mus_note noteC#, note2 - mus_note noteD, note1 - - db $d7 - - mus_note noteC, note16; 8554 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteB, note2 - mus_note noteG#, note16 - mus_note noteC, note4_8; 8559 - mus_note noteD, note1 - mus_note noteG#, note2 - mus_note noteC, note16 - mus_note noteC, note4_8 - mus_note noteD, note1; 855E - mus_note noteE, note2 - mus_note noteG#, note16 - mus_note noteC, note4_16 - mus_note noteD, note1 - mus_note noteC#, note2; 8563 - mus_note noteC, note16 - mus_note noteC, note4_16 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end; 8568 - -UnknSong_md_8569: - mus_duty duty50 - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16; 856E - mus_note noteD, note8_16 - - db $f1 - - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note8; 8573 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4_16 - - db $f1; 8578 - - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note16; 857D - mus_note noteC, note16 - - mus_end - -UnknSong_md_8580: - mus_duty duty50 - mus_note noteC#, note16 - mus_note noteD, note2_4_16; 8583 - mus_note noteD, note4_16 - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note4_8 - mus_note noteC#, note16; 8588 - mus_note noteD, note8_16 - mus_note noteD, note8_16 - - db $f1 - - mus_note noteC, note16 - mus_note noteC, note4_8; 858D - mus_note noteC#, note16 - mus_note noteC, note2_16 - mus_note noteD, note8 - mus_note noteC, note16 - mus_note noteC, note16; 8592 - mus_note noteC, note16 - - mus_end - -UnknSong_md_8595: - mus_duty duty25 - mus_note noteC#, note16 - mus_note noteC#, note2; 8598 - mus_note noteD, note1 - - db $d7 - - mus_note noteC, note16 - mus_note noteC, note4_8 - mus_note noteD, note1; 859D - mus_note noteB, note2 - mus_note noteG#, note16 - mus_note noteC, note4_8 - mus_note noteD, note1 - mus_note noteG#, note2; 85A2 - mus_note noteC, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteE, note2 - mus_note noteG#, note16; 85A7 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteC#, note2 - mus_note noteC, note16 - mus_note noteC, note2; 85AC - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_85b0: - mus_duty duty25 - mus_note noteC#, note16; 85B2 - mus_note noteC#, note2 - mus_note noteD, note1 - - db $d7 - - mus_note noteC, note16 - mus_note noteC, note2; 85B7 - mus_note noteD, note1 - mus_note noteB, note2 - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note1; 85BC - mus_note noteG#, note2 - mus_note noteC, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteE, note2; 85C1 - mus_note noteG#, note16 - mus_note noteC, note4_8 - mus_note noteD, note1 - mus_note noteC#, note2 - mus_note noteC, note16; 85C6 - mus_note noteC, note4_8 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_85cb: - mus_duty duty25; 85CC - mus_note noteC#, note16 - mus_note noteC#, note4_8_16 - mus_note noteD, note1 - - db $d2 - - mus_note noteC, note16; 85D1 - mus_note noteC, note4_8 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_85d6: - mus_duty duty50; 85D7 - mus_note noteC#, note16 - mus_note noteA, note4_8 - mus_note noteD, note1 - - db $f2 - - mus_note noteC, note16; 85DC - mus_note noteC, note4_16 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_85e1: - mus_note noteD, note8_16; 85E1 - - db $f1 - - mus_note noteD#, note8_16 - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16; 85E6 - mus_note noteD, note8_16 - - db $f1 - - mus_note noteD, note8_16 - mus_note noteD, note8 - mus_note noteC, note16; 85EB - mus_note noteC, note16 - - mus_end - -UnknSong_md_85ee: - mus_note noteD, note8_16 - - db $f1 - - mus_note noteC#, note8_16; 85F0 - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note8_16 - mus_note noteA#, note8; 85F5 - mus_note noteC#, note8_16 - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note8_16; 85FA - - db $d1 - - mus_note noteC#, note8_16 - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16; 85FF - mus_note noteD, note8_16 - mus_note noteG#, note8 - mus_note noteC#, note8_16 - mus_note noteD, note8_16 - mus_note noteC, note16; 8604 - mus_note noteC, note16 - mus_note noteD, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_note noteD, note8_16; 8609 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note8_16 - mus_note noteF#, note8 - mus_note noteC#, note8_16; 860E - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note8_16 - mus_note noteA, note8; 8613 - mus_note noteC#, note8_16 - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note8_16; 8618 - mus_note noteE, note8 - mus_note noteC#, note8_16 - mus_note noteD, note8_16 - mus_note noteC, note16 - mus_note noteC, note16; 861D - - mus_end - -UnknSong_md_861f: - mus_duty duty75 - mus_note noteC#, note16 - mus_note noteF, note2_8_16 - mus_note noteD, note4_16; 8623 - - mus_volume 0 - mus_note noteC, note4_8 - mus_note noteC#, note16 - mus_note noteC, note2_16 - mus_note noteD, note4_16; 8629 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note1 - - mus_volume 0; 862F - mus_note noteC, note4_8 - mus_note noteD, note8 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16; 8634 - - mus_end - -UnknSong_md_8636: - mus_duty duty75 - mus_note noteD, note4_16 - - mus_volume 1 - mus_note noteC, note4_16; 863B - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note1; 8640 - - mus_volume 1 - mus_note noteC, note4_16 - mus_note noteD, note8 - mus_note noteC, note16 - mus_note noteC, note16; 8646 - mus_note noteC, note16 - - mus_end - -UnknSong_md_8649: - mus_duty duty12_5 - mus_note noteC#, note16 - mus_note noteC#, note2; 864C - mus_note noteD, note1 - - db $d2 - - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteC#, note16; 8651 - mus_note noteC, note2_16 - - mus_end - -UnknSong_md_8654: - mus_note noteD, note4_16 - mus_note noteA#, note8_16 - mus_note noteD, note4; 8656 - mus_note noteD, note2_16 - - db $f1 - - mus_note noteD#, note4_16 - mus_note noteD, note1 - mus_note noteC, note16; 865B - mus_note noteC, note16 - mus_note noteD, note8_16 - - db $f7 - - mus_note noteD, note4_16 - mus_note noteD, note8_16; 8660 - - db $f7 - - mus_note noteD#, note4_16 - mus_note noteD, note4_16 - - db $f7 - - mus_note noteE, note4_16; 8665 - mus_note noteD, note2_16 - - db $f4 - - mus_note noteF, note4_8 - mus_note noteD, note2_16 - - db $f1; 866A - - mus_note noteE, note4_16 - - mus_end - -UnknSong_md_866d: - mus_duty duty50 - mus_note noteD, note1 - - mus_volume 0; 8671 - mus_note noteC, note4_8 - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16; 8676 - mus_note noteD, note1 - - mus_volume 0 - mus_note noteC, note4_8 - mus_note noteD, note1 - - mus_volume 0; 867D - mus_note noteC, note4_8 - mus_note noteD, note1 - - mus_volume 0 - mus_note noteC, note4_8 - mus_note noteD, note1; 8683 - - mus_volume 0 - mus_note noteC, note4_8 - mus_note noteD, note1 - - db $f2 - - mus_note noteC, note16; 8689 - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_868c: - mus_duty duty75 - mus_note noteD, note1 - - mus_volume 130; 8690 - mus_note noteC, note4_16 - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteC, note16; 8695 - mus_note noteD, note1 - - mus_volume 130 - mus_note noteC, note4_16 - mus_note noteD, note1 - - mus_volume 130; 869C - mus_note noteC, note4_16 - mus_note noteD, note1 - - mus_volume 130 - mus_note noteC, note4_16 - mus_note noteD, note1; 86A2 - - mus_volume 130 - mus_note noteC, note4_16 - mus_note noteD, note1 - - db $f2 - - mus_note noteG#, note8_16; 86A8 - mus_note noteC, note4_16 - - mus_end - -UnknSong_md_86ab: - mus_duty duty25 - mus_note noteC#, note16 - mus_note noteD#, note2_8_16; 86AE - mus_note noteD, note4_16 - - db $f2 - - mus_note noteC, note16 - mus_note noteC, note4_8 - mus_note noteC#, note16; 86B3 - mus_note noteD, note8_16 - mus_note noteD, note4_16 - - mus_octave oct5 - mus_note noteC, note16 - mus_note noteC, note4_8; 86B8 - mus_note noteC#, note16 - mus_note noteD#, note2_8_16 - mus_note noteD, note4_16 - - db $f2 - - mus_note noteC, note16; 86BD - mus_note noteC, note2 - mus_note noteC#, note16 - mus_note noteD, note8_16 - mus_note noteD, note1 - - mus_octave oct5; 86C2 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteC#, note16 - mus_note noteC, note2_16 - - mus_end; 86C7 - -UnknSong_md_86c8: - mus_duty duty50 - mus_note noteD, note1 - - db $f3 - - mus_note noteD#, note16 - mus_note noteC, note2; 86CD - mus_note noteD, note2_16 - mus_note noteF#, note4_8 - mus_note noteD#, note16 - mus_note noteC, note2 - mus_note noteD, note1; 86D2 - - db $f4 - - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteG, note4_16; 86D7 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteE, note4_16 - mus_note noteC, note16; 86DC - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteD, note4_16 - mus_note noteC, note16 - mus_note noteC, note2; 86E1 - - mus_end - -UnknSong_md_86e3: - db $fc - mus_volume 47 - - mus_octave oct7 - mus_note noteG#, note16; 86E7 - mus_note noteC, note2 - mus_note noteD, note1 - - mus_volume 132 - mus_note noteC, note2 - mus_note noteD, note1; 86ED - mus_note noteRst, note4 - - mus_octave oct7 - mus_note noteC, note4_8 - mus_note noteD, note1 - mus_note noteRst, note4_16; 86F2 - - mus_note noteC, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_8_16 - mus_note noteF#, note2_4_16 - mus_note noteG#, note16; 86F7 - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteG, note8 - mus_note noteG#, note4_16 - mus_note noteC, note2; 86FC - - mus_end - -UnknSong_md_86fe: - db $fc - - mus_note noteC, note4_8 - mus_note noteD, note1 - mus_note noteA#, note16; 8701 - mus_note noteE, note8 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteB, note16 - mus_note noteE, note4; 8706 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteA, note4 - mus_note noteB, note8 - mus_note noteC, note4_8; 870B - mus_note noteD, note1 - mus_note noteA, note4_16 - mus_note noteRst, note8 - - mus_note noteC, note4_8 - mus_note noteD, note2_8_16; 8710 - mus_note noteE, note2_4_16 - mus_note noteE, note8 - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteD#, note8; 8715 - mus_note noteE, note4_8_16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8719: - mus_note noteD, note8_16 - - db $f2; 871A - - mus_note noteE, note2_4_16 - mus_note noteD, note4_8_16 - - mus_octave oct7 - mus_note noteD#, note2_8_16 - mus_note noteD, note1; 871F - - db $d0 - - mus_note noteD#, note2_8_16 - mus_note noteD, note2_16 - - db $d0 - - mus_note noteD, note2_4_16; 8724 - mus_note noteD, note4_8_16 - - mus_octave oct1 - mus_note noteE, note2_4_16 - mus_note noteD, note2_4_16 - mus_note noteG, note2_4_8; 8729 - mus_note noteE, note2_4_16 - mus_note noteD, note1 - - db $d3 - - mus_note noteE, note2_4_16 - - mus_end; 872E - -UnknSong_md_872f: - db $fc - mus_volume 47 - db $f7 - - mus_note noteA#, note16 - mus_note noteC, note2; 8734 - mus_note noteD, note4_8_16 - - mus_octave oct1 - mus_note noteA#, note4 - mus_note noteC, note2 - mus_note noteD, note2_8_16; 8739 - - db $f4 - - mus_note noteA#, note16 - mus_note noteC, note2 - - db $fc - - mus_note noteA#, note4_8; 873E - mus_note noteD, note2_8_16 - - db $f6 - db $d8 - - mus_note noteC, note2 - mus_note noteD, note4_16; 8743 - - mus_octave oct4 - db $d7 - - mus_note noteC, note2 - mus_note noteD, note1 - - db $f2; 8748 - db $d8 - - mus_note noteC, note2 - - mus_end - -UnknSong_md_874c: - db $fc - - mus_note noteC, note4_8; 874D - mus_note noteD, note8_16 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note1; 8752 - mus_note noteA#, note2 - mus_note noteA#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteG#, note4_8_16; 8757 - mus_note noteA#, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_8_16 - mus_note noteG, note4_16 - mus_note noteA#, note8; 875C - mus_note noteC, note4_8_16 - - db $fc - - mus_note noteF, note1 - mus_note noteD, note2_8_16 - mus_note noteG, note4_8_16; 8761 - - db $d6 - - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteG#, note4 - - db $d9; 8766 - - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteA#, note8_16 - - db $d7 - - mus_note noteC, note4_8_16; 876B - - mus_end - -UnknSong_md_876d: - mus_note noteD, note8_16 - - db $f2 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_16; 8770 - - mus_octave oct3 - mus_note noteD#, note2_4_8_16 - mus_note noteD, note1 - - db $d7 - - mus_note noteD#, note2_4_16; 8775 - mus_note noteD, note4_8_16 - mus_note noteRst, note4_8 - - mus_note noteD#, note2_4 - mus_note noteD, note4_8_16 - - mus_octave oct3; 877A - mus_note noteD#, note2_4_8 - mus_note noteD, note2_16 - mus_note noteB, note4_8_16 - mus_note noteD#, note2_4_16 - mus_note noteD, note4_8_16; 877F - - db $d4 - - mus_note noteD#, note2_4_8 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteD#, note2_4; 8784 - - mus_end - -UnknSong_md_8786: - db $fc - mus_volume 47 - db $f7 - - mus_note noteRst, note16; 878A - - mus_note noteC, note2 - mus_note noteD, note4_8_16 - - mus_octave oct3 - mus_note noteRst, note8 - - mus_note noteC, note2; 878F - mus_note noteD, note2_8_16 - - db $f6 - - mus_note noteRst, note16 - - mus_note noteC, note2 - mus_note noteD, note4_16; 8794 - - db $d3 - - mus_note noteRst, note8_16 - - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteRst, note8; 8799 - - mus_note noteRst, note16 - - mus_note noteC, note2 - - mus_end - -UnknSong_md_879d: - db $fc - - mus_note noteF, note1; 879E - mus_note noteD, note1 - mus_note noteA, note2 - mus_note noteG#, note8 - mus_note noteC, note2 - mus_note noteD, note4_8_16; 87A3 - mus_note noteG#, note4_16 - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note2_8_16 - mus_note noteA, note4_8_16; 87A8 - mus_note noteG#, note8 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteG#, note4 - mus_note noteG#, note8; 87AD - mus_note noteC, note2 - - mus_end - -UnknSong_md_87b0: - mus_note noteD, note4 - - db $f2 - - mus_note noteD#, note2_4_16; 87B2 - mus_note noteD, note2_4_8 - - mus_octave oct1 - mus_note noteD, note2_4_16 - mus_note noteD, note1 - - db $d7; 87B7 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteD, note2_4_16 - - mus_end; 87BC - -UnknSong_md_87bd: - db $fc - mus_volume 47 - db $f7 - - mus_note noteG#, note16 - mus_note noteC, note4_8_16; 87C2 - mus_note noteD, note2_8_16 - - mus_octave oct1 - mus_note noteG#, note4_16 - mus_note noteC, note4_8_16 - mus_note noteD, note1; 87C7 - - db $d7 - - mus_note noteA, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - - db $d5; 87CC - - mus_note noteA, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteRst, note4_16 - - mus_note noteG#, note2_16; 87D1 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8 - - db $d3 - - mus_note noteG, note16 - mus_note noteC, note4_8_16; 87D6 - mus_note noteD, note4_16 - - db $d3 - - mus_note noteF#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16; 87DB - mus_note noteRst, note8 - - mus_note noteE, note16 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_87e0: - db $fc; 87E0 - - mus_note noteC, note4_8 - mus_note noteD, note1 - mus_note noteB, note2 - mus_note noteE, note8 - mus_note noteC, note4_8_16; 87E5 - mus_note noteD, note2_8_16 - mus_note noteA, note4_8_16 - mus_note noteE, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note1; 87EA - mus_note noteA#, note2 - mus_note noteF, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteA#, note4_8; 87EF - mus_note noteF, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteA, note4_16 - mus_note noteE, note2; 87F4 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8 - mus_note noteA#, note4 - mus_note noteD#, note8 - mus_note noteC, note4_8_16; 87F9 - mus_note noteD, note4_16 - mus_note noteA, note4 - mus_note noteD, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16; 87FE - mus_note noteG, note8 - mus_note noteC, note8 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8803: - mus_note noteD, note1; 8803 - - mus_octave oct3 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_8_16 - mus_note noteRst, note2 - - mus_note noteE, note2_4_16; 8808 - mus_note noteD, note2_8_16 - mus_note noteRst, note2 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_4_16 - mus_note noteB, note2; 880D - mus_note noteE, note2_4_16 - mus_note noteD, note1 - mus_note noteA#, note8_16 - mus_note noteF, note2_4_16 - - mus_end; 8812 - -UnknSong_md_8813: - db $fc - mus_volume 38 - db $f7 - - mus_note noteA#, note16 - mus_note noteC, note2; 8818 - mus_note noteD, note2_16 - - mus_octave oct1 - mus_note noteA#, note4_16 - mus_note noteC, note2 - mus_note noteD, note4_16; 881D - - db $d6 - - mus_note noteA#, note16 - mus_note noteC, note2 - mus_note noteD, note1 - - db $d3; 8822 - - mus_note noteD, note16 - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteRst, note4 - - mus_note noteD, note4; 8827 - mus_note noteC, note2 - mus_note noteD, note8_16 - mus_note noteRst, note8_16 - - mus_note noteD, note2_16 - mus_note noteC, note2; 882C - mus_note noteD, note2_16 - mus_note noteB, note8 - mus_note noteD#, note16 - mus_note noteC, note2 - - mus_end; 8831 - -UnknSong_md_8832: - db $fc - - mus_note noteC, note2_8_16 - mus_note noteD, note4_16 - mus_note noteC, note2_16 - mus_note noteC, note16; 8836 - mus_note noteC, note16 - mus_note noteD, note4_8_16 - mus_note noteA#, note2 - mus_note noteE, note8 - mus_note noteC, note2; 883B - mus_note noteD, note2_16 - mus_note noteG#, note4_8_16 - mus_note noteE, note4 - mus_note noteC, note2 - mus_note noteD, note4_16; 8840 - mus_note noteG, note4_8_16 - mus_note noteE, note8 - mus_note noteC, note2 - mus_note noteD, note2_4_8 - mus_note noteG#, note4; 8845 - mus_note noteRst, note8_16 - - mus_note noteC, note4_8_16 - mus_note noteD, note2 - mus_note noteG, note4 - mus_note noteRst, note8; 884A - - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteG#, note8_16 - mus_note noteRst, note2_4_16 - - mus_note noteC, note4_8_16; 884F - mus_note noteD, note2_16 - mus_note noteG, note8 - - db $d8 - - mus_note noteC, note4_8_16 - - mus_end; 8854 - -UnknSong_md_8855: - mus_note noteD, note8_16 - - db $f2 - - mus_note noteE, note2_4_16 - mus_note noteD, note4_8_16 - - mus_octave oct1; 8859 - mus_note noteD#, note2_8_16 - mus_note noteD, note4_16 - - db $d7 - - mus_note noteD#, note2_8_16 - mus_note noteD, note4_8_16; 885E - - db $d6 - - mus_note noteD, note2_4_16 - mus_note noteD, note2_16 - - mus_octave oct2 - mus_note noteD#, note2_4_16; 8863 - mus_note noteD, note2_4_16 - - db $d2 - - mus_note noteD#, note2_4_8 - mus_note noteD, note2_16 - - db $d1; 8868 - - mus_note noteD, note2_4_16 - - mus_end - -UnknSong_md_886b: - db $fc - - mus_note noteA#, note4_8 - mus_note noteD, note4_8_16; 886D - - db $f4 - - mus_note noteE, note16 - mus_note noteC, note2 - mus_note noteD, note1 - - mus_octave oct4; 8872 - mus_note noteD#, note16 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $f4 - - mus_note noteE, note16; 8877 - mus_note noteC, note2 - mus_note noteD, note4_8 - mus_note noteB, note4 - mus_note noteE, note2_16 - mus_note noteC, note2; 887C - mus_note noteD, note2_16 - - db $d1 - - mus_note noteF, note16 - mus_note noteC, note2 - - mus_end; 8881 - -UnknSong_md_8882: - db $fc - - mus_note noteG, note2 - mus_note noteD, note4_8_16 - mus_note noteRst, note4 - - mus_note noteC#, note8_16; 8886 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteB, note4 - mus_note noteC, note4_16 - mus_note noteC, note2; 888B - mus_note noteD, note4 - mus_note noteRst, note4 - - mus_note noteC#, note8_16 - mus_note noteC, note2 - mus_note noteD, note4_16; 8890 - mus_note noteRst, note4 - - mus_note noteD, note8 - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteB, note8; 8895 - mus_note noteD#, note8_16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8899: - mus_note noteD, note2_16 - - db $d6; 889A - - mus_note noteD, note2_4_16 - mus_note noteD, note2_4_16 - mus_note noteRst, note4_8_16 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_8_16; 889F - mus_note noteB, note4_8_16 - mus_note noteD, note2_4_16 - mus_note noteD, note2_16 - mus_note noteA, note8 - mus_note noteC#, note2_4_16; 88A4 - - mus_end - -UnknSong_md_88a6: - db $fc - mus_volume 36 - db $f7 - - mus_note noteC, note2_16; 88AA - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - - mus_octave oct1 - mus_note noteC, note16 - mus_note noteC, note4_8_16; 88AF - mus_note noteD, note4_8_16 - - db $d7 - mus_volume 5 - mus_note noteD, note4_8_16 - mus_note noteRst, note4_16; 88B5 - - mus_octave oct7 - mus_note noteC, note4_8 - mus_note noteD, note4_8 - - db $d3 - - mus_note noteRst, note16; 88BA - - mus_note noteC, note4_8 - mus_note noteD, note4_16 - - db $d3 - - mus_note noteA#, note16 - mus_note noteC, note4_8; 88BF - mus_note noteD, note2_16 - - mus_octave oct6 - mus_note noteG#, note16 - mus_note noteC, note4_8 - - mus_end; 88C4 - -UnknSong_md_88c5: - db $fc - - mus_note noteC, note2_8_16 - mus_note noteD, note4_16 - mus_note noteRst, note2 - - mus_note noteC, note4_16; 88C9 - mus_note noteC, note4_8 - mus_note noteD, note4_8_16 - mus_note noteA#, note4_8_16 - mus_note noteC, note8_16 - mus_note noteC, note4_8; 88CE - mus_note noteD, note4_8_16 - mus_note noteA, note2 - - db $f1 - - mus_note noteC, note4_16 - mus_note noteD, note4_16; 88D3 - mus_note noteB, note4_16 - - mus_octave oct6 - mus_note noteC, note4_16 - mus_note noteD, note4_8 - mus_note noteA#, note4; 88D8 - mus_note noteRst, note8_16 - - mus_note noteC, note4_16 - mus_note noteD, note4_16 - mus_note noteB, note4 - mus_note noteA#, note4; 88DD - mus_note noteC, note4_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteG#, note8_16 - mus_note noteC, note4_16; 88E2 - - mus_end - -UnknSong_md_88e4: - mus_note noteD, note2_4_16 - - mus_octave oct3 - mus_note noteE, note2_4_16 - mus_note noteD, note2_8_16; 88E7 - mus_note noteRst, note2 - - mus_note noteF, note2_4_16 - mus_note noteD, note2_4_16 - mus_note noteB, note4_8_16 - mus_note noteE, note2_4_16; 88EC - mus_note noteD, note1 - mus_note noteA#, note8_16 - mus_note noteF, note2_4_16 - - mus_end - -UnknSong_md_88f1: - db $fc; 88F1 - db $f1 - - mus_note noteD, note4_16 - - db $f7 - - mus_note noteRst, note16 - - mus_note noteC, note2; 88F6 - mus_note noteD, note2_4_16 - - mus_octave oct1 - mus_note noteRst, note8_16 - - mus_note noteC, note2 - mus_note noteD, note4_8_16; 88FB - mus_note noteB, note4_8 - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteRst, note4_16; 8900 - - mus_note noteG, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteB, note4_8 - mus_note noteF#, note16; 8905 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteE, note16 - mus_note noteC, note4_8_16; 890A - - mus_end - -UnknSong_md_890c: - db $fc - - mus_note noteRst, note2_4_16 - - mus_note noteD, note4 - mus_note noteRst, note2; 890F - - mus_note noteG#, note8 - mus_note noteC, note2 - mus_note noteD, note2_4_16 - mus_note noteB, note4_8_16 - mus_note noteG#, note16; 8914 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteA#, note4_8 - mus_note noteE, note8 - mus_note noteC, note4_8_16; 8919 - mus_note noteD, note4_16 - mus_note noteRst, note4_16 - - mus_note noteD#, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16; 891E - mus_note noteB, note4_8 - mus_note noteD, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteA#, note8; 8923 - mus_note noteC, note8_16 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8927: - mus_note noteD, note4 - - mus_octave oct3; 8928 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_4_16 - - db $d6 - - mus_note noteD, note2_4_16 - mus_note noteD, note4_16; 892D - - mus_octave oct3 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_16 - mus_note noteB, note2 - mus_note noteF, note2_4_16; 8932 - mus_note noteD, note1 - mus_note noteRst, note8_16 - - mus_note noteF, note2_4_8 - - mus_end - -UnknSong_md_8937: - db $fc; 8937 - - mus_note noteRst, note2_8 - - mus_note noteD, note2_16 - - db $f7 - - mus_note noteG#, note16 - mus_note noteC, note4_8_16; 893C - mus_note noteD, note8_16 - - db $f7 - - mus_note noteF#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note8; 8941 - - mus_octave oct0 - mus_note noteE, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note8 - - mus_octave oct0; 8946 - mus_note noteD, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - - db $d1 - - mus_note noteC, note16; 894B - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteRst, note2 - - mus_note noteE, note16 - mus_note noteC, note2; 8950 - mus_note noteD, note4_16 - mus_note noteA#, note2 - mus_note noteD#, note16 - mus_note noteC, note2 - mus_note noteD, note1; 8955 - mus_note noteA, note8 - mus_note noteD, note16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_895a: - db $fc; 895A - - mus_note noteG, note2_8 - mus_note noteD, note2_8_16 - - mus_octave oct0 - mus_note noteG#, note8_16 - mus_note noteC, note4_8_16; 895F - mus_note noteD, note8_16 - - mus_octave oct0 - mus_note noteF#, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note8; 8964 - - db $d7 - - mus_note noteE, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note8 - - db $d7; 8969 - - mus_note noteD, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteRst, note8 - - mus_note noteC, note8_16; 896E - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteB, note2 - mus_note noteE, note8_16 - mus_note noteC, note2; 8973 - mus_note noteD, note8_16 - mus_note noteA, note2 - mus_note noteD#, note8_16 - mus_note noteC, note2 - mus_note noteD, note1; 8978 - mus_note noteG#, note8 - mus_note noteD, note8_16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_897d: - mus_note noteD, note4_16; 897D - mus_note noteG, note4_16 - mus_note noteD, note8 - mus_note noteD, note4_16 - mus_note noteG, note4_16 - mus_note noteC#, note16; 8982 - mus_note noteD, note4_16 - mus_note noteG, note8 - mus_note noteD, note16 - - mus_end - -UnknSong_md_8987: - db $fc; 8987 - db $f5 - - mus_note noteD, note4_16 - - db $f3 - - mus_note noteC#, note2_16 - mus_note noteC, note2; 898C - mus_note noteD, note1 - - mus_octave oct2 - mus_note noteA, note2_16 - mus_note noteC, note2 - mus_note noteD, note2_16; 8991 - mus_note noteA, note8 - mus_note noteF, note2_16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8996: - db $fc; 8996 - - mus_note noteA#, note16 - mus_note noteD, note4_8 - mus_note noteB, note4 - mus_note noteC, note2_16 - mus_note noteC, note2; 899B - mus_note noteD, note1 - mus_note noteRst, note4_8 - - mus_note noteG#, note2_16 - mus_note noteC, note2 - mus_note noteD, note2_16; 89A0 - mus_note noteG, note8 - mus_note noteE, note2_16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_89a5: - mus_note noteD, note4; 89A5 - mus_note noteA#, note8 - mus_note noteC#, note2_4_16 - mus_note noteD, note2_4_8_16 - mus_note noteA, note4_16 - mus_note noteD, note2_4_16; 89AA - mus_note noteD, note2_16 - mus_note noteG#, note8 - mus_note noteC#, note2_4_16 - - mus_end - -UnknSong_md_89af: - db $fc; 89AF - - mus_note noteA#, note4_8 - mus_note noteD, note4_16 - - mus_octave oct6 - mus_note noteC, note16 - mus_note noteC, note2; 89B4 - mus_note noteD, note4_16 - - db $f2 - - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note8_16; 89B9 - mus_note noteA, note8_16 - mus_note noteE, note16 - mus_note noteC, note2 - mus_note noteD, note2_16 - - mus_octave oct6; 89BE - mus_note noteC, note16 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_89c2: - db $fc - - mus_note noteC, note2_8_16; 89C3 - mus_note noteD, note4_16 - mus_note noteB, note8 - - mus_octave oct6 - mus_note noteC, note4_8_16 - mus_note noteD, note4; 89C8 - mus_note noteRst, note8_16 - - mus_octave oct6 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteF#, note8_16; 89CD - mus_note noteG#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteB, note8 - - mus_octave oct6; 89D2 - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_89d5: - mus_note noteD, note8_16 - mus_note noteF#, note8 - mus_note noteD#, note8_16; 89D7 - mus_note noteD, note8_16 - mus_note noteF#, note8 - mus_note noteD, note8 - mus_note noteD, note2_16 - mus_note noteF#, note8; 89DC - mus_note noteC#, note8 - - mus_end - -UnknSong_md_89df: - db $fc - db $fa - - mus_note noteD, note4_8_16; 89E1 - mus_note noteG#, note4 - mus_note noteE, note2 - mus_note noteC, note8_16 - mus_note noteD, note1 - mus_note noteF#, note8_16; 89E6 - mus_note noteD, note4_8_16 - mus_note noteC, note8_16 - mus_note noteD, note4_16 - mus_note noteF, note8_16 - mus_note noteE, note4_8; 89EB - mus_note noteC, note8_16 - mus_note noteD, note2_8 - mus_note noteF#, note4 - mus_note noteC, note4_8_16 - mus_note noteC, note8_16; 89F0 - mus_note noteD, note1 - mus_note noteG#, note8_16 - mus_note noteD, note4_8 - mus_note noteC, note8_16 - mus_note noteD, note1; 89F5 - mus_note noteE, note8_16 - mus_note noteC, note2 - mus_note noteC, note8_16 - - mus_end - -UnknSong_md_89fa: - mus_note noteD, note2_16; 89FA - - db $d4 - - mus_note noteG#, note2_4_16 - mus_note noteD, note4_16 - - mus_octave oct5 - mus_note noteA, note2_4_16; 89FF - mus_note noteD, note1 - mus_note noteRst, note4_8_16 - - mus_note noteG#, note2_4_16 - mus_note noteD, note2_16 - - mus_octave oct3; 8A04 - mus_note noteA#, note2_4_16 - mus_note noteD, note1 - - db $d7 - - mus_note noteA, note2_4_16 - mus_note noteD, note1; 8A09 - - db $f2 - - mus_note noteA#, note2_4_16 - - mus_end - -UnknSong_md_8a0d: - db $fc - mus_volume 36; 8A0F - db $f3 - - mus_octave oct7 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - - mus_octave oct3; 8A14 - mus_note noteE, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteD, note16; 8A19 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8a1c: - db $fc - - mus_note noteC, note2_8_16 - mus_note noteD, note4; 8A1E - mus_note noteRst, note4 - - mus_note noteG#, note4 - mus_note noteC, note4_8_16 - mus_note noteD, note2_4_8_16 - mus_note noteB, note4_16; 8A23 - mus_note noteC, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteC, note8; 8A28 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8a2b: - mus_note noteD, note4_16 - - db $d3 - - mus_note noteF, note2_4_16; 8A2D - mus_note noteD, note1 - - mus_octave oct1 - mus_note noteE, note2_4_16 - mus_note noteD, note2_16 - mus_note noteB, note8; 8A32 - mus_note noteF, note2_4_16 - - mus_end - -UnknSong_md_8a35: - db $fc - - mus_note noteC, note2_8_16 - mus_note noteD, note4_8_16; 8A37 - - mus_octave oct5 - mus_note noteC, note16 - mus_note noteC, note4_8 - mus_note noteD, note4_8_16 - - mus_octave oct4; 8A3C - mus_note noteG#, note16 - mus_note noteC, note4_8 - mus_note noteD, note4_8_16 - - db $d3 - - mus_note noteG, note16; 8A41 - mus_note noteC, note4_8 - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteF#, note16 - mus_note noteC, note4_8; 8A46 - - mus_end - -UnknSong_md_8a48: - db $fc - db $f5 - - mus_note noteD, note4_8_16 - - mus_octave oct5; 8A4B - mus_note noteG#, note8_16 - mus_note noteC, note4_16 - mus_note noteD, note4_8_16 - - db $d3 - - mus_note noteC, note8; 8A50 - mus_note noteC, note4_8 - mus_note noteD, note4_8_16 - mus_note noteB, note8_16 - - mus_octave oct5 - mus_note noteC, note4_16; 8A55 - mus_note noteD, note2_16 - mus_note noteG#, note8 - mus_note noteRst, note8 - - mus_note noteC, note4_16 - - mus_end; 8A5A - -UnknSong_md_8a5b: - db $fc - - mus_note noteRst, note2_4_16 - - mus_note noteD, note4_16 - - db $f1 - - mus_note noteC, note16; 8A5F - mus_note noteC, note2 - mus_note noteD, note4_16 - - mus_octave oct6 - mus_note noteG#, note16 - mus_note noteC, note2; 8A64 - mus_note noteD, note4_16 - - db $d1 - - mus_note noteE, note16 - mus_note noteC, note2 - mus_note noteD, note4_16; 8A69 - - mus_octave oct6 - mus_note noteE, note16 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $f1; 8A6E - - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $d1 - - mus_note noteC, note16; 8A73 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $f1 - - mus_note noteC, note8 - mus_note noteC, note2; 8A78 - mus_note noteD, note4_16 - - db $d1 - - mus_note noteG#, note8_16 - mus_note noteC, note2 - mus_note noteD, note4_16; 8A7D - mus_note noteRst, note8 - - mus_note noteE, note8_16 - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteB, note8; 8A82 - mus_note noteE, note8 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8a86: - db $fc - - mus_note noteE, note4_16; 8A87 - mus_note noteD, note2_4_16 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4_16; 8A8C - - db $f1 - - mus_note noteC, note8 - mus_note noteC, note2 - mus_note noteD, note4_16 - - mus_octave oct6; 8A91 - mus_note noteG#, note8_16 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $d1 - - mus_note noteE, note8; 8A96 - mus_note noteC, note2 - mus_note noteD, note4_16 - - mus_octave oct6 - mus_note noteE, note8 - mus_note noteC, note2; 8A9B - mus_note noteD, note4_16 - - db $f1 - - mus_note noteG#, note8_16 - mus_note noteC, note2 - mus_note noteD, note2_16; 8AA0 - - db $d1 - - mus_note noteC, note8 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8aa5: - mus_note noteD, note1; 8AA5 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteD, note4_16 - mus_note noteC, note2_16 - mus_note noteC, note16; 8AAA - mus_note noteD, note4_16 - - db $d1 - - mus_note noteE, note2_4_16 - mus_note noteD, note4_16 - mus_note noteB, note8; 8AAF - mus_note noteD, note2_4_16 - mus_note noteD, note4_16 - - db $d1 - - mus_note noteD#, note2_4_16 - mus_note noteD, note4_16; 8AB4 - mus_note noteB, note8 - mus_note noteD#, note2_4_16 - mus_note noteD, note4_16 - mus_note noteRst, note8 - - mus_note noteD, note2_4_16; 8AB9 - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteE, note2_4_16 - - mus_end - -UnknSong_md_8abe: - db $fc; 8ABE - - mus_note noteRst, note2_4_16 - - mus_note noteD, note2_16 - - db $f5 - - mus_note noteC, note16 - mus_note noteC, note4_8_16; 8AC3 - mus_note noteD, note8_16 - - db $d2 - - mus_note noteD#, note2_16 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16; 8AC8 - mus_note noteRst, note8_16 - - mus_note noteD#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16 - mus_note noteRst, note8_16; 8ACD - - mus_note noteD, note2_16 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16 - mus_note noteB, note8_16 - mus_note noteD, note16; 8AD2 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16 - mus_note noteB, note8_16 - mus_note noteC#, note16 - mus_note noteC, note4_8_16; 8AD7 - mus_note noteD, note8_16 - mus_note noteA#, note8_16 - mus_note noteC#, note2_16 - mus_note noteC, note4_8_16 - mus_note noteD, note8_16; 8ADC - mus_note noteB, note8_16 - mus_note noteC#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8; 8AE1 - - mus_note noteD, note16 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8ae5: - db $fc - - mus_note noteE, note4_16; 8AE6 - mus_note noteD, note2_4_16 - mus_note noteRst, note4 - - mus_note noteRst, note16 - - mus_note noteC, note4_8 - mus_note noteD, note4; 8AEB - mus_note noteB, note8 - - db $f9 - - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteA#, note8; 8AF0 - - db $f1 - - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteA#, note8 - - db $e9; 8AF5 - - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteA, note8 - - mus_octave oct6 - mus_note noteC, note4_8; 8AFA - mus_note noteD, note8_16 - mus_note noteA, note8 - - db $d9 - - mus_note noteC, note4_8 - mus_note noteD, note8_16; 8AFF - mus_note noteG#, note8 - - db $d1 - - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteA, note8; 8B04 - - db $d9 - - mus_note noteC, note4_8 - mus_note noteD, note2_16 - mus_note noteA, note8 - - mus_octave oct6; 8B09 - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_8b0c: - mus_duty duty12_5 - mus_note noteD, note2_16 - - db $f5; 8B0F - - mus_note noteG#, note16 - mus_note noteC, note4_16 - mus_note noteD, note8_16 - - mus_octave oct6 - - mus_octave oct7; 8B14 - mus_note noteC, note4_8 - mus_note noteD, note2_16 - - db $d1 - mus_vel 0, 5 - mus_end; 8B1A - -UnknSong_md_8b1b: - db $fc - - mus_note noteA#, note4_8 - mus_note noteD, note2 - mus_note noteA, note4_8 - mus_note noteE, note8; 8B1F - mus_note noteC, note4_16 - mus_note noteD, note8_16 - mus_note noteG#, note8 - mus_note noteD, note8 - mus_note noteC, note4_8; 8B24 - mus_note noteD, note2_16 - mus_note noteF#, note8 - mus_note noteC#, note2_8_16 - mus_note noteC, note4_8 - - mus_end; 8B29 - -UnknSong_md_8b2a: - db $fc - - mus_note noteG#, note2_16 - mus_note noteD, note4_8 - - db $f2 - - mus_note noteF, note16; 8B2E - mus_note noteC, note4_8_16 - mus_note noteD, note2_8 - - db $d1 - - mus_note noteF#, note16 - mus_note noteC, note4_8_16; 8B33 - mus_note noteD, note4_8 - - mus_octave oct5 - mus_note noteC#, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_8; 8B38 - mus_note noteRst, note8 - - mus_note noteD, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8 - - db $f2; 8B3D - - mus_note noteC#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - - db $d1 - - mus_note noteD, note16; 8B42 - mus_note noteC, note4_8_16 - - mus_jump 2, $4B2A - mus_end - -UnknSong_md_8b49: - db $fc - - mus_note noteE, note16; 8B4A - mus_note noteD, note4_16 - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note4_8; 8B4F - - db $f2 - - mus_note noteF, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_8 - - db $d1; 8B54 - - mus_note noteF#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8 - - mus_octave oct5 - mus_note noteC#, note4_16; 8B59 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteD, note4_16 - mus_note noteC, note4_8_16; 8B5E - mus_note noteD, note4_8 - - db $f2 - - mus_note noteC#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_4_16; 8B63 - - db $d1 - - mus_note noteD, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8 - - mus_octave oct5; 8B68 - mus_note noteC#, note4_16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteD, note4_16; 8B6D - mus_note noteC, note4_8_16 - mus_note noteD, note4_8 - - db $f2 - - mus_note noteC#, note8 - mus_note noteC, note4_8_16; 8B72 - mus_note noteD, note4_16 - - db $d1 - - mus_note noteD, note8 - mus_note noteC, note4_8_16 - - mus_end; 8B77 - -UnknSong_md_8b78: - mus_note noteD, note4_8_16 - - db $d2 - - mus_note noteC#, note2_4_16 - mus_note noteD, note2_8 - mus_note noteB, note8; 8B7C - mus_note noteD, note2_4_16 - mus_note noteD, note2_16 - mus_note noteRst, note8_16 - - mus_note noteD, note2_4_16 - mus_note noteD, note2_8; 8B81 - mus_note noteB, note8 - mus_note noteD#, note2_4_16 - mus_note noteD, note4_8_16 - mus_note noteRst, note8_16 - - mus_note noteD, note2_4_16; 8B86 - mus_note noteD, note2_8 - mus_note noteA#, note8_16 - mus_note noteD#, note2_4_16 - mus_note noteD, note2 - mus_note noteRst, note8_16; 8B8B - - mus_note noteD, note2_4_16 - mus_note noteD, note4_8 - mus_note noteA#, note8 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_8; 8B90 - mus_note noteRst, note8_16 - - mus_note noteD, note2_4_16 - mus_note noteD, note4_16 - mus_note noteA#, note8 - mus_note noteD#, note2_4_16; 8B95 - - mus_end - -UnknSong_md_8b97: - db $fc - - mus_note noteA#, note16 - mus_note noteD, note4_16 - - db $f3; 8B9A - - mus_note noteC, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - - db $d5 - - mus_note noteF#, note16; 8B9F - mus_note noteC, note2 - mus_note noteD, note4 - - mus_octave oct5 - mus_note noteD, note16 - mus_note noteC, note2; 8BA4 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteC#, note16 - mus_note noteC, note2 - - mus_end; 8BA9 - -UnknSong_md_8baa: - db $fc - - mus_note noteF, note2_8_16 - mus_note noteD, note4_8 - mus_note noteB, note4 - - db $f1; 8BAE - - mus_note noteC, note4_8_16 - mus_note noteD, note2 - mus_note noteRst, note4_8 - - mus_note noteF, note8_16 - mus_note noteC, note2; 8BB3 - mus_note noteD, note4 - mus_note noteA#, note8_16 - mus_note noteC#, note8 - mus_note noteC, note2 - mus_note noteD, note2_16; 8BB8 - mus_note noteB, note8 - mus_note noteC, note8 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8bbd: - mus_note noteD, note4; 8BBD - mus_note noteA#, note8_16 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_4_16 - mus_note noteA, note4_16 - mus_note noteD, note2_4_16; 8BC2 - mus_note noteD, note4 - mus_note noteG#, note8_16 - mus_note noteC#, note2_4_16 - mus_note noteD, note2_16 - mus_note noteG, note8; 8BC7 - mus_note noteD, note2_4_16 - - mus_end - -UnknSong_md_8bca: - db $fc - mus_volume 40 - db $f7; 8BCD - - mus_octave oct7 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - - mus_octave oct1 - - mus_octave oct2; 8BD2 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - db $f4 - - mus_octave oct7 - mus_note noteC, note4_8_16; 8BD7 - mus_note noteD, note4 - - db $f6 - db $d0 - - mus_note noteC, note4_8_16 - mus_note noteD, note4; 8BDC - - mus_octave oct4 - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - - db $f2; 8BE1 - - mus_note noteB, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteA#, note8_16 - mus_note noteRst, note2_16; 8BE6 - - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8be9: - db $fc - - mus_note noteC, note4_8 - mus_note noteD, note4; 8BEB - mus_note noteC, note2_16 - mus_note noteC, note16 - mus_note noteC, note16 - mus_note noteD, note2_16 - mus_note noteA#, note2; 8BF0 - mus_note noteA#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteG#, note4_8_16 - mus_note noteA#, note4; 8BF5 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteG, note4_16 - mus_note noteA#, note8 - mus_note noteC, note4_8_16; 8BFA - mus_note noteD, note4 - mus_note noteG, note4_8_16 - mus_note noteA, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4; 8BFF - mus_note noteG#, note4 - mus_note noteG#, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteA#, note8_16; 8C04 - mus_note noteG, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note1 - mus_note noteG, note8_16 - mus_note noteG#, note2_8; 8C09 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8c0c: - mus_note noteD, note8_16 - - db $f2 - - mus_note noteD#, note2_4_16; 8C0E - mus_note noteD, note2_16 - - mus_octave oct3 - mus_note noteD#, note2_4_8_16 - mus_note noteD, note2_16 - - db $d7; 8C13 - - mus_note noteD#, note2_4_16 - mus_note noteD, note4_8 - mus_note noteRst, note4_8 - - mus_note noteD#, note2_4 - mus_note noteD, note4; 8C18 - - db $d4 - - mus_note noteD, note2_4_16 - mus_note noteD, note8_16 - mus_note noteB, note4_8_16 - mus_note noteD#, note2_4_16; 8C1D - mus_note noteD, note4 - mus_note noteA#, note4_16 - mus_note noteD, note2_4_16 - mus_note noteD, note2_16 - mus_note noteA, note8; 8C22 - mus_note noteD#, note2_4_16 - - mus_end - -UnknSong_md_8c25: - db $fc - mus_volume 47 - db $f6; 8C28 - - mus_note noteF#, note4_8 - mus_note noteC, note4_8 - mus_note noteD, note2_8_16 - - mus_octave oct3 - mus_note noteG, note2_4_16; 8C2D - mus_note noteC, note4_8 - mus_note noteD, note4 - mus_note noteRst, note8_16 - - mus_note noteF, note2_4_16 - mus_note noteC, note4_8; 8C32 - mus_note noteD, note1 - mus_note noteB, note8_16 - mus_note noteD#, note2_4_16 - mus_note noteC, note4_8 - - mus_end; 8C37 - -UnknSong_md_8c38: - db $fc - - mus_note noteF, note2_8_16 - mus_note noteD, note2_4_8_16 - - db $d6 - - mus_note noteC, note4; 8C3C - mus_note noteC, note4_8 - mus_note noteD, note2_8 - mus_note noteB, note4_16 - mus_note noteC#, note2_4 - mus_note noteC, note4_8; 8C41 - mus_note noteD, note4_16 - mus_note noteA, note8_16 - - db $fa - - mus_note noteC, note4_16 - mus_note noteD, note1; 8C46 - mus_note noteA#, note8_16 - - db $db - - mus_note noteC, note4_16 - - mus_end - -UnknSong_md_8c4b: - mus_note noteD, note2_4_16; 8C4B - - mus_octave oct1 - mus_note noteE, note2_4_16 - mus_note noteD, note2_4 - - db $d7 - - mus_note noteF, note2_4_16; 8C50 - mus_note noteD, note1 - mus_note noteRst, note8_16 - - mus_note noteE, note2_4_16 - - mus_end - -UnknSong_md_8c55: - db $fc; 8C55 - mus_volume 36 - db $f7 - - mus_note noteA#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16; 8C5B - - mus_octave oct1 - mus_note noteA#, note4_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - - db $d6; 8C60 - - mus_note noteA#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_4_16 - - db $d3 - - mus_note noteD, note16; 8C65 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note4 - - mus_note noteD, note4_16 - mus_note noteC, note4_8_16; 8C6A - mus_note noteD, note4_16 - mus_note noteRst, note8_16 - - mus_note noteD, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16; 8C6F - mus_note noteB, note8 - mus_note noteC#, note16 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8c74: - db $fc; 8C74 - - mus_note noteF, note2_8_16 - mus_note noteD, note4_16 - - mus_octave oct0 - mus_note noteC, note8 - mus_note noteC, note4_8_16; 8C79 - mus_note noteD, note2_16 - - db $d6 - - mus_note noteC, note4 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16; 8C7E - mus_note noteRst, note4_8_16 - - mus_note noteC, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_4_16 - mus_note noteRst, note4; 8C83 - - mus_note noteG#, note8 - mus_note noteC, note4_8 - mus_note noteD, note2_16 - mus_note noteB, note4 - mus_note noteG#, note4; 8C88 - mus_note noteC, note4_8 - mus_note noteD, note4_16 - mus_note noteB, note8_16 - mus_note noteG#, note8_16 - mus_note noteC, note4_8; 8C8D - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteG, note8 - mus_note noteC, note4_8 - - mus_end; 8C92 - -UnknSong_md_8c93: - mus_note noteD, note2 - - db $d6 - - mus_note noteF, note2_4_16 - mus_note noteD, note2_16 - - mus_octave oct1; 8C97 - mus_note noteE, note2_4_16 - mus_note noteD, note4_16 - - db $d4 - - mus_note noteF, note2_4_16 - mus_note noteD, note4_16; 8C9C - - db $d4 - - mus_note noteE, note2_4_16 - mus_note noteD, note2 - mus_note noteRst, note4 - - mus_note noteE, note2_4_16; 8CA1 - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteF, note2_4_16 - - mus_end - -UnknSong_md_8ca6: - db $fc; 8CA6 - - mus_note noteC#, note2_4 - mus_note noteD, note2 - - db $d2 - - mus_note noteE, note16 - mus_note noteC, note2; 8CAB - mus_note noteD, note1 - - mus_octave oct2 - mus_note noteF#, note16 - mus_note noteC, note2 - mus_note noteD, note1; 8CB0 - mus_note noteRst, note8 - - mus_note noteD#, note16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8cb5: - db $fc; 8CB5 - - mus_note noteG#, note8 - mus_note noteD, note8_16 - mus_note noteRst, note8_16 - - mus_note noteC, note8 - mus_note noteC, note2; 8CBA - mus_note noteD, note4_16 - mus_note noteRst, note8_16 - - mus_note noteC, note2_16 - mus_note noteC, note2 - mus_note noteD, note1; 8CBF - - db $d7 - - mus_note noteE, note8 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteA#, note8_16; 8CC4 - mus_note noteC, note8 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8cc8: - db $fc - mus_volume 47; 8CCA - db $d7 - - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note4_16 - - mus_octave oct1; 8CCF - mus_note noteA#, note16 - mus_note noteC, note2 - mus_note noteD, note1 - - db $d2 - - mus_note noteE, note16; 8CD4 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8cd7: - db $fc - - mus_note noteF, note2_8_16 - mus_note noteD, note1; 8CD9 - mus_note noteRst, note2 - - mus_note noteF, note4 - mus_note noteC, note2 - mus_note noteD, note4_8 - mus_note noteB, note4_8_16; 8CDE - mus_note noteG, note8_16 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteRst, note8_16 - - mus_note noteC#, note8; 8CE3 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8ce6: - mus_note noteD, note2_4_8 - - db $f6 - - mus_note noteE, note2_4_16; 8CE8 - mus_note noteD, note4_16 - - mus_octave oct1 - mus_note noteD#, note2_4_16 - mus_note noteD, note1 - - db $f2; 8CED - - mus_note noteE, note2_4_16 - - mus_end - -UnknSong_md_8cf0: - db $fc - mus_volume 38 - db $f7; 8CF3 - - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note1 - - mus_octave oct0 - mus_note noteC, note16; 8CF8 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $f4 - mus_volume 6 - mus_note noteD, note4_16; 8CFE - - mus_octave oct3 - - mus_octave oct7 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - - db $d1; 8D03 - db $d0 - - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8d07: - db $fc - - mus_note noteC, note2_8_16; 8D08 - mus_note noteD, note2 - - mus_octave oct1 - mus_note noteG#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_4_8_16; 8D0D - - db $d5 - - mus_note noteRst, note8 - - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - mus_note noteRst, note4_16; 8D12 - - mus_note noteB, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_16 - - db $d4 - - mus_note noteA#, note8; 8D17 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteA, note8 - mus_note noteC, note4_8_16; 8D1C - - mus_end - -UnknSong_md_8d1e: - mus_note noteD, note2_8_16 - mus_note noteA#, note4_8_16 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_4_8_16; 8D21 - mus_note noteA, note4_16 - mus_note noteD, note2_4_16 - mus_note noteD, note4_8 - mus_note noteA#, note4 - mus_note noteD#, note2_4_16; 8D26 - mus_note noteD, note2_16 - mus_note noteA, note8 - mus_note noteD, note2_4_16 - - mus_end - -UnknSong_md_8d2b: - db $fc; 8D2B - - mus_note noteA#, note4_8 - mus_note noteD, note2_4_16 - - db $f2 - - mus_note noteE, note16 - mus_note noteC, note4_16; 8D30 - mus_note noteD, note1 - - mus_octave oct4 - mus_note noteA#, note16 - mus_note noteC, note4_16 - mus_note noteD, note4_16; 8D35 - - db $d2 - - mus_note noteA, note16 - mus_note noteC, note4_16 - mus_note noteD, note2_16 - - db $d1; 8D3A - - mus_note noteG#, note16 - mus_note noteC, note4_16 - - mus_end - -UnknSong_md_8d3e: - db $fc - db $ee; 8D3F - - mus_note noteD, note2_4 - - db $d2 - - mus_note noteD#, note2_16 - mus_note noteC, note4_16 - mus_note noteD, note2_4_8_16; 8D44 - mus_note noteRst, note4_8_16 - - mus_note noteA, note2_16 - mus_note noteC, note4_16 - mus_note noteD, note4 - mus_note noteB, note8_16; 8D49 - mus_note noteG#, note2_16 - mus_note noteC, note4_16 - mus_note noteD, note2_16 - mus_note noteB, note8 - mus_note noteG, note2_16; 8D4E - mus_note noteC, note4_16 - - mus_end - -UnknSong_md_8d51: - mus_note noteD, note2_8_16 - - mus_octave oct1 - mus_note noteF#, note2_4_16; 8D53 - mus_note noteD, note1 - - db $d2 - - mus_note noteF, note2_4_16 - mus_note noteD, note4 - mus_note noteRst, note8_16; 8D58 - - mus_note noteF#, note2_4_16 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteF, note2_4_16 - - mus_end; 8D5D - -UnknSong_md_8d5e: - db $fc - - mus_note noteD#, note4 - mus_note noteD, note1 - - db $f6 - - mus_note noteRst, note16; 8D62 - - mus_note noteC, note4_8 - mus_note noteD, note2_16 - - mus_octave oct4 - mus_note noteB, note2_4_16 - mus_note noteC, note4_8; 8D67 - mus_note noteD, note4_8_16 - - db $d2 - db $d0 - - mus_note noteC, note4_8 - mus_note noteD, note4_8_16; 8D6C - mus_note noteB, note8_16 - - mus_octave oct7 - mus_note noteC, note4_8 - mus_note noteD, note4_8_16 - mus_note noteRst, note8_16; 8D71 - - mus_volume 5 - mus_note noteD, note2_16 - mus_note noteB, note8 - mus_note noteC, note16 - mus_note noteC, note4_8_16; 8D77 - - mus_end - -UnknSong_md_8d79: - db $fc - - mus_note noteA, note2_8 - mus_note noteD, note2_4_8_16 - mus_note noteRst, note4_8_16; 8D7C - - mus_note noteB, note8 - mus_note noteC, note4_16 - mus_note noteD, note2 - mus_note noteRst, note4 - - mus_note noteA#, note2_4_8; 8D81 - mus_note noteC, note4_16 - mus_note noteD, note4_8 - mus_note noteB, note8_16 - mus_note noteRst, note8 - - mus_note noteC, note4_16; 8D86 - mus_note noteD, note2_16 - mus_note noteA, note8_16 - - db $d1 - - mus_note noteC, note4_16 - mus_note noteD, note4_8_16; 8D8B - mus_note noteA#, note8_16 - - mus_octave oct6 - mus_note noteC, note4_16 - mus_note noteD, note2_16 - mus_note noteA, note8; 8D90 - - db $f1 - - mus_note noteC, note4_16 - - mus_end - -UnknSong_md_8d94: - mus_note noteD, note2_8_16 - - mus_octave oct1; 8D95 - mus_note noteF, note2_4_16 - mus_note noteD, note2_8_16 - - db $d6 - - mus_note noteF#, note2_4_16 - mus_note noteD, note4_16; 8D9A - mus_note noteRst, note8_16 - - mus_note noteE, note2_4_16 - mus_note noteD, note4_8_16 - - db $d3 - - mus_note noteF, note2_4_16; 8D9F - mus_note noteD, note2_16 - mus_note noteB, note4 - mus_note noteE, note2_4_16 - mus_note noteD, note2_16 - mus_note noteA#, note8; 8DA4 - mus_note noteF, note2_4_16 - - mus_end - -UnknSong_md_8da7: - db $fc - mus_volume 40 - - mus_octave oct3; 8DAA - mus_note noteA, note16 - mus_note noteC, note2 - mus_note noteD, note1 - - db $f5 - - mus_note noteRst, note16; 8DAF - - mus_note noteC, note2 - mus_note noteD, note2_16 - - db $d1 - db $d8 - - mus_note noteC, note2; 8DB4 - - mus_end - -UnknSong_md_8db6: - db $fc - - mus_note noteA#, note4_8 - mus_note noteD, note2_8_16 - mus_note noteRst, note4_16; 8DB9 - - mus_note noteG, note8 - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteB, note4_8_16 - mus_note noteA#, note8_16; 8DBE - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteB, note2 - mus_note noteC, note2; 8DC3 - - mus_end - -UnknSong_md_8dc5: - mus_note noteD, note2_16 - - mus_octave oct3 - mus_note noteE, note2_4_16 - mus_note noteD, note2_4_8_16; 8DC8 - mus_note noteRst, note4_16 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteD, note2_4_16; 8DCD - - mus_end - -UnknSong_md_8dcf: - db $fc - mus_volume 38 - db $f2 - - mus_note noteC, note16; 8DD3 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteC, note4_8_16; 8DD8 - mus_note noteD, note4_8_16 - - db $d2 - - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16; 8DDD - - mus_octave oct5 - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - - db $d2; 8DE2 - - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteRst, note8_16 - - mus_note noteE, note16; 8DE7 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteB, note8_16 - mus_note noteG#, note16 - mus_note noteC, note2; 8DEC - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteRst, note16 - - mus_note noteC, note2 - - mus_end; 8DF1 - -UnknSong_md_8df2: - db $fc - - mus_note noteC#, note8 - mus_note noteD, note4 - mus_note noteC, note2_16 - mus_note noteC, note8; 8DF6 - mus_note noteC, note16 - mus_note noteD, note4_8_16 - mus_note noteRst, note8_16 - - mus_note noteRst, note8 - - mus_note noteC, note4_8; 8DFB - mus_note noteD, note4_8_16 - mus_note noteB, note8_16 - mus_note noteC, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16; 8E00 - mus_note noteA#, note8_16 - mus_note noteE, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteB, note8_16; 8E05 - mus_note noteG#, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteA#, note8_16 - mus_note noteRst, note8_16; 8E0A - - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteA, note8_16 - mus_note noteC, note8 - mus_note noteC, note2; 8E0F - mus_note noteD, note4_8_16 - mus_note noteA#, note8_16 - mus_note noteE, note8_16 - mus_note noteC, note2 - mus_note noteD, note2_16; 8E14 - mus_note noteG#, note8 - mus_note noteG#, note8 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8e19: - mus_note noteD, note4_8_16; 8E19 - mus_note noteC, note2_16 - mus_note noteC, note8 - mus_note noteD, note4_8 - - mus_octave oct5 - mus_note noteF, note2_4_16; 8E1E - mus_note noteD, note4_8 - mus_note noteRst, note8_16 - - mus_note noteE, note2_4_16 - mus_note noteD, note4_8 - - db $d2; 8E23 - - mus_note noteD#, note2_4_16 - mus_note noteD, note4_8 - mus_note noteB, note8_16 - mus_note noteD, note2_4_16 - mus_note noteD, note4_8; 8E28 - mus_note noteRst, note8_16 - - mus_note noteC#, note2_4_16 - mus_note noteD, note4_8 - mus_note noteA#, note8_16 - mus_note noteC#, note2_4; 8E2D - mus_note noteD, note4_8 - mus_note noteA, note8_16 - mus_note noteC#, note2_8_16 - mus_note noteD, note2_16 - mus_note noteG#, note8; 8E32 - mus_note noteC#, note2_16 - - mus_end - -UnknSong_md_8e35: - db $fc - mus_volume 36 - db $f3; 8E38 - - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note1 - - mus_octave oct0 - mus_note noteC, note16; 8E3D - mus_note noteC, note2 - mus_note noteD, note2_16 - - db $d3 - - mus_note noteC#, note16 - mus_note noteC, note2; 8E42 - mus_note noteD, note4_16 - mus_note noteRst, note8_16 - - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note4_16; 8E47 - - db $d2 - mus_volume 6 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_octave oct7; 8E4D - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8e50: - db $fc - - mus_note noteF, note2_8_16 - mus_note noteD, note4_8_16; 8E52 - mus_note noteRst, note4 - - mus_note noteC, note8 - mus_note noteC, note2 - mus_note noteD, note2_4_8_16 - mus_note noteB, note2; 8E57 - mus_note noteG#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2 - mus_note noteB, note4 - mus_note noteA, note8_16; 8E5C - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteA#, note8_16 - mus_note noteG#, note8 - mus_note noteC, note4_8_16; 8E61 - mus_note noteD, note4_16 - mus_note noteB, note8_16 - mus_note noteG, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16; 8E66 - mus_note noteA#, note8 - mus_note noteF#, note8 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8e6b: - mus_note noteD, note4_8_16; 8E6B - - mus_octave oct4 - mus_note noteF, note2_4_16 - mus_note noteD, note2_4_8_16 - - db $d6 - - mus_note noteE, note2_4_16; 8E70 - mus_note noteD, note4_8_16 - mus_note noteRst, note4_8_16 - - mus_note noteD#, note2_4_16 - mus_note noteD, note4 - mus_note noteB, note4; 8E75 - mus_note noteE, note2_4_16 - mus_note noteD, note4 - mus_note noteA#, note8_16 - mus_note noteF, note2_4_16 - mus_note noteD, note2_16; 8E7A - mus_note noteB, note8 - mus_note noteF#, note2_4_16 - - mus_end - -UnknSong_md_8e7e: - db $fc - - mus_note noteC, note1; 8E7F - mus_note noteD, note1 - - db $f7 - - mus_note noteC, note16 - mus_note noteC, note4_8 - mus_note noteD, note1; 8E84 - - mus_octave oct0 - mus_note noteC, note2_16 - mus_note noteC, note4_8 - mus_note noteD, note2_16 - mus_note noteB, note4_16; 8E89 - mus_note noteG#, note16 - mus_note noteC, note4_16 - mus_note noteD, note1 - mus_note noteA#, note8_16 - mus_note noteF#, note16; 8E8E - mus_note noteC, note4_16 - - mus_end - -UnknSong_md_8e91: - db $fc - - mus_note noteE, note4_16 - mus_note noteD, note2_4_8_16; 8E93 - - db $d7 - - mus_note noteG#, note8 - mus_note noteC, note4_16 - mus_note noteD, note2_4_8_16 - mus_note noteRst, note2; 8E98 - - mus_note noteG#, note2_8 - mus_note noteC, note4_16 - mus_note noteD, note2_8_16 - mus_note noteB, note4_16 - mus_note noteC, note8; 8E9D - mus_note noteC, note4_16 - mus_note noteD, note1 - mus_note noteRst, note8_16 - - mus_octave oct6 - mus_note noteC, note4; 8EA2 - - mus_end - -UnknSong_md_8ea4: - mus_note noteD, note2_4_8_16 - - db $f7 - - mus_note noteG, note2_4_16 - mus_note noteD, note2_4_16; 8EA7 - - db $f6 - - mus_note noteF#, note2_4_16 - mus_note noteD, note2_8 - - mus_octave oct3 - mus_note noteG, note2_4_16; 8EAC - mus_note noteD, note1 - - mus_octave oct5 - mus_note noteF#, note2_4_16 - - mus_end - -UnknSong_md_8eb1: - db $fc; 8EB1 - db $f5 - - mus_note noteD, note2 - - db $d6 - - mus_octave oct6 - mus_note noteC, note2; 8EB6 - mus_note noteD, note4_8_16 - mus_note noteRst, note4_8_16 - - mus_octave oct5 - mus_note noteC, note2 - mus_note noteD, note2_8; 8EBB - - db $d6 - - mus_octave oct6 - mus_note noteC, note2 - mus_note noteD, note2 - mus_note noteRst, note4_8_16; 8EC0 - - mus_octave oct7 - mus_note noteC, note2 - mus_note noteD, note4_8 - mus_note noteB, note4_8_16 - - mus_octave oct5; 8EC5 - mus_note noteC, note2 - mus_note noteD, note2 - mus_note noteRst, note4_8_16 - - mus_octave oct6 - mus_note noteC, note2; 8ECA - mus_note noteD, note4_8_16 - mus_note noteB, note4_8_16 - - mus_octave oct7 - mus_note noteC, note2 - mus_note noteD, note2_16; 8ECF - mus_note noteA#, note8 - - db $df - - mus_note noteC, note2 - - mus_end - -UnknSong_md_8ed4: - db $fc; 8ED4 - - mus_note noteE, note4_16 - mus_note noteD, note4_8_16 - mus_note noteRst, note4 - - mus_note noteRst, note2_8 - - mus_note noteC, note2; 8ED9 - mus_note noteD, note4_8_16 - mus_note noteB, note4 - mus_note noteRst, note2 - - mus_note noteC, note2 - mus_note noteD, note2_8_16; 8EDE - mus_note noteRst, note4_16 - - mus_note noteRst, note4 - - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteB, note4_16; 8EE3 - mus_note noteRst, note2 - - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteRst, note4 - - mus_note noteRst, note2_8; 8EE8 - - mus_note noteC, note2 - mus_note noteD, note1 - mus_note noteA#, note8_16 - mus_note noteRst, note4_8 - - mus_note noteC, note2; 8EED - - mus_end - -UnknSong_md_8eef: - mus_note noteD, note2_4_8 - mus_note noteC#, note2_8 - mus_note noteG, note2_4_16 - mus_note noteD, note2_4_8; 8EF2 - - db $f7 - - mus_note noteG#, note2_4_16 - mus_note noteD, note2_4_16 - - db $d6 - - mus_note noteG, note2_4_16; 8EF7 - mus_note noteD, note2_16 - mus_note noteRst, note4_16 - - mus_note noteF#, note2_4_16 - mus_note noteD, note1 - mus_note noteB, note4; 8EFC - mus_note noteF, note2_4_16 - - mus_end - -UnknSong_md_8eff: - db $fc - mus_volume 38 - db $f7; 8F02 - - mus_note noteE, note16 - mus_note noteC, note2 - mus_note noteD, note2_4_16 - - mus_octave oct1 - mus_note noteE, note4_16; 8F07 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - - db $d5 - - mus_note noteF, note16 - mus_note noteC, note2; 8F0C - mus_note noteD, note4_16 - mus_note noteRst, note4 - - mus_note noteF#, note16 - mus_note noteC, note2 - mus_note noteD, note4; 8F11 - mus_note noteRst, note4 - - mus_note noteG#, note16 - mus_note noteC, note2 - mus_note noteD, note2_16 - - db $d1; 8F16 - - mus_note noteA#, note16 - mus_note noteC, note2 - - mus_end - -UnknSong_md_8f1a: - db $fc - - mus_note noteC, note2_8_16; 8F1B - mus_note noteD, note4_8_16 - mus_note noteRst, note2 - - mus_note noteC, note8 - mus_note noteC, note2 - mus_note noteD, note2_4; 8F20 - mus_note noteB, note4_8_16 - mus_note noteC, note8_16 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteA#, note4_8; 8F25 - mus_note noteC#, note8 - mus_note noteC, note2 - mus_note noteD, note4_16 - mus_note noteA, note4 - mus_note noteD, note8; 8F2A - mus_note noteC, note2 - mus_note noteD, note4 - mus_note noteA#, note4 - mus_note noteE, note8 - mus_note noteC, note2; 8F2F - mus_note noteD, note2_16 - mus_note noteA, note8 - mus_note noteF#, note8_16 - mus_note noteC, note2 - - mus_end; 8F34 - -UnknSong_md_8f35: - mus_note noteD, note4 - - mus_octave oct5 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_16 - - db $d6; 8F39 - - mus_note noteE, note2_4_16 - mus_note noteD, note4_8 - - db $d4 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_4_16; 8F3E - mus_note noteRst, note2 - - mus_note noteE, note2_4_16 - mus_note noteD, note8_16 - - mus_octave oct5 - mus_note noteD#, note2_4_16; 8F43 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteD, note2_4_16 - - mus_end - -UnknSong_md_8f48: - db $fc; 8F48 - db $f4 - - mus_note noteD, note1 - - mus_volume 5 - mus_note noteC, note2 - mus_note noteD, note2_8_16; 8F4E - - mus_octave oct7 - mus_note noteC, note16 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteB, note4_16; 8F53 - mus_note noteC#, note16 - mus_note noteC, note2 - mus_note noteD, note4_16 - - db $d3 - - mus_note noteC, note16; 8F58 - mus_note noteC, note2 - mus_note noteD, note4_8_16 - mus_note noteB, note8_16 - mus_note noteD, note16 - mus_note noteC, note4_8_16; 8F5D - mus_note noteD, note2_16 - mus_note noteA#, note8 - mus_note noteD, note4_16 - mus_note noteC, note4_8_16 - - mus_end; 8F62 - -UnknSong_md_8f63: - db $fc - - mus_note noteD, note8_16 - mus_note noteD, note1 - mus_note noteB, note16 - mus_note noteRst, note4; 8F67 - - mus_note noteC, note4_8_16 - mus_note noteD, note2_8_16 - mus_note noteA#, note16 - mus_note noteRst, note8 - - mus_note noteC, note4_8_16; 8F6C - mus_note noteD, note4_8_16 - mus_note noteG#, note4_16 - - db $d2 - - mus_note noteC, note4_8_16 - mus_note noteD, note4_16; 8F71 - mus_note noteA, note4 - mus_note noteRst, note8 - - mus_note noteC, note4_8_16 - mus_note noteD, note4_8_16 - mus_note noteG#, note8_16; 8F76 - - mus_octave oct6 - mus_note noteC, note4_8 - mus_note noteD, note2_16 - mus_note noteF#, note8 - - db $e8; 8F7B - - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_8f7e: - mus_note noteD, note4_8_16 - - mus_octave oct1 - mus_note noteE, note2_4_16; 8F80 - mus_note noteD, note1 - - db $d6 - - mus_note noteD#, note2_4_16 - mus_note noteD, note2_8_16 - mus_note noteRst, note4_8; 8F85 - - mus_note noteE, note2_8_16 - mus_note noteD, note8 - mus_note noteB, note8_16 - mus_note noteF, note2_4 - mus_note noteD, note1; 8F8A - mus_note noteRst, note8_16 - - mus_note noteE, note2_4_16 - - mus_end - -UnknSong_md_8f8e: - db $fc - - mus_note noteF, note16; 8F8F - mus_note noteD, note2_8_16 - - db $f5 - - mus_note noteG#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4; 8F94 - - mus_octave oct5 - mus_note noteA#, note16 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - db $f2; 8F99 - - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct5 - - mus_octave oct7; 8F9E - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - db $d2 - - mus_note noteC, note16 - mus_note noteC, note2; 8FA3 - mus_note noteD, note4 - mus_note noteRst, note8_16 - - mus_octave oct7 - mus_note noteC, note4_8_16 - mus_note noteD, note4; 8FA8 - - db $d2 - - mus_note noteRst, note16 - - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteRst, note8; 8FAD - - mus_note noteA#, note16 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8fb1: - db $fc - - mus_note noteC, note1; 8FB2 - mus_note noteD, note2_8 - - db $d5 - - mus_note noteD#, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4; 8FB7 - - db $d2 - - mus_note noteF, note8_16 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - - mus_octave oct5; 8FBC - mus_note noteG, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteB, note8_16 - mus_note noteA, note8; 8FC1 - mus_note noteC, note4_8_16 - mus_note noteD, note4 - mus_note noteRst, note8_16 - - mus_note noteB, note8_16 - mus_note noteC, note4_8_16; 8FC6 - mus_note noteD, note4 - mus_note noteB, note8_16 - mus_note noteA, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note4; 8FCB - mus_note noteRst, note8_16 - - mus_note noteG, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - mus_note noteB, note8; 8FD0 - mus_note noteF, note8 - mus_note noteC, note4_8_16 - - mus_end - -UnknSong_md_8fd4: - mus_note noteD, note4_8_16 - - mus_octave oct4; 8FD5 - mus_note noteE, note2_4_16 - mus_note noteD, note4_16 - mus_note noteRst, note4 - - mus_note noteD#, note2_4_16 - mus_note noteD, note4_8; 8FDA - - db $d4 - - mus_note noteD#, note2_4_16 - mus_note noteD, note4_16 - mus_note noteRst, note4_16 - - mus_note noteD, note2_4_16; 8FDF - mus_note noteD, note4_8_16 - mus_note noteB, note4_16 - mus_note noteD#, note2_4_16 - mus_note noteD, note2_16 - mus_note noteRst, note8; 8FE4 - - mus_note noteD, note2_4_16 - - mus_end - -UnknSong_md_8fe7: - db $fc - - mus_note noteA#, note4_8 - mus_note noteD, note4; 8FE9 - - db $f4 - - mus_note noteE, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note2_4_8 - - db $d6; 8FEE - - mus_note noteD, note8 - mus_note noteC, note2 - mus_note noteD, note2_16 - - db $f4 - - mus_note noteC#, note2_8; 8FF3 - mus_note noteC, note2 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteC#, note2_8_16 - mus_note noteC, note2; 8FF8 - - mus_end - -UnknSong_md_8ffa: - db $fc - - mus_note noteRst, note2_4_16 - - mus_note noteD, note4_16 - - db $f4; 8FFD - - mus_note noteG#, note16 - mus_note noteC, note4_8 - mus_note noteD, note2_4_8_16 - - mus_octave oct1 - - mus_octave oct7; 9002 - mus_note noteC, note4_8_16 - mus_note noteD, note2_16 - - db $d5 - db $d8 - - mus_note noteC, note4_8_16; 9007 - mus_note noteD, note2_16 - - db $d1 - mus_vel 0, 6 - mus_end - -UnknSong_md_900d: - mus_note noteD, note4_8; 900D - mus_note noteRst, note4_16 - - mus_note noteE, note4_8_16 - mus_note noteD, note2_4_8 - mus_note noteA#, note4_8 - mus_note noteE, note4_16; 9012 - mus_note noteD, note2_16 - mus_note noteRst, note4_16 - - mus_note noteE, note4_8 - mus_note noteD, note2_16 - mus_note noteB, note8; 9017 - mus_note noteE, note4_16 - - mus_end - -UnknSong_md_901a: - db $fc - mus_volume 45 - db $f1; 901D - - mus_note noteC#, note8 - mus_note noteC, note4_8 - mus_note noteD, note2_4_8 - - mus_octave oct6 - mus_note noteC#, note4_8; 9022 - mus_note noteC, note4_8 - mus_note noteD, note2_4_8 - - mus_octave oct6 - mus_note noteC#, note8 - mus_note noteC, note4_8; 9027 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteC#, note8 - mus_note noteC, note4_8 - - mus_end; 902C - -UnknSong_md_902d: - db $fc - - mus_note noteC#, note4_8 - mus_note noteD, note2_4_16 - - mus_octave oct6 - mus_note noteC, note2_4_16; 9031 - mus_note noteC, note4_8 - mus_note noteD, note2_4_16 - - db $d1 - - mus_note noteC#, note16 - mus_note noteC, note4_8; 9036 - mus_note noteD, note2_4_8_16 - mus_note noteRst, note8 - - mus_note noteC, note2_4_16 - mus_note noteC, note4_8 - mus_note noteD, note2_16; 903B - mus_note noteRst, note8 - - mus_note noteC, note2_8_16 - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_9040: - mus_note noteD, note2_4_8_16; 9040 - - db $f2 - - mus_note noteF#, note4_8 - mus_note noteD, note2_4_8 - - mus_octave oct5 - mus_note noteF, note4_8; 9045 - mus_note noteD, note2_4_8_16 - - db $d2 - - mus_note noteF, note4_8_16 - mus_note noteD, note2_16 - - db $d1; 904A - - mus_note noteF#, note4_8_16 - - mus_end - -UnknSong_md_904d: - db $fc - - mus_note noteC#, note2_4 - mus_note noteD, note4; 904F - - db $f3 - - mus_note noteF#, note4_16 - mus_note noteC, note4_8 - mus_note noteD, note8_16 - - mus_octave oct5; 9054 - mus_note noteE, note4_16 - mus_note noteC, note4_8 - mus_note noteD, note4_8 - - db $d1 - - mus_note noteD, note8_16; 9059 - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteB, note8_16 - mus_note noteG#, note4_16 - mus_note noteC, note4_16; 905E - mus_note noteD, note2_16 - - db $d1 - - mus_note noteA#, note8_16 - mus_note noteC, note4_16 - mus_note noteD, note4; 9063 - - db $f3 - - mus_note noteD, note4_16 - mus_note noteC, note4_8 - mus_note noteD, note4_16 - - mus_octave oct3; 9068 - - mus_octave oct3 - mus_note noteC, note4_16 - mus_note noteD, note2_16 - - db $d1 - - mus_note noteC, note8_16; 906D - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_9070: - db $fc - - mus_note noteRst, note2_4_16 - - mus_note noteD, note4; 9072 - - db $d3 - - mus_note noteF#, note16 - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteRst, note8_16; 9077 - - mus_note noteE, note16 - mus_note noteC, note4_8 - mus_note noteD, note4_8 - mus_note noteRst, note8 - - mus_note noteD, note16; 907C - mus_note noteC, note4_8 - mus_note noteD, note8_16 - mus_note noteA, note8_16 - mus_note noteG#, note16 - mus_note noteC, note4_16; 9081 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteA#, note16 - mus_note noteC, note4_16 - mus_note noteD, note4; 9086 - - db $d3 - - mus_note noteD, note16 - mus_note noteC, note4_8 - mus_note noteD, note4 - mus_note noteRst, note4_16; 908B - - mus_octave oct7 - mus_note noteC, note4_16 - mus_note noteD, note2_16 - mus_note noteRst, note8 - - mus_note noteC, note16; 9090 - mus_note noteC, note4_8 - - mus_end - -UnknSong_md_9093: - db $fc - - mus_note noteC#, note8 - mus_note noteD, note8_16; 9095 - mus_note noteD#, note2_4_8 - mus_note noteG#, note8 - mus_note noteC, note4 - mus_note noteD, note2 - - db $f5; 909A - - mus_note noteC, note8 - mus_note noteC, note4_8_16 - mus_note noteD, note8 - mus_note noteRst, note8_16 - - mus_note noteG#, note8; 909F - mus_note noteC, note4_16 - mus_note noteD, note2_16 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteC, note4; 90A4 - - mus_end - -UnknSong_md_90a6: - db $fc - db $ee - - mus_note noteD, note8_16 - mus_note noteD#, note2_4_8_16; 90A9 - mus_note noteB, note16 - mus_note noteC, note4_8 - mus_note noteD, note2 - - db $d5 - - mus_note noteF, note2_4_8; 90AE - mus_note noteC, note2 - mus_note noteD, note8 - mus_note noteB, note8_16 - mus_note noteB, note16 - mus_note noteC, note4_8_16; 90B3 - mus_note noteD, note2_16 - mus_note noteF#, note8 - mus_note noteB, note16 - mus_note noteC, note4_8 - - mus_end; 90B8 - -UnknSong_md_90b9: - mus_note noteD, note8_16 - mus_note noteA, note8_16 - mus_note noteE, note2_8 - mus_note noteD, note2 - mus_note noteB, note4_8; 90BD - mus_note noteD, note2_8 - mus_note noteD, note8 - mus_note noteA#, note8_16 - mus_note noteD#, note2_8 - mus_note noteD, note2_16; 90C2 - mus_note noteA, note8 - mus_note noteE, note2_8 - - mus_end - -Func_90c6: ; 0x90c6 - xor a - ld [$cfc7], a - ld [$d083], a - dec a - ld [$c0ee], a - call PlaySound - call DelayFrame - ld c, $8 - ld a, [$d05c] - and a - jr z, .asm_90e3 ; 0x90dd $4 - ld a, $ea - jr .asm_9100 ; 0x90e1 $1d -.asm_90e3 - ld a, [$d059] - cp $c8 - jr c, .asm_90fe ; 0x90e8 $14 - cp $f3 - jr z, .asm_90fa ; 0x90ec $c - cp $f7 - jr nz, .asm_90f6 ; 0x90f0 $4 - ld a, $ea - jr .asm_9100 ; 0x90f4 $a -.asm_90f6 - ld a, $ed - jr .asm_9100 ; 0x90f8 $6 -.asm_90fa - ld a, $f3 - jr .asm_9100 ; 0x90fc $2 -.asm_90fe - ld a, $f0 -.asm_9100 - jp PlayMusic -; 0x9103 - -Func_9103: ; 0x9103 - ld c, $0 -.asm_9105 - ld b, $0 - ld hl, $c026 - add hl, bc - ld a, [hl] - and a - jr z, .asm_9131 ; 0x910d $22 - ld a, c - cp $4 - jr nc, .asm_912e ; 0x9112 $1a - ld a, [$c002] - and a - jr z, .asm_912e ; 0x9118 $14 - bit 7, a - jr nz, .asm_9131 ; 0x911c $13 - set 7, a - ld [$c002], a - xor a - ld [$ff00+$25], a - ld [$ff00+$1a], a - ld a, $80 - ld [$ff00+$1a], a - jr .asm_9131 ; 0x912c $3 -.asm_912e - call Func_9138 -.asm_9131 - ld a, c - inc c - cp $7 - jr nz, .asm_9105 ; 0x9135 $ce - ret -; 0x9138 - -Func_9138: ; 0x9138 - ld b, $0 - ld hl, $c0b6 - add hl, bc - ld a, [hl] - cp $1 - jp z, Func_91d0 - dec a - ld [hl], a - ld a, c - cp $4 - jr nc, .asm_9154 ; 0x9149 $9 - ld hl, $c02a - add hl, bc - ld a, [hl] - and a - jr z, .asm_9154 ; 0x9151 $1 - ret -.asm_9154 - ld hl, $c02e - add hl, bc - bit 6, [hl] - jr z, .asm_915f ; 0x915a $3 - call Func_980d -.asm_915f - ld b, $0 - ld hl, $c036 - add hl, bc - bit 0, [hl] - jr nz, .asm_9171 ; 0x9167 $8 - ld hl, $c02e - add hl, bc - bit 2, [hl] - jr nz, .asm_9185 ; 0x916f $14 -.asm_9171 - ld hl, $c02e - add hl, bc - bit 4, [hl] - jr z, .asm_917c ; 0x9177 $3 - jp Func_96f9 -.asm_917c - ld hl, $c04e - add hl, bc - ld a, [hl] - and a - jr z, .asm_9186 ; 0x9182 $2 - dec [hl] -.asm_9185 - ret -.asm_9186 - ld hl, $c056 - add hl, bc - ld a, [hl] - and a - jr nz, .asm_918f ; 0x918c $1 - ret -.asm_918f - ld d, a - ld hl, $c05e - add hl, bc - ld a, [hl] - and $f - and a - jr z, .asm_919c ; 0x9198 $2 - dec [hl] - ret -.asm_919c - ld a, [hl] - swap [hl] - or [hl] - ld [hl], a - ld hl, $c066 - add hl, bc - ld e, [hl] - ld hl, $c02e - add hl, bc - bit 3, [hl] - jr z, .asm_91bc ; 0x91ac $e - res 3, [hl] - ld a, d - and $f - ld d, a - ld a, e - sub d - jr nc, .asm_91ba ; 0x91b6 $2 - ld a, $0 -.asm_91ba - jr .asm_91c8 ; 0x91ba $c -.asm_91bc - set 3, [hl] - ld a, d - and $f0 - swap a - add e - jr nc, .asm_91c8 ; 0x91c4 $2 - ld a, $ff -.asm_91c8 - ld d, a - ld b, $3 - call Func_9838 - ld [hl], d - ret -; 0x91d0 - -Func_91d0 ; 0x91d0 - ld hl, $c06e - add hl, bc - ld a, [hl] - ld hl, $c04e - add hl, bc - ld [hl], a - ld hl, $c02e - add hl, bc - res 4, [hl] - res 5, [hl] - call Func_91e6 - ret -; 0x91e6 - -Func_91e6 ; 0x91e6 - call Func_9825 - ld d, a - cp $ff - jp nz, Func_9274 - ld b, $0 - ld hl, $c02e - add hl, bc - bit 1, [hl] - jr nz, .asm_9224 ; 0x91f7 $2b - ld a, c - cp $3 - jr nc, .asm_9200 ; 0x91fc $2 - jr .asm_923f ; 0x91fe $3f -.asm_9200 - res 2, [hl] - ld hl, $c036 - add hl, bc - res 0, [hl] - cp $6 - jr nz, .asm_9214 ; 0x920a $8 - ld a, $0 - ld [$ff00+$1a], a - ld a, $80 - ld [$ff00+$1a], a -.asm_9214 - jr nz, .asm_9222 ; 0x9214 $c - ld a, [$c003] - and a - jr z, .asm_9222 ; 0x921a $6 - xor a - ld [$c003], a - jr .asm_923f ; 0x9220 $1d -.asm_9222 - jr .asm_9248 ; 0x9222 $24 -.asm_9224 - res 1, [hl] - ld d, $0 - ld a, c - add a - ld e, a - ld hl, $c006 - add hl, de - push hl - ld hl, $c016 - add hl, de - ld e, l - ld d, h - pop hl - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hl], a - jp Func_91e6 -.asm_923f - ld hl, $5b1f - add hl, bc - ld a, [$ff00+$25] - and [hl] - ld [$ff00+$25], a -.asm_9248 - ld a, [$c02a] - cp $14 - jr nc, .asm_9251 ; 0x924d $2 - jr .asm_926e ; 0x924f $1d -.asm_9251 - ld a, [$c02a] - cp $86 - jr z, .asm_926e ; 0x9256 $16 - jr c, .asm_925c ; 0x9258 $2 - jr .asm_926e ; 0x925a $12 -.asm_925c - ld a, c - cp $4 - jr z, .asm_9265 ; 0x925f $4 - call Func_96c7 - ret c -.asm_9265 - ld a, [$c005] - ld [$ff00+$24], a - xor a - ld [$c005], a -.asm_926e - ld hl, $c026 - add hl, bc - ld [hl], b - ret -; 0x9274 - -Func_9274: ; 0x9274 - cp $fd - jp nz, Func_92a9 - call Func_9825 - push af - call Func_9825 - ld d, a - pop af - ld e, a - push de - ld d, $0 - ld a, c - add a - ld e, a - ld hl, $c006 - add hl, de - push hl - ld hl, $c016 - add hl, de - ld e, l - ld d, h - pop hl - ld a, [hli] - ld [de], a - inc de - ld a, [hld] - ld [de], a - pop de - ld [hl], e - inc hl - ld [hl], d - ld b, $0 - ld hl, $c02e - add hl, bc - set 1, [hl] - jp Func_91e6 -; 0x92a9 - -Func_92a9: ; 0x92a9 - cp $fe - jp nz, Func_92e4 - call Func_9825 - ld e, a - and a - jr z, .asm_92cd ; 0x92b3 $18 - ld b, $0 - ld hl, $c0be - add hl, bc - ld a, [hl] - cp e - jr nz, .asm_92cb ; 0x92bd $c - ld a, $1 - ld [hl], a - call Func_9825 - call Func_9825 - jp Func_91e6 -.asm_92cb - inc a - ld [hl], a -.asm_92cd - call Func_9825 - push af - call Func_9825 - ld b, a - ld d, $0 - ld a, c - add a - ld e, a - ld hl, $c006 - add hl, de - pop af - ld [hli], a - ld [hl], b - jp Func_91e6 -; 0x92e4 - -Func_92e4: ; 0x92e4 - and $f0 - cp $d0 - jp nz, Func_9323 - ld a, d - and $f - ld b, $0 - ld hl, $c0c6 - add hl, bc - ld [hl], a - ld a, c - cp $3 - jr z, .asm_9320 ; 0x92f8 $26 - call Func_9825 - ld d, a - ld a, c - cp $2 - jr z, .asm_930c ; 0x9301 $9 - cp $6 - jr nz, .asm_9319 ; 0x9305 $12 - ld hl, $c0e7 - jr .asm_930f ; 0x930a $3 -.asm_930c - ld hl, $c0e6 -.asm_930f - ld a, d - and $f - ld [hl], a - ld a, d - and $30 - sla a - ld d, a -.asm_9319 - ld b, $0 - ld hl, $c0de - add hl, bc - ld [hl], d -.asm_9320 - jp Func_91e6 -; 0x9323 - -Func_9323: ; 0x9323 - ld a, d - cp $e8 - jr nz, .asm_9335 ; 0x9326 $d - ld b, $0 - ld hl, $c02e - add hl, bc - ld a, [hl] - xor $1 - ld [hl], a - jp Func_91e6 -.asm_9335 - cp $ea - jr nz, .asm_936d ; 0x9337 $34 - call Func_9825 - ld b, $0 - ld hl, $c04e - add hl, bc - ld [hl], a - ld hl, $c06e - add hl, bc - ld [hl], a - call Func_9825 - ld d, a - and $f0 - swap a - ld b, $0 - ld hl, $c056 - add hl, bc - srl a - ld e, a - adc b - swap a - or e - ld [hl], a - ld a, d - and $f - ld d, a - ld hl, $c05e - add hl, bc - swap a - or d - ld [hl], a - jp Func_91e6 -.asm_936d - cp $eb - jr nz, .asm_93a5 ; 0x936f $34 - call Func_9825 - ld b, $0 - ld hl, $c076 - add hl, bc - ld [hl], a - call Func_9825 - ld d, a - and $f0 - swap a - ld b, a - ld a, d - and $f - call Func_9858 - ld b, $0 - ld hl, $c0a6 - add hl, bc - ld [hl], d - ld hl, $c0ae - add hl, bc - ld [hl], e - ld b, $0 - ld hl, $c02e - add hl, bc - set 4, [hl] - call Func_9825 - ld d, a - jp Func_950a -.asm_93a5 - cp $ec - jr nz, .asm_93ba ; 0x93a7 $11 - call Func_9825 - rrca - rrca - and $c0 - ld b, $0 - ld hl, $c03e - add hl, bc - ld [hl], a - jp Func_91e6 -.asm_93ba - cp $ed - jr nz, .asm_93fa ; 0x93bc $3c - ld a, c - cp $4 - jr nc, .asm_93de ; 0x93c1 $1b - call Func_9825 - ld [$c0e8], a - call Func_9825 - ld [$c0e9], a - xor a - ld [$c0ce], a - ld [$c0cf], a - ld [$c0d0], a - ld [$c0d1], a - jr .asm_93f7 ; 0x93dc $19 -.asm_93de - call Func_9825 - ld [$c0ea], a - call Func_9825 - ld [$c0eb], a - xor a - ld [$c0d2], a - ld [$c0d3], a - ld [$c0d4], a - ld [$c0d5], a -.asm_93f7 - jp Func_91e6 -.asm_93fa - cp $ee - jr nz, .asm_9407 ; 0x93fc $9 - call Func_9825 - ld [$c004], a - jp Func_91e6 -.asm_9407 - cp $ef - jr nz, .asm_9426 ; 0x9409 $1b - call Func_9825 - push bc - call Func_9876 - pop bc - ld a, [$c003] - and a - jr nz, .asm_9423 ; 0x9417 $a - ld a, [$c02d] - ld [$c003], a - xor a - ld [$c02d], a -.asm_9423 - jp Func_91e6 -.asm_9426 - cp $fc - jr nz, .asm_9444 ; 0x9428 $1a - call Func_9825 - ld b, $0 - ld hl, $c046 - add hl, bc - ld [hl], a - and $c0 - ld hl, $c03e - add hl, bc - ld [hl], a - ld hl, $c02e - add hl, bc - set 6, [hl] - jp Func_91e6 -.asm_9444 - cp $f0 - jr nz, .asm_9450 ; 0x9446 $8 - call Func_9825 - ld [$ff00+$24], a - jp Func_91e6 -.asm_9450 - cp $f8 - jr nz, .asm_945f ; 0x9452 $b - ld b, $0 - ld hl, $c036 - add hl, bc - set 0, [hl] - jp Func_91e6 -.asm_945f - and $f0 - cp $e0 - jr nz, .asm_9472 ; 0x9463 $d - ld hl, $c0d6 - ld b, $0 - add hl, bc - ld a, d - and $f - ld [hl], a - jp Func_91e6 -.asm_9472 - cp $20 - jr nz, .asm_94bf ; 0x9474 $49 - ld a, c - cp $3 - jr c, .asm_94bf ; 0x9479 $44 - ld b, $0 - ld hl, $c036 - add hl, bc - bit 0, [hl] - jr nz, .asm_94bf ; 0x9483 $3a - call Func_950a - ld d, a - ld b, $0 - ld hl, $c03e - add hl, bc - ld a, [hl] - or d - ld d, a - ld b, $1 - call Func_9838 - ld [hl], d - call Func_9825 - ld d, a - ld b, $2 - call Func_9838 - ld [hl], d - call Func_9825 - ld e, a - ld a, c - cp $7 - ld a, $0 - jr z, .asm_94b2 ; 0x94ab $5 - push de - call Func_9825 - pop de -.asm_94b2 - ld d, a - push de - call Func_9629 - call Func_95f8 - pop de - call Func_964b - ret -.asm_94bf - ld a, c - cp $4 - jr c, .asm_94db ; 0x94c2 $17 - ld a, d - cp $10 - jr nz, .asm_94db ; 0x94c7 $12 - ld b, $0 - ld hl, $c036 - add hl, bc - bit 0, [hl] - jr nz, .asm_94db ; 0x94d1 $8 - call Func_9825 - ld [$ff00+$10], a - jp Func_91e6 -.asm_94db - ld a, c - cp $3 - jr nz, Func_950a ; 0x94de $2a - ld a, d - and $f0 - cp $b0 - jr z, .asm_94f5 ; 0x94e5 $e - jr nc, Func_950a ; 0x94e7 $21 - swap a - ld b, a - ld a, d - and $f - ld d, a - ld a, b - push de - push bc - jr .asm_94fd ; 0x94f3 $8 -.asm_94f5 - ld a, d - and $f - push af - push bc - call Func_9825 -.asm_94fd - ld d, a - ld a, [$c003] - and a - jr nz, .asm_9508 ; 0x9502 $4 - ld a, d - call Func_9876 -.asm_9508 - pop bc - pop de - -Func_950a: ; 0x950a - ld a, d - push af - and $f - inc a - ld b, $0 - ld e, a - ld d, b - ld hl, $c0c6 - add hl, bc - ld a, [hl] - ld l, b - call Func_9847 - ld a, c - cp $4 - jr nc, .asm_952b ; 0x951f $a - ld a, [$c0e8] - ld d, a - ld a, [$c0e9] - ld e, a - jr .asm_953e ; 0x9529 $13 -.asm_952b - ld d, $1 - ld e, $0 - cp $7 - jr z, .asm_953e ; 0x9531 $b - call Func_9693 - ld a, [$c0ea] - ld d, a - ld a, [$c0eb] - ld e, a -.asm_953e - ld a, l - ld b, $0 - ld hl, $c0ce - add hl, bc - ld l, [hl] - call Func_9847 - ld e, l - ld d, h - ld hl, $c0ce - add hl, bc - ld [hl], e - ld a, d - ld hl, $c0b6 - add hl, bc - ld [hl], a - ld hl, $c036 - add hl, bc - bit 0, [hl] - jr nz, .asm_9568 ; 0x955c $a - ld hl, $c02e - add hl, bc - bit 2, [hl] - jr z, .asm_9568 ; 0x9564 $2 - pop hl - ret -.asm_9568 - pop af - and $f0 - cp $c0 - jr nz, .asm_959f ; 0x956d $30 - ld a, c - cp $4 - jr nc, .asm_957c ; 0x9572 $8 - ld hl, $c02a - add hl, bc - ld a, [hl] - and a - jr nz, .asm_959e ; 0x957a $22 -.asm_957c - ld a, c - cp $2 - jr z, .asm_9585 ; 0x957f $4 - cp $6 - jr nz, .asm_9592 ; 0x9583 $d -.asm_9585 - ld b, $0 - ld hl, $5b1f - add hl, bc - ld a, [$ff00+$25] - and [hl] - ld [$ff00+$25], a - jr .asm_959e ; 0x9590 $c -.asm_9592 - ld b, $2 - call Func_9838 - ld a, $8 - ld [hli], a - inc hl - ld a, $80 - ld [hl], a -.asm_959e - ret -.asm_959f - swap a - ld b, $0 - ld hl, $c0d6 - add hl, bc - ld b, [hl] - call Func_9858 - ld b, $0 - ld hl, $c02e - add hl, bc - bit 4, [hl] - jr z, .asm_95b8 ; 0x95b3 $3 - call Func_978f -.asm_95b8 - push de - ld a, c - cp $4 - jr nc, .asm_95cd ; 0x95bc $f - ld hl, $c02a - ld d, $0 - ld e, a - add hl, de - ld a, [hl] - and a - jr nz, .asm_95cb ; 0x95c7 $2 - jr .asm_95cd ; 0x95c9 $2 -.asm_95cb - pop de - ret -.asm_95cd - ld b, $0 - ld hl, $c0de - add hl, bc - ld d, [hl] - ld b, $2 - call Func_9838 - ld [hl], d - call Func_9629 - call Func_95f8 - pop de - ld b, $0 - ld hl, $c02e - add hl, bc - bit 0, [hl] - jr z, .asm_95ef ; 0x95e9 $4 - inc e - jr nc, .asm_95ef ; 0x95ec $1 - inc d -.asm_95ef - ld hl, $c066 - add hl, bc - ld [hl], e - call Func_964b - ret -; 0x95f8 - -Func_95f8: ; 0x95f8 - ld b, $0 - ld hl, $5b27 - add hl, bc - ld a, [$ff00+$25] - or [hl] - ld d, a - ld a, c - cp $7 - jr z, .asm_9613 ; 0x9605 $c - cp $4 - jr nc, .asm_9625 ; 0x9609 $1a - ld hl, $c02a - add hl, bc - ld a, [hl] - and a - jr nz, .asm_9625 ; 0x9611 $12 -.asm_9613 - ld a, [$c004] - ld hl, $5b27 - add hl, bc - and [hl] - ld d, a - ld a, [$ff00+$25] - ld hl, $5b1f - add hl, bc - and [hl] - or d - ld d, a -.asm_9625 - ld a, d - ld [$ff00+$25], a - ret -; 0x9629 - -Func_9629: ; 0x9629 - ld b, $0 - ld hl, $c0b6 - add hl, bc - ld d, [hl] - ld a, c - cp $2 - jr z, .asm_9644 ; 0x9633 $f - cp $6 - jr z, .asm_9644 ; 0x9637 $b - ld a, d - and $3f - ld d, a - ld hl, $c03e - add hl, bc - ld a, [hl] - or d - ld d, a -.asm_9644 - ld b, $1 - call Func_9838 - ld [hl], d - ret -; 0x964b - -Func_964b: ; 0x964b - ld a, c - cp $2 - jr z, .asm_9654 ; 0x964e $4 - cp $6 - jr nz, .asm_9681 ; 0x9652 $2d -.asm_9654 - push de - ld de, $c0e6 - cp $2 - jr z, .asm_965f ; 0x965a $3 - ld de, $c0e7 -.asm_965f - ld a, [de] - add a - ld d, $0 - ld e, a - ld hl, $4361 - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld hl, $ff30 - ld b, $f - ld a, $0 - ld [$ff00+$1a], a -.asm_9674 - ld a, [de] - inc de - ld [hli], a - ld a, b - dec b - and a - jr nz, .asm_9674 ; 0x967a $f8 - ld a, $80 - ld [$ff00+$1a], a - pop de -.asm_9681 - ld a, d - or $80 - and $c7 - ld d, a - ld b, $3 - call Func_9838 - ld [hl], e - inc hl - ld [hl], d - call Func_96b5 - ret -; 0x9693 - -Func_9693: ; 0x9693 - call Func_96e5 - jr nc, .asm_96ab ; 0x9696 $13 - ld d, $0 - ld a, [$c0f2] - add $80 - jr nc, .asm_96a2 ; 0x969f $1 - inc d -.asm_96a2 - ld [$c0eb], a - ld a, d - ld [$c0ea], a - jr .asm_96b4 ; 0x96a9 $9 -.asm_96ab - xor a - ld [$c0eb], a - ld a, $1 - ld [$c0ea], a -.asm_96b4 - ret -; 0x96b5 - -Func_96b5: ; 0x96b5 - call Func_96e5 - jr nc, .asm_96c6 ; 0x96b8 $c - ld a, [$c0f1] - add e - jr nc, .asm_96c1 ; 0x96be $1 - inc d -.asm_96c1 - dec hl - ld e, a - ld [hl], e - inc hl - ld [hl], d -.asm_96c6 - ret -; 0x96c7 - -Func_96c7: ; 0x96c7 - call Func_96e5 - jr nc, .asm_96e2 ; 0x96ca $16 - ld hl, $c006 - ld e, c - ld d, $0 - sla e - rl d - add hl, de - ld a, [hl] - sub $1 - ld [hl], a - inc hl - ld a, [hl] - sbc $0 - ld [hl], a - scf - ret -.asm_96e2 - scf - ccf - ret -; 0x96e5 - -Func_96e5: ; 0x96e5 - ld a, [$c02a] - cp $14 - jr nc, .asm_96ee ; 0x96ea $2 - jr .asm_96f4 ; 0x96ec $6 -.asm_96ee - cp $86 - jr z, .asm_96f4 ; 0x96f0 $2 - jr c, .asm_96f7 ; 0x96f2 $3 -.asm_96f4 - scf - ccf - ret -.asm_96f7 - scf - ret -; 0x96f9 - -Func_96f9: ; 0x96f9 - ld hl, $c02e - add hl, bc - bit 5, [hl] - jp nz, .asm_9740 - ld hl, $c09e - add hl, bc - ld e, [hl] - ld hl, $c096 - add hl, bc - ld d, [hl] - ld hl, $c07e - add hl, bc - ld l, [hl] - ld h, b - add hl, de - ld d, h - ld e, l - ld hl, $c08e - add hl, bc - push hl - ld hl, $c086 - add hl, bc - ld a, [hl] - pop hl - add [hl] - ld [hl], a - ld a, $0 - adc e - ld e, a - ld a, $0 - adc d - ld d, a - ld hl, $c0a6 - add hl, bc - ld a, [hl] - cp d - jp c, .asm_9786 - jr nz, .asm_9773 ; 0x9733 $3e - ld hl, $c0ae - add hl, bc - ld a, [hl] - cp e - jp c, .asm_9786 - jr .asm_9773 ; 0x973e $33 -.asm_9740 - ld hl, $c09e - add hl, bc - ld a, [hl] - ld hl, $c096 - add hl, bc - ld d, [hl] - ld hl, $c07e - add hl, bc - ld e, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, $c086 - add hl, bc - ld a, [hl] - add a - ld [hl], a - ld a, e - sbc b - ld e, a - ld a, d - sbc b - ld d, a - ld hl, $c0a6 - add hl, bc - ld a, d - cp [hl] - jr c, .asm_9786 ; 0x9767 $1d - jr nz, .asm_9773 ; 0x9769 $8 - ld hl, $c0ae - add hl, bc - ld a, e - cp [hl] - jr c, .asm_9786 ; 0x9771 $13 -.asm_9773 - ld hl, $c09e - add hl, bc - ld [hl], e - ld hl, $c096 - add hl, bc - ld [hl], d - ld b, $3 - call Func_9838 - ld a, e - ld [hli], a - ld [hl], d - ret -.asm_9786 - ld hl, $c02e - add hl, bc - res 4, [hl] - res 5, [hl] - ret -; 0x978f - -Func_978f: ; 0x978f - ld hl, $c096 - add hl, bc - ld [hl], d - ld hl, $c09e - add hl, bc - ld [hl], e - ld hl, $c0b6 - add hl, bc - ld a, [hl] - ld hl, $c076 - add hl, bc - sub [hl] - jr nc, .asm_97a7 ; 0x97a3 $2 - ld a, $1 -.asm_97a7 - ld [hl], a - ld hl, $c0ae - add hl, bc - ld a, e - sub [hl] - ld e, a - ld a, d - sbc b - ld hl, $c0a6 - add hl, bc - sub [hl] - jr c, .asm_97c3 ; 0x97b6 $b - ld d, a - ld b, $0 - ld hl, $c02e - add hl, bc - set 5, [hl] - jr .asm_97e6 ; 0x97c1 $23 -.asm_97c3 - ld hl, $c096 - add hl, bc - ld d, [hl] - ld hl, $c09e - add hl, bc - ld e, [hl] - ld hl, $c0ae - add hl, bc - ld a, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, $c0a6 - add hl, bc - ld a, [hl] - sub d - ld d, a - ld b, $0 - ld hl, $c02e - add hl, bc - res 5, [hl] -.asm_97e6 - ld hl, $c076 - add hl, bc -.asm_97ea - inc b - ld a, e - sub [hl] - ld e, a - jr nc, .asm_97ea ; 0x97ee $fa - ld a, d - and a - jr z, .asm_97f8 ; 0x97f2 $4 - dec a - ld d, a - jr .asm_97ea ; 0x97f6 $f2 -.asm_97f8 - ld a, e - add [hl] - ld d, b - ld b, $0 - ld hl, $c07e - add hl, bc - ld [hl], d - ld hl, $c086 - add hl, bc - ld [hl], a - ld hl, $c08e - add hl, bc - ld [hl], a - ret -; 0x980d - -Func_980d: ; 0x980d - ld b, $0 - ld hl, $c046 - add hl, bc - ld a, [hl] - rlca - rlca - ld [hl], a - and $c0 - ld d, a - ld b, $1 - call Func_9838 - ld a, [hl] - and $3f - or d - ld [hl], a - ret -; 0x9825 - -Func_9825: ; 0x9825 - ld d, $0 - ld a, c - add a - ld e, a - ld hl, $c006 - add hl, de - ld a, [hli] - ld e, a - ld a, [hld] - ld d, a - ld a, [de] - inc de - ld [hl], e - inc hl - ld [hl], d - ret -; 0x9838 - -Func_9838: ; 0x9838 - ld a, c - ld hl, $5b17 - add l - jr nc, .asm_9840 ; 0x983d $1 - inc h -.asm_9840 - ld l, a - ld a, [hl] - add b - ld l, a - ld h, $ff - ret -; 0x9847 - -Func_9847: ; 0x9847 - ld h, $0 -.asm_9849 - srl a - jr nc, .asm_984e ; 0x984b $1 - add hl, de -.asm_984e - sla e - rl d - and a - jr z, .asm_9857 ; 0x9853 $2 - jr .asm_9849 ; 0x9855 $f2 -.asm_9857 - ret -; 0x9858 - -Func_9858: ; 0x9858 - ld h, $0 - ld l, a - add hl, hl - ld d, h - ld e, l - ld hl, $5b2f - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld a, b -.asm_9866 - cp $7 - jr z, .asm_9871 ; 0x9868 $7 - sra d - rr e - inc a - jr .asm_9866 ; 0x986f $f5 -.asm_9871 - ld a, $8 - add d - ld d, a - ret -; 0x9876 - -Func_9876: ; 0x9876 - ld [$c001], a - cp $ff - jp z, Func_9a34 - cp $b9 - jp z, Func_994e - jp c, Func_994e - cp $fe - jr z, .asm_988d ; 0x9888 $3 - jp nc, Func_994e -.asm_988d - xor a - ld [$c000], a - ld [$c003], a - ld [$c0e9], a - ld [$c0e6], a - ld [$c0e7], a - ld d, $8 - ld hl, $c016 - call Func_9a89 - ld hl, $c006 - call Func_9a89 - ld d, $4 - ld hl, $c026 - call Func_9a89 - ld hl, $c02e - call Func_9a89 - ld hl, $c03e - call Func_9a89 - ld hl, $c046 - call Func_9a89 - ld hl, $c04e - call Func_9a89 - ld hl, $c056 - call Func_9a89 - ld hl, $c05e - call Func_9a89 - ld hl, $c066 - call Func_9a89 - ld hl, $c06e - call Func_9a89 - ld hl, $c036 - call Func_9a89 - ld hl, $c076 - call Func_9a89 - ld hl, $c07e - call Func_9a89 - ld hl, $c086 - call Func_9a89 - ld hl, $c08e - call Func_9a89 - ld hl, $c096 - call Func_9a89 - ld hl, $c09e - call Func_9a89 - ld hl, $c0a6 - call Func_9a89 - ld hl, $c0ae - call Func_9a89 - ld a, $1 - ld hl, $c0be - call Func_9a89 - ld hl, $c0b6 - call Func_9a89 - ld hl, $c0c6 - call Func_9a89 - ld [$c0e8], a - ld a, $ff - ld [$c004], a - xor a - ld [$ff00+$24], a - ld a, $8 - ld [$ff00+$10], a - ld a, $0 - ld [$ff00+$25], a - xor a - ld [$ff00+$1a], a - ld a, $80 - ld [$ff00+$1a], a - ld a, $77 - ld [$ff00+$24], a - jp Func_9a8f -; 0x994e - -Func_994e: ; 0x994e - ld l, a - ld e, a - ld h, $0 - ld d, h - add hl, hl - add hl, de - ld de, $4000 - add hl, de - ld a, h - ld [$c0ec], a - ld a, l - ld [$c0ed], a - ld a, [hl] - and $c0 - rlca - rlca - ld c, a -.asm_9967 - ld d, c - ld a, c - add a - add c - ld c, a - ld b, $0 - ld a, [$c0ec] - ld h, a - ld a, [$c0ed] - ld l, a - add hl, bc - ld c, d - ld a, [hl] - and $f - ld e, a - ld d, $0 - ld hl, $c026 - add hl, de - ld a, [hl] - and a - jr z, .asm_99a3 ; 0x9984 $1d - ld a, e - cp $7 - jr nz, .asm_999a ; 0x9989 $f - ld a, [$c001] - cp $14 - jr nc, .asm_9993 ; 0x9990 $1 - ret -.asm_9993 - ld a, [hl] - cp $14 - jr z, .asm_99a3 ; 0x9996 $b - jr c, .asm_99a3 ; 0x9998 $9 -.asm_999a - ld a, [$c001] - cp [hl] - jr z, .asm_99a3 ; 0x999e $3 - jr c, .asm_99a3 ; 0x99a0 $1 - ret -.asm_99a3 - xor a - push de - ld h, d - ld l, e - add hl, hl - ld d, h - ld e, l - ld hl, $c016 - add hl, de - ld [hli], a - ld [hl], a - ld hl, $c006 - add hl, de - ld [hli], a - ld [hl], a - pop de - ld hl, $c026 - add hl, de - ld [hl], a - ld hl, $c02e - add hl, de - ld [hl], a - ld hl, $c03e - add hl, de - ld [hl], a - ld hl, $c046 - add hl, de - ld [hl], a - ld hl, $c04e - add hl, de - ld [hl], a - ld hl, $c056 - add hl, de - ld [hl], a - ld hl, $c05e - add hl, de - ld [hl], a - ld hl, $c066 - add hl, de - ld [hl], a - ld hl, $c06e - add hl, de - ld [hl], a - ld hl, $c076 - add hl, de - ld [hl], a - ld hl, $c07e - add hl, de - ld [hl], a - ld hl, $c086 - add hl, de - ld [hl], a - ld hl, $c08e - add hl, de - ld [hl], a - ld hl, $c096 - add hl, de - ld [hl], a - ld hl, $c09e - add hl, de - ld [hl], a - ld hl, $c0a6 - add hl, de - ld [hl], a - ld hl, $c0ae - add hl, de - ld [hl], a - ld hl, $c036 - add hl, de - ld [hl], a - ld a, $1 - ld hl, $c0be - add hl, de - ld [hl], a - ld hl, $c0b6 - add hl, de - ld [hl], a - ld hl, $c0c6 - add hl, de - ld [hl], a - ld a, e - cp $4 - jr nz, .asm_9a2b ; 0x9a25 $4 - ld a, $8 - ld [$ff00+$10], a -.asm_9a2b - ld a, c - and a - jp z, Func_9a8f - dec c - jp .asm_9967 -; 0x9a34 - -Func_9a34: ; 0x9a34 - ld a, $80 - ld [$ff00+$26], a - ld [$ff00+$1a], a - xor a - ld [$ff00+$25], a - ld [$ff00+$1c], a - ld a, $8 - ld [$ff00+$10], a - ld [$ff00+$12], a - ld [$ff00+$17], a - ld [$ff00+$21], a - ld a, $40 - ld [$ff00+$14], a - ld [$ff00+$19], a - ld [$ff00+$23], a - ld a, $77 - ld [$ff00+$24], a - xor a - ld [$c000], a - ld [$c003], a - ld [$c002], a - ld [$c0e9], a - ld [$c0eb], a - ld [$c0e6], a - ld [$c0e7], a - ld d, $a0 - ld hl, $c006 - call Func_9a89 - ld a, $1 - ld d, $18 - ld hl, $c0b6 - call Func_9a89 - ld [$c0e8], a - ld [$c0ea], a - ld a, $ff - ld [$c004], a - ret -; 0x9a89 - -Func_9a89: ; 0x9a89 - ld b, d -.asm_9a8a - ld [hli], a - dec b - jr nz, .asm_9a8a ; 0x9a8c $fc - ret -; 0x9a8f - -Func_9a8f: ; 0x9a8f - ld a, [$c001] - ld l, a - ld e, a - ld h, $0 - ld d, h - add hl, hl - add hl, de - ld de, $4000 - add hl, de - ld e, l - ld d, h - ld hl, $c006 - ld a, [de] - ld b, a - rlca - rlca - and $3 - ld c, a - ld a, b - and $f - ld b, c - inc b - inc de - ld c, $0 -.asm_9ab1 - cp c - jr z, .asm_9ab9 ; 0x9ab2 $5 - inc c - inc hl - inc hl - jr .asm_9ab1 ; 0x9ab7 $f8 -.asm_9ab9 - push hl - push bc - push af - ld b, $0 - ld c, a - ld hl, $c026 - add hl, bc - ld a, [$c001] - ld [hl], a - pop af - cp $3 - jr c, .asm_9ad2 ; 0x9aca $6 - ld hl, $c02e - add hl, bc - set 2, [hl] -.asm_9ad2 - pop bc - pop hl - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hli], a - inc de - inc c - dec b - ld a, b - and a - ld a, [de] - inc de - jr nz, .asm_9ab1 ; 0x9ae0 $cf - ld a, [$c001] - cp $14 - jr nc, .asm_9aeb ; 0x9ae7 $2 - jr .asm_9b15 ; 0x9ae9 $2a -.asm_9aeb - ld a, [$c001] - cp $86 - jr z, .asm_9b15 ; 0x9af0 $23 - jr c, .asm_9af6 ; 0x9af2 $2 - jr .asm_9b15 ; 0x9af4 $1f -.asm_9af6 - ld hl, $c02a - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld hl, $c012 - ld de, $5b16 - ld [hl], e - inc hl - ld [hl], d - ld a, [$c005] - and a - jr nz, .asm_9b15 ; 0x9b0a $9 - ld a, [$ff00+$24] - ld [$c005], a - ld a, $77 - ld [$ff00+$24], a -.asm_9b15 - ret -; 0x9b16 - - mus_end; 9B16 - -UnknSong_md_9b17: - mus_note noteC#, note16 - mus_note noteC#, note4_8 - mus_note noteC#, note2_8_16 - mus_note noteC#, note1 - mus_note noteC#, note16; 9B1B - mus_note noteC#, note4_8 - mus_note noteC#, note2_8_16 - mus_note noteC#, note1 - - db $ee - db $dd; 9B20 - - mus_note noteB, note2_4 - mus_note noteG, note2 - - db $ee - db $dd - - mus_note noteB, note2_4; 9B25 - mus_note noteG, note2 - mus_note noteC#, note8 - mus_note noteD, note8_16 - mus_note noteE, note4_16 - mus_note noteG#, note2_16; 9B2A - mus_note noteC#, note8 - mus_note noteD, note8_16 - mus_note noteE, note4_16 - mus_note noteG#, note2_16 - mus_note noteD, note2_4_16; 9B2F - - db $f8 - - mus_note noteA, note2_4_8 - - db $f8 - - mus_note noteC, note2 - - db $f9; 9B34 - - mus_note noteF#, note2_4 - - db $f9 - - mus_note noteRst, note2_8_16 - - db $f9 - - mus_note noteD, note4; 9B39 - - db $fa - - mus_note noteG, note2 - - db $fa - - mus_note noteRst, note2 - - db $fa; 9B3E - - mus_note noteC#, note8_16 - - db $fb - - mus_note noteF, note2_16 - - db $fb - - mus_note noteA, note2_4; 9B43 - - db $fb - db $da - db $fb - -Func_9b47: ; 0x9b47 - ld c, $2 - ld a, $de - call PlayMusic - ld hl, $c006 - ld de, $71a2 - call Func_9b60 - ld de, $721d - call Func_9b60 - ld de, $72b5 - -Func_9b60: ; 0x9b60 - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret -; 0x9b65 - -Func_9b65: ; 0x9b65 - ld c, $2 - ld a, $de - call PlayMusic - ld hl, $c006 - ld de, $7119 - jp Func_9b60 -; 0x9b75 - -Func_9b75: ; 0x9b75 - call Func_9b47 - ld hl, $c006 - ld de, $719b - jp Func_9b60 -; 0x9b81 - -Func_9b81: ; 0x9b81 - ld a, $a - ld [$cfc8], a - ld [$cfc9], a - ld a, $ff - ld [$cfc7], a - ld c, $64 - call DelayFrames - ld c, $2 - ld a, $c3 - call PlayMusic - ld hl, $c006 - ld de, $6a6f - jp Func_9b60 -; 0x9ba3 - -;Pokemon Healed Music -PkmnHealed_md_1: ;9BA3 - 9BC3 - ;Setup - mus_tempo 0, $90 - mus_volume 119 - mus_duty duty50 - db $E8 ;?? - mus_vel 8, 1 - -;Music - ;Piece 1 - mus_note noteRst, note8 - db $EB, $00 - mus_note noteE, note2_4 - mus_note noteB, note8 - db $EB, $00 - mus_note noteF, note4_16 - mus_note noteB, note8 - db $EB, $00 - mus_note noteE, note4_16 - mus_note noteE, note8 - mus_note noteRst, note4 - db $EB, $00 - mus_note noteD#, note2_4 - mus_note noteE, note4 - db $EB, $00 - mus_note noteE, note2_4 - mus_note noteB, note4 - - mus_end ;End - -PkmnHealed_md_2: ;9BC4 - 9BD1 -;Setup - mus_duty duty50 - -;Music - ;Octave Switch - db dNormSpd - mus_note noteRst, note4 - db oct3 - - ;Piece 1 - mus_note noteB, note4 - mus_note noteB, note4 - mus_note noteB, note8 - mus_note noteG#, note8 - - ;Octave Switch - db dNormSpd - mus_note noteRst, note4_16 - db oct4 - - ;Piece 2 - mus_note noteE, note2 - - mus_end ;End - -PkmnHealed_md_3: ;9BD2 - 9BDD -;Music - ;Octave Switch - db dNormSpd - mus_note noteC#, note16 - db oct3 - - ;Piece 1 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteG#, note8 - mus_note noteE, note4_8 - mus_note noteRst, note8 - - mus_end ;End - - ;Routes 1 and 2 -Routes1_md_1: ;9BDE - 9C50 - mus_tempo 0, 152 - mus_volume 119 - mus_mod 4, 2, 3 - mus_duty duty50 - db $E8 - -branch_9BE9: - mus_vel 10, 1 - mus_note noteRst, note4 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteD, note4_8 - mus_note noteD, note8 - mus_note noteD, note4_8 - mus_note noteD, note8 - mus_note noteD, note16 - mus_note noteC#, note16 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteC#, note16 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteA, note4_8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteC#, note4_8 - mus_note noteC#, note8 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteA, note4_8 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteD, note4_8 - mus_note noteD, note8 - mus_note noteD, note4_8 - mus_note noteD, note8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteD, note16 - mus_note noteC#, note16 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteA, note4_8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteC#, note4_8 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_vel 10, 2 - - mus_octave oct3 - mus_note noteG, note4 - mus_note noteE, note4 - mus_note noteF#, note8 - mus_vel 10, 1 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteA, note4_8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note4 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note4 - mus_note noteG, note8 - mus_note noteE, note8 - mus_note noteC#, note4 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteA, note4 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteE, note8 - mus_note noteC#, note8 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteA, note8 - mus_jump 0, branch_9BE9 ;5BE9 - mus_end - -Routes1_md_2: ;9C51 - 9CD7 - mus_duty duty50 - -branch_9C53: - mus_vel 13, 1 - mus_call branch_9C65 - mus_call branch_9C78 - mus_call branch_9C65 - mus_call branch_9C8D - mus_jump 0, branch_9C53 - -branch_9C65: - mus_octave oct3 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteG, note8_16 - mus_note noteF#, note16 - mus_note noteE, note4_8 - mus_end - -branch_9C78: - mus_note noteC#, note16 - mus_note noteD, note16 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteC#, note16 - mus_note noteD, note16 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteC#, note16 - mus_note noteD, note16 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteF#, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteD, note4 - mus_note noteF#, note8 - mus_end - -branch_9C8D: - mus_note noteC#, note16 - mus_note noteD, note16 - mus_note noteE, note8 - mus_note noteG, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_vel 13, 2 - mus_note noteB, note4 - db $D6 - db $D1 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteC#, note16 - mus_vel 13, 1 - - mus_octave oct2 - mus_note noteB, note16 - mus_note noteA, note16 - - mus_octave oct3 - mus_note noteC#, note16 - mus_note noteD, note4_8 - mus_vel 13, 2 - mus_note noteF#, note16 - mus_note noteG, note16 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteD, note8 - - mus_octave oct4 - mus_note noteD, note8 - mus_note noteC#, note8 - - mus_octave oct3 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC#, note8 - - mus_octave oct3 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteD, note8_16 - mus_note noteF#, note16 - mus_note noteE, note4_8 - mus_note noteF#, note16 - mus_note noteG, note16 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - - mus_octave oct4 - mus_note noteD, note8 - mus_note noteC#, note8 - - mus_octave oct3 - mus_note noteB, note8_16 - mus_note noteG, note16 - mus_note noteA, note8 - - mus_octave oct4 - mus_note noteD, note8 - mus_note noteC#, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_vel 13, 1 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteD, note8 - mus_end - mus_end - -Routes1_md_3: ;9CD8 - 9D23 - mus_mod 8, 2, 5 - mus_vel 1, 3 - -branch_9CDD: - mus_note noteRst, note8 - - mus_octave oct3 - mus_note noteD, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteD, note4 - - mus_octave oct2 - mus_note noteA, note4 - mus_note noteB, note4 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteA, note4 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteD, note4 - - mus_octave oct2 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteD, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteD, note4 - - mus_octave oct2 - mus_note noteA, note4 - mus_note noteB, note4 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteD, note4 - - mus_octave oct2 - mus_note noteA, note4 - - mus_octave oct3 - mus_note noteD, note2 - - mus_octave oct2 - mus_note noteG, note2 - mus_note noteA, note2 - - mus_octave oct3 - mus_note noteC#, note2 - mus_note noteD, note2 - - mus_octave oct2 - mus_note noteG, note2 - mus_note noteA, note2 - - mus_octave oct3 - mus_note noteD, note4_8 - mus_jump 0, branch_9CDD - mus_end - ; 9D23 - -Routes1_md_4: ;9D24 - 9DB8 -; 9D24 - mus_vel 12, 3 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note4 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note4 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note4 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note4 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note4 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note4 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note1 - mus_note noteB, note8 - mus_note noteC, note1 - mus_jump 0, Routes1_md_4 - mus_end -; 9DB8 - -;Routes 24 and 25 -Routes2_md_1: ;9DB9 - 9E4E - ; 9DB9 - mus_tempo 0, 152 - mus_volume 119 - mus_mod 9, 2, 5 - mus_duty duty25 - -branch_9DBC: - mus_vel 11, 2 - - mus_octave oct1 - mus_note noteB, note4 - - mus_octave oct2 - mus_note noteG#, note4_8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD#, note16 - mus_note noteF#, note16 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteA, note8 - mus_note noteG#, note4 - mus_note noteF#, note4 - - mus_octave oct1 - mus_note noteB, note4 - - mus_octave oct2 - mus_note noteG#, note4_8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD#, note16 - mus_note noteF#, note16 - mus_note noteB, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteA, note8 - mus_note noteG#, note4 - mus_note noteB, note4 - db $D8 - mus_note noteB, note8_16 - - mus_octave oct3 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteD#, note8 - - mus_octave oct2 - mus_note noteG#, note8 - - mus_octave oct3 - mus_note noteD#, note8 - mus_note noteD#, note8 - - mus_octave oct2 - mus_note noteG#, note8 - - mus_octave oct3 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteF#, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteF#, note8 - - mus_octave oct3 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteB, note8 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_jump 0, branch_9DBC - mus_end - ; 9E4E - -Routes2_md_2: ;9E4F - 9E9A - - ; 9E4F - mus_mod 8, 2, 6 - mus_duty duty75 - -branch_9E54: - mus_vel 13, 4 - - mus_octave oct3 - mus_note noteE, note4_8 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteE, note16 - mus_note noteF#, note4_8 - mus_note noteA, note8 - mus_note noteG#, note8_16 - mus_note noteE, note16 - mus_note noteF#, note2 - - mus_octave oct2 - mus_note noteD#, note4 - - mus_octave oct3 - mus_note noteE, note4_8 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteE, note16 - mus_note noteF#, note4_8 - mus_note noteA, note8 - mus_note noteG#, note8_16 - mus_note noteE, note16 - mus_note noteB, note2 - - mus_octave oct2 - mus_note noteG#, note4 - - mus_octave oct4 - mus_note noteC#, note4_8 - - mus_octave oct3 - mus_note noteB, note16 - mus_note noteA, note16 - mus_note noteB, note4_8 - mus_note noteA, note16 - mus_note noteG#, note16 - mus_note noteA, note4_8 - mus_note noteG#, note16 - mus_note noteF#, note16 - mus_note noteG#, note4 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF#, note2 - mus_note noteA, note4 - mus_note noteG#, note8_16 - mus_note noteF#, note16 - mus_note noteE, note2 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF#, note8 - mus_note noteF#, note16 - mus_note noteG#, note16 - mus_note noteA, note4 - - mus_octave oct4 - mus_note noteC#, note4 - - mus_octave oct3 - mus_note noteB, note8_16 - mus_note noteA, note16 - mus_note noteG#, note2 - mus_note noteRst, note4 - mus_jump 0, branch_9E54 - mus_end - ; 9E9A - -Routes2_md_3: ;9E9B - 9F07 - ; 9E9B - mus_mod 9, 2, 8 - -branch_9E9E: - mus_vel 1, 1 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteB, note4_8 - - mus_octave oct2 - mus_note noteD, note16 - mus_note noteC#, note16 - mus_note noteD, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteB, note4_8 - - mus_octave oct2 - mus_note noteD, note16 - mus_note noteC#, note16 - - mus_octave oct1 - mus_note noteA, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteB, note4_8 - - mus_octave oct2 - mus_note noteD, note16 - mus_note noteC#, note16 - mus_note noteD, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteB, note4 - - mus_octave oct2 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteD, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteA, note8 - mus_note noteRst, note8 - - mus_octave oct2 - mus_note noteD#, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteG#, note8 - mus_note noteRst, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteRst, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteRst, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteRst, note8 - - mus_octave oct1 - mus_note noteA, note8 - - mus_octave oct2 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteB, note8 - mus_note noteRst, note8 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_jump 0, branch_9E9E - mus_end - ; 9F07 - -Routes2_md_4: ;9F08 - 9FAC - ; 9F08 - mus_vel 11, 1 - mus_note noteC, note4 - mus_note noteRst, note8 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteRst, note4_16 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - db $D8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_vel 11, 0 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - db $D8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_vel 11, 0 - mus_note noteC, note4 - mus_note noteRst, note4_16 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - db $D8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_vel 11, 0 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - db $D8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_vel 11, 0 - mus_note noteC, note4 - mus_note noteRst, note4_16 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note16 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteRst, note8 - db $D8 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8 - mus_note noteC, note4 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_note noteB, note8_16 - mus_note noteC, note4 - mus_note noteRst, note8_16 - mus_jump 0, Routes2_md_4 - mus_end - ; 9FAC - -;Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Routes3_md_1: ;9FAD - A008 - ; 9FAD - mus_tempo 0, 148 - mus_volume 119 - mus_duty duty75 - mus_mod 6, 3, 4 - db $E8 - mus_vel 11, 5 - - mus_octave oct2 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteG, note4_8 - mus_note noteF, note16 - mus_note noteG, note16 - mus_note noteE, note16 - mus_note noteRst, note1 - mus_note noteRst, note2_4_8_16 - -branch_9FC3: - mus_vel 11, 5 - mus_note noteE, note4_8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteC, note4 - mus_note noteE, note4 - mus_note noteC, note4_8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF, note8 - mus_note noteG, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_vel 10, 7 - mus_note noteA#, note2 - mus_note noteF, note2 - mus_note noteD, note2 - mus_note noteF, note2 - mus_vel 11, 5 - mus_note noteE, note4_8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteC, note4 - mus_note noteE, note4 - mus_note noteC, note4_8 - mus_note noteD, note16 - mus_note noteE, note16 - mus_note noteF, note8 - mus_note noteG, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_vel 10, 7 - mus_note noteA#, note2 - mus_note noteA#, note2 - mus_note noteD, note2 - mus_note noteF, note2 - mus_vel 11, 5 - mus_note noteE, note4 - mus_note noteE, note8 - mus_note noteF, note8 - mus_note noteG, note4 - mus_note noteF, note8 - mus_note noteE, note8 - mus_note noteB, note8 - - mus_octave oct1 - mus_note noteG, note4 - - mus_octave oct2 - mus_note noteB, note2 - mus_note noteA, note8 - db $D8 - mus_note noteRst, note4 - mus_note noteA, note4 - mus_note noteF, note4 - mus_note noteA, note4 - db $D8 - mus_note noteE, note1 - mus_note noteA, note2_4 - db $D8 - mus_note noteA, note16 - mus_note noteF, note2_4 - mus_note noteG, note2_4 - mus_jump 0, branch_9FC3 - ;A008 - ;No end byte until indigo plateu channel 1 - -Routes3_md_2: ;A009 - A07E - ; A009 - mus_mod 8, 2, 3 - mus_duty duty50 - mus_vel 12, 7 - - mus_octave oct2 - mus_note noteG, note16 - mus_note noteA#, note16 - mus_note noteB, note4_8 - mus_note noteA, note16 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteRst, note2_4_8_16 - mus_note noteRst, note1 - -branch_A01A: - mus_vel 12, 7 - mus_duty duty50 - - mus_octave oct3 - mus_note noteC, note4_8 - - mus_octave oct2 - mus_note noteG, note16 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteE, note2_8 - - mus_octave oct2 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteG, note8 - mus_note noteF, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteC, note8 - mus_note noteD, note2 - mus_note noteF, note2 - mus_vel 12, 5 - mus_duty duty75 - - mus_octave oct2 - mus_note noteA#, note2 - mus_note noteA, note2 - mus_vel 12, 7 - mus_duty duty50 - - mus_octave oct3 - mus_note noteC, note4_8 - - mus_octave oct2 - mus_note noteG, note16 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteE, note2_8 - - mus_octave oct2 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteG, note8 - mus_note noteF, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteC, note8 - mus_note noteD, note2 - mus_note noteF, note2 - mus_vel 12, 5 - mus_duty duty75 - - mus_octave oct2 - mus_note noteA#, note2 - - mus_octave oct3 - mus_note noteD, note4_8 - mus_vel 12, 7 - mus_duty duty50 - mus_note noteC, note16 - mus_note noteD, note16 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteE, note8 - mus_note noteC, note2 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteC, note16 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteG, note4 - - mus_octave oct3 - mus_note noteG, note2 - mus_note noteF, note16 - mus_note noteE, note16 - db $D8 - db $D3 - mus_note noteF, note4 - mus_note noteE, note4 - db $D8 - mus_note noteRst, note4_16 - mus_note noteC, note4 - db $D8 - mus_note noteRst, note4_8 - mus_note noteC, note2_4 - mus_vel 10, 0 - mus_duty duty75 - - mus_octave oct2 - mus_note noteA, note2 - mus_note noteB, note2 - mus_jump 0, branch_A01A - ; A07E - ;No end byte until indigo plateu channel 1 - -Routes3_md_3: ;A07F - A130 - ; A07F - mus_mod 4, 1, 0 - db $D6 - mus_note noteC#, note8_16 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteA#, note8 - mus_note noteB, note2 - mus_note noteA, note2 - mus_note noteG, note8 - mus_note noteRst, note8 - mus_note noteG, note4_8_16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG, note8 - mus_note noteRst, note8 - mus_note noteG, note8 - mus_note noteRst, note8 - mus_note noteG, note2 - mus_note noteG, note8 - mus_note noteRst, note8 - mus_note noteG, note4_8_16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG, note8 - mus_note noteRst, note8 - mus_note noteG, note8 - mus_note noteRst, note8 - mus_note noteG, note2 - -branch_A0A3: - mus_vel 1, 2 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note4 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note4 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note4 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note4 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note4 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note4 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note8 - mus_note noteF, note8 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note4 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note4 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note4 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note4 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note4 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note4 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA#, note8 - mus_note noteA, note8 - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC, note4 - - mus_octave oct3 - mus_note noteG, note16 - mus_note noteG, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC, note4 - - mus_octave oct3 - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteG, note16 - mus_note noteG, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteF, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC, note4 - - mus_octave oct3 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC, note4 - - mus_octave oct3 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA, note4 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteF, note16 - mus_note noteRst, note16 - mus_note noteA, note4 - mus_jump 0, branch_A0A3 - ; A130 - ;No end byte until indigo plateu channel 1 - -Routes3_md_4: ;A131 -A269 - ; A131 - db $D6 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - -branch_A17A: - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2_8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2_8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2_8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note2_4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_jump 0, branch_A17A - ; A269 - ;No end byte until indigo plateu channel 1 - -;Routes 11, 12, 13, 14, 15 -Routes4_md_1: ;a26a - a303 - ; A26A - mus_tempo 0, 148 - mus_volume 119 - mus_duty duty75 - mus_mod 10, 3, 4 - db $E8 - mus_vel 10, 2 - - mus_octave oct1 - mus_note noteG#, note4 - mus_note noteG#, note4 - mus_note noteG#, note4 - mus_vel 7, 15 - mus_note noteG#, note4 - mus_vel 10, 2 - mus_note noteG#, note4 - mus_note noteG#, note4 - mus_note noteG#, note4 - mus_vel 11, 7 - mus_note noteB, note16 - - mus_octave oct2 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteB, note16 - -branch_A28A: - mus_vel 11, 7 - mus_note noteB, note4_8 - mus_note noteE, note8 - mus_note noteE, note4 - - mus_octave oct3 - mus_note noteE, note4 - mus_note noteD, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note4 - mus_vel 11, 1 - mus_note noteG#, note8_16 - mus_vel 11, 7 - mus_note noteE, note16 - mus_note noteF#, note2_4 - mus_note noteE, note2 - mus_note noteD#, note4 - mus_note noteF#, note4 - mus_note noteB, note4_8 - mus_note noteE, note8 - mus_note noteE, note4 - - mus_octave oct3 - mus_note noteE, note4 - mus_note noteD, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC#, note4 - mus_vel 11, 1 - mus_note noteE, note8_16 - mus_vel 11, 7 - mus_note noteD#, note16 - mus_note noteE, note2_4 - - mus_octave oct2 - mus_note noteB, note8_16 - mus_note noteA, note16 - mus_note noteG#, note2 - - mus_octave oct3 - mus_note noteE, note4 - - mus_octave oct2 - mus_note noteD, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteD, note8 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteD#, note8 - mus_note noteE, note8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteB, note8 - db $D8 - mus_note noteB, note4_8 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteF#, note4 - - mus_octave oct3 - mus_note noteE, note4 - mus_note noteD#, note4 - mus_note noteC#, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC#, note4 - mus_note noteD#, note4 - - mus_octave oct2 - mus_note noteE, note8_16 - mus_note noteF#, note8_16 - mus_note noteG#, note8_16 - mus_note noteA, note8_16 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC#, note4 - mus_note noteD#, note4 - mus_note noteE, note8_16 - - mus_octave oct2 - mus_note noteB, note8_16 - mus_note noteG#, note8_16 - mus_note noteF#, note8_16 - mus_note noteE, note8_16 - mus_note noteF#, note8_16 - mus_note noteG#, note8_16 - mus_note noteA, note8_16 - mus_jump 0, branch_A28A - ; A303 - ;No end byte until indigo plateu channel 1 - -Routes4_md_2: ;a304 - a3c3 - ; a304 - mus_mod 12, 2, 4 - mus_duty duty25 - mus_vel 9, 2 - - mus_octave oct2 - mus_note noteE, note8_16 - mus_note noteF#, note16 - mus_vel 9, 0 - mus_note noteE, note2_4 - mus_vel 9, 2 - - mus_octave oct1 - mus_note noteB, note8_16 - - mus_octave oct2 - mus_note noteC, note16 - mus_vel 9, 0 - - mus_octave oct1 - mus_note noteB, note2 - mus_duty duty75 - mus_vel 12, 7 - - mus_octave oct2 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteD#, note16 - -branch_A325: - mus_vel 12, 7 - mus_note noteE, note4_8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteF#, note4 - mus_note noteF#, note16 - mus_note noteA, note16 - mus_note noteG#, note16 - mus_note noteF#, note16 - mus_vel 12, 2 - mus_note noteG#, note8_16 - mus_note noteE, note16 - mus_vel 10, 0 - - mus_octave oct2 - mus_note noteB, note2_4 - mus_duty duty12_5 - mus_vel 12, 2 - - mus_octave oct1 - mus_note noteB, note8_16 - mus_vel 12, 7 - - mus_octave oct2 - mus_note noteC, note16 - - mus_octave oct1 - mus_note noteB, note2 - - mus_octave oct2 - mus_note noteD#, note4 - mus_duty duty75 - - mus_octave oct3 - mus_note noteE, note4_8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteF#, note4 - mus_note noteA, note16 - - mus_octave oct4 - mus_note noteC#, note16 - - mus_octave oct3 - mus_note noteB, note16 - mus_note noteA, note16 - mus_vel 12, 2 - mus_note noteB, note8_16 - mus_vel 12, 7 - mus_note noteA, note16 - mus_vel 11, 0 - mus_note noteG#, note4_8 - mus_vel 9, 0 - mus_note noteG#, note4_8 - mus_vel 7, 0 - mus_note noteG#, note4_8 - mus_vel 6, 15 - mus_note noteG#, note4_8 - mus_vel 12, 7 - mus_note noteG#, note4 - db $D8 - mus_note noteRst, note4 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteF#, note4 - db $D8 - mus_note noteA, note16 - mus_note noteF#, note4_8 - db $D8 - mus_note noteG, note1 - mus_note noteF#, note4_8 - mus_duty duty12_5 - db $D8 - mus_note noteA, note16 - - mus_octave oct2 - mus_note noteF#, note4 - mus_note noteE, note4 - mus_note noteF#, note4 - mus_note noteA, note4_8 - mus_duty duty75 - db $D8 - mus_note noteRst, note2 - - mus_octave oct3 - mus_note noteF#, note4_8 - mus_note noteG#, note4 - mus_note noteF#, note4 - db $D8 - mus_note noteRst, note4_16 - mus_note noteE, note4 - db $D8 - mus_note noteA#, note16 - mus_note noteE, note2_4 - mus_duty duty12_5 - db $D8 - mus_note noteA, note16 - - mus_octave oct2 - mus_note noteE, note4 - mus_note noteD#, note4 - mus_note noteE, note4 - mus_note noteG#, note4_8 - mus_duty duty75 - db $D8 - mus_note noteRst, note2 - - mus_octave oct3 - mus_note noteE, note4_8 - mus_note noteF#, note4 - mus_note noteD#, note4 - - mus_octave oct2 - mus_note noteB, note4 - db $D8 - mus_note noteA#, note16 - - mus_octave oct3 - mus_note noteB, note1 - db $D8 - mus_note noteA#, note2 - mus_note noteB, note2 - db $D8 - mus_note noteB, note16 - mus_note noteA, note4_8 - db $D8 - mus_note noteB, note2 - mus_note noteA, note4_8 - mus_vel 10, 7 - mus_note noteG#, note16 - mus_note noteF#, note16 - mus_vel 11, 0 - mus_note noteE, note2_4 - mus_vel 10, 0 - mus_note noteE, note2 - mus_vel 10, 7 - mus_note noteE, note2_8 - mus_jump 0, branch_A325 - ; A3C3 - ;No end byte until indigo plateu channel 1 - -Routes4_md_3: ;a3c4 - a49c -; A3C4 - mus_vel 1, 0 - - mus_octave oct3 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteD#, note16 - mus_note noteRst, note8_16 - -branch_A3D7: - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note8_16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note8_16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteD, note16 - mus_note noteRst, note8_16 - mus_note noteD, note16 - mus_note noteD, note16 - mus_note noteD, note16 - mus_note noteD, note16 - mus_note noteD, note16 - mus_note noteRst, note16 - mus_note noteD, note16 - mus_note noteRst, note8_16 - mus_note noteD, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note8_16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note8_16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note8_16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_jump 0, branch_A3D7 - ; A49C - ;No end byte until indigo plateu channel 1 - -Routes4_md_4: ;a49d - a5ef - ; A49D - mus_vel 12, 15 - mus_note noteRst, note2_4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - -branch_A4A8: - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_jump 0, branch_A4A8 - ; A5EF - ;No end byte until indigo plateu channel 1 - -;Indigo Plateau -IndigoPlateau_md_1: ;a5f0 - a663 - mus_tempo 0, 132 - mus_volume 119 - mus_duty duty75 - mus_mod 6, 3, 4 - db $E8 - mus_vel 11, 2 - - mus_octave oct1 - mus_note noteA, note2 - mus_note noteA, note2 - mus_note noteA, note2 - mus_note noteA, note4 - mus_vel 10, 4 - mus_note noteA#, note4 - -branch_a605: - mus_call branch_a659 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteD, note4 - mus_call branch_a659 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteD#, note4 - mus_call branch_a659 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteD, note4 - mus_call branch_a659 - mus_vel 10, 0 - - mus_octave oct1 - mus_note noteA#, note4 - mus_call branch_a659 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteD, note4 - mus_vel 13, 4 - - mus_octave oct2 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteD#, note4 - mus_vel 13, 4 - - mus_octave oct2 - mus_note noteA#, note4 - mus_note noteA#, note4 - mus_note noteA#, note4 - mus_note noteA#, note4 - mus_note noteA#, note4 - mus_note noteA#, note4 - mus_note noteA#, note4 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteF, note8 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteG, note8 - mus_vel 11, 0 - mus_note noteA, note2 - - mus_octave oct1 - mus_note noteA, note2 - mus_vel 11, 7 - - mus_octave oct2 - mus_note noteF, note2 - mus_vel 4, 14 - - mus_octave oct1 - mus_note noteA#, note2 - mus_jump 0, branch_a605 - -branch_a659: - mus_vel 11, 2 - - mus_octave oct1 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_note noteA, note4 - mus_end - ; A663 - -IndigoPlateau_md_2: ;a664 - a6b9 -; A664 - mus_duty duty75 - mus_mod 8, 2, 5 - mus_vel 12, 2 - - mus_octave oct2 - mus_note noteD, note2 - mus_note noteD, note2 - mus_note noteD, note2 - mus_note noteD, note4 - mus_vel 5, 10 - mus_note noteD#, note4 - -branch_a673: - mus_call branch_a6af - mus_vel 12, 5 - mus_note noteA, note4 - mus_call branch_a6af - mus_vel 12, 5 - mus_note noteA#, note4 - mus_call branch_a6af - mus_vel 12, 5 - mus_note noteA, note4 - mus_call branch_a6af - mus_vel 12, 7 - mus_note noteC#, note4 - mus_call branch_a6af - mus_vel 12, 5 - mus_note noteA, note4 - mus_call branch_a6af - mus_vel 12, 5 - mus_note noteA#, note4 - mus_call branch_a6af - mus_vel 12, 5 - - mus_octave oct3 - mus_note noteC, note8 - mus_vel 12, 7 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteD, note2 - - mus_octave oct2 - mus_note noteD, note2 - - mus_octave oct3 - mus_note noteC, note2 - mus_vel 4, 13 - - mus_octave oct3 - mus_note noteD#, note2 - mus_jump 0, branch_a673 - -branch_a6af: - mus_vel 12, 2 - - mus_octave oct2 - mus_note noteD, note4 - mus_note noteD, note4 - mus_note noteD, note4 - mus_note noteD, note4 - mus_note noteD, note4 - mus_note noteD, note4 - mus_note noteD, note4 - mus_end - ; A6B9 - -IndigoPlateau_md_3: ;a6ba - a70e - ; A6BA - mus_vel 1, 0 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteRst, note4_8 - mus_note noteD, note8 - mus_note noteRst, note4_8 - mus_note noteD, note8 - mus_note noteRst, note4_8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD#, note4 - -branch_a6c6: - mus_call branch_a6fe - mus_call branch_a6fe - mus_call branch_a6fe - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteF#, note4 - mus_call branch_a6fe - mus_call branch_a6fe - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteA#, note16 - mus_note noteRst, note16 - mus_note noteA#, note16 - mus_note noteRst, note16 - mus_note noteA, note2 - mus_note noteD, note2 - mus_note noteA#, note2 - mus_note noteD#, note2 - mus_jump 0, branch_a6c6 - - -branch_a6fe: - mus_octave oct3 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteD, note8 - mus_note noteRst, note8 - mus_note noteA, note4 - mus_end - ; A70E - -IndigoPlateau_md_4: ;a70f - a7c4 - ; A70F - -;piece 1 - db $D6 - mus_note noteB, note1 - mus_note noteC#, note8 - mus_note noteB, note1 - mus_note noteC#, note8 - mus_note noteB, note1 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - -branch_a728: - mus_call branch_a791 - mus_call branch_a77e - mus_call branch_a791 - mus_call branch_a7a8 - mus_call branch_a791 - mus_call branch_a77e - mus_call branch_a791 - mus_call branch_a7a8 - mus_call branch_a791 - mus_call branch_a77e - mus_call branch_a791 - mus_call branch_a7a8 - mus_call branch_a77e - mus_call branch_a7a8 - mus_note noteB, note1 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8 - mus_note noteB, note2 - mus_note noteC#, note8_16 - mus_note noteB, note1 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8 - mus_jump 0, branch_a728 - -branch_a77e: - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note4 - mus_note noteB, note8 - mus_note noteC#, note4 - mus_note noteB, note8 - mus_note noteC#, note8_16 - mus_end - ; A790 - -;piece 2 -branch_a791: - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_end - ; A7A7 - -;piece 3 -branch_a7a8: - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8_16 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_end - ; A7C4 - -;Pallet Town -PalletTown_md_1: ; a7c5 - a85e (154 bytes) - ; A7C5 - mus_tempo 0, 160 - mus_volume 119 - mus_duty duty50 - mus_vel 12, 3 - -branch_a7ce: - mus_octave oct2 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteD, note4 - mus_note noteG, note8 - mus_note noteD, note8 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteD, note4 - mus_note noteD, note8 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note2 - mus_note noteRst, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteB, note4 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteD, note4 - mus_note noteG, note8 - mus_note noteD, note8 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteD, note4 - mus_note noteD, note8 - mus_note noteG, note8 - mus_note noteF#, note8 - mus_note noteE, note4 - mus_note noteD, note8 - mus_note noteC, note4 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteD, note8 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG, note4 - mus_note noteF#, note4 - - mus_octave oct3 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteG, note8 - mus_note noteE, note8 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_vel 11, 3 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteD, note8 - mus_note noteG, note8 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteD, note8 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteG, note8 - mus_note noteE, note8 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteD, note8 - mus_note noteG, note8 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteD, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteC, note8 - mus_note noteE, note8 - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteC, note8 - mus_note noteE, note8 - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteC, note8 - mus_note noteE, note8 - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteC, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteD, note8 - mus_note noteC, note8 - mus_note noteD, note8 - mus_note noteG, note8 - mus_note noteE, note8 - mus_note noteC, note8 - mus_note noteE, note8 - mus_note noteG, note8 - mus_note noteE, note8 - mus_note noteC, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteD, note8 - mus_note noteC, note8 - mus_note noteD, note8 - mus_jump 0, branch_a7ce - mus_end - ; A85E - -PalletTown_md_2: ; a85f - a8dd (127 bytes) - ; A85F - mus_duty duty50 - -branch_a861: - mus_vel 13, 3 - - mus_octave oct4 - mus_note noteD, note8 - mus_vel 10, 3 - mus_note noteC, note8 - mus_vel 13, 3 - - mus_octave oct3 - mus_note noteB, note8 - mus_vel 11, 3 - mus_note noteA, note8 - mus_vel 13, 3 - - mus_octave oct4 - mus_note noteG, note8 - mus_vel 11, 3 - mus_note noteE, note8 - mus_vel 13, 3 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD, note4_8 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteG, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC, note2_8 - - mus_octave oct3 - mus_note noteF#, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteB, note4_8 - - mus_octave oct4 - mus_note noteC, note16 - - mus_octave oct3 - mus_note noteB, note16 - mus_note noteA, note2 - - mus_octave oct4 - mus_note noteD, note8 - mus_vel 10, 3 - mus_note noteC, note8 - mus_vel 13, 3 - - mus_octave oct3 - mus_note noteB, note8 - mus_vel 11, 3 - - mus_octave oct4 - mus_note noteD, note8 - mus_vel 13, 3 - mus_note noteG, note8 - mus_vel 10, 3 - mus_note noteF#, note8 - mus_vel 11, 3 - mus_note noteF#, note8 - mus_vel 13, 3 - mus_note noteG, note8 - mus_note noteE, note4_8 - mus_note noteD, note8 - mus_note noteD, note2 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG, note8 - - mus_octave oct4 - mus_note noteD, note8 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG, note2_8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC, note2 - mus_note noteD, note4_8 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteB, note2 - mus_note noteRst, note8 - mus_note noteG, note8 - mus_note noteA, note8 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC, note4 - mus_note noteC, note4 - mus_note noteD, note4_8 - mus_note noteC, note16 - mus_note noteD, note16 - - mus_octave oct3 - mus_note noteB, note2 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG, note8 - mus_note noteA, note2 - mus_note noteE, note4 - mus_note noteB, note4 - mus_note noteA, note2 - mus_note noteG, note4 - mus_note noteE, note4 - mus_note noteF#, note2 - mus_note noteG, note4 - mus_note noteB, note4 - mus_note noteB, note2 - mus_note noteA, note2 - mus_jump 0, branch_a861 - mus_end - ; A8DD - -PalletTown_md_3: ; a8de - aa75 (408 bytes) -;INCBIN "baserom.gbc",$a8de,$aa76 - $a8de - - ; A8DE - mus_mod 24, 2, 8 - mus_vel 1, 2 - -branch_a8e3: - mus_octave oct3 - mus_note noteG, note4_8 - mus_note noteE, note4_8 - mus_note noteF#, note4 - mus_note noteG, note4_8 - mus_note noteA, note4_8 - mus_note noteG, note4 - mus_note noteE, note4_8 - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteG, note4_8 - mus_note noteE, note4_8 - mus_note noteD, note4 - mus_note noteG, note4_8 - mus_note noteE, note4_8 - mus_note noteF#, note4 - mus_note noteG, note4_8 - mus_note noteA, note4_8 - mus_note noteG, note4 - mus_note noteE, note4_8 - mus_note noteF#, note4_8 - mus_note noteA, note4 - mus_note noteG, note4_8 - mus_note noteE, note4_8 - mus_note noteD, note4 - mus_note noteC, note2 - mus_note noteD, note2 - mus_note noteG, note2 - mus_note noteE, note4 - mus_note noteD, note4 - mus_note noteC, note2 - mus_note noteD, note2 - mus_note noteG, note2 - mus_note noteA, note4 - mus_note noteG, note4 - mus_note noteE, note2 - mus_note noteA, note2 - mus_note noteE, note2 - mus_note noteG, note2 - mus_note noteF#, note2 - mus_note noteE, note2 - mus_note noteE, note2 - mus_note noteF#, note2 - mus_jump 0, branch_a8e3 - mus_end - ; A912 - - mus_tempo 0, 144 - mus_volume 119 - mus_mod 5, 1, 6 - -branch_a91b: - mus_vel 1, 0 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note16 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note4 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_note noteD#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note16 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - - mus_octave oct5 - mus_note noteD#, note16 - mus_note noteRst, note2 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteC#, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteC#, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteD#, note4 - mus_note noteC#, note4 - mus_note noteD#, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note8 - mus_note noteRst, note16 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note16 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note2 - mus_note noteD#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note16 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - - mus_octave oct5 - mus_note noteD#, note16 - mus_note noteRst, note4 - - mus_octave oct4 - mus_note noteB, note8 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteC#, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteRst, note8 - mus_note noteF#, note4 - mus_note noteE, note4 - mus_note noteF#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteD#, note8 - mus_note noteRst, note8_16 - - mus_octave oct4 - mus_note noteA, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteC#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note2 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - mus_note noteRst, note8 - - mus_octave oct4 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteD#, note8 - mus_note noteE, note2 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - mus_note noteD#, note8 - - mus_octave oct4 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteA#, note16 - mus_note noteB, note16 - mus_note noteRst, note4 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteB, note8 - mus_note noteA#, note8 - mus_note noteB, note8 - - mus_octave oct5 - mus_note noteC, note16 - mus_note noteC#, note16 - mus_note noteRst, note2 - - mus_octave oct4 - mus_note noteF#, note8 - mus_note noteF, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - - mus_octave oct5 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct4 - mus_note noteB, note8 - mus_note noteRst, note4_8 - mus_note noteB, note8 - mus_note noteRst, note4_8 - mus_jump 0, branch_a91b - mus_end - ; A9CE - - ; A9CF - mus_tempo 0, 144 - mus_volume 119 - db $E8 - mus_mod 6, 1, 5 - -branch_a9d8: - mus_vel 1, 0 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteG#, note16 - mus_note noteRst, note2 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteF#, note16 - mus_note noteRst, note4 - - mus_octave oct4 - mus_note noteB, note8 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteRst, note8 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteRst, note8 - mus_note noteF#, note4 - mus_note noteE, note4 - mus_note noteF#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteD#, note8 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteG#, note16 - mus_note noteRst, note4 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteF#, note16 - mus_note noteRst, note2 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteRst, note8 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_note noteD#, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteRst, note8 - mus_note noteF#, note4 - mus_note noteE, note4 - mus_note noteF#, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note8 - mus_note noteRst, note16 - mus_note noteC#, note8 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteRst, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteD#, note2 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct4 - mus_note noteB, note8 - mus_note noteRst, note8 - - mus_octave oct5 - mus_note noteC#, note8 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteRst, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteC#, note2 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct4 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteG#, note16 - mus_note noteF#, note16 - mus_note noteRst, note2 - mus_note noteB, note8 - mus_note noteA#, note8 - mus_note noteB, note8 - mus_note noteA, note16 - mus_note noteG#, note16 - mus_note noteRst, note4 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteF#, note8 - mus_note noteF, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteC#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteRst, note4_8 - mus_note noteD#, note8 - mus_note noteRst, note4_8 - mus_jump 0, branch_a9d8 - mus_end - ; AA6E - - ; AA6F - mus_tempo 0, 232 - mus_jump 0, branch_aa79 - ; AA75 - -;Viridian City, Pewter City, Saffron City -Cities1_md_1: ;AA76 - AB91 - ; AA76 - mus_tempo 0, 144 - -branch_aa79: - mus_volume 119 - mus_mod 8, 2, 4 - mus_duty duty75 -branch_aa80: - mus_vel 12, 5 - - mus_octave oct2 - mus_note noteG#, note4 - mus_note noteF#, note4 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note4 - mus_note noteD#, note4 - mus_note noteE, note8 - mus_note noteD#, note4 - mus_note noteC#, note8 - mus_note noteE, note8 - mus_note noteE, note4 - mus_vel 10, 5 - mus_note noteC#, note4 - - mus_octave oct1 - mus_note noteB, note4_8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteC#, note4 - - mus_octave oct1 - mus_note noteB, note4 - mus_vel 12, 5 - mus_call branch_ab7d - - mus_octave oct2 - mus_note noteD#, note4_8 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note4 - mus_vel 10, 5 - - mus_octave oct2 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteB, note8 - mus_note noteA, note4 - mus_note noteB, note4 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_vel 12, 5 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteE, note4 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteE, note4 - mus_note noteD#, note8 - mus_note noteC#, note4 - mus_note noteD#, note4 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - mus_note noteC#, note8 - mus_note noteE, note8 - mus_note noteE, note4 - mus_vel 10, 5 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteA, note8 - mus_note noteB, note4_8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteB, note8 - mus_note noteB, note4 - mus_vel 12, 5 - mus_call branch_ab7d - - mus_octave oct2 - mus_note noteD#, note4 - mus_note noteD#, note8 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteG#, note8 - mus_note noteE, note4 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - mus_vel 10, 5 - mus_note noteC#, note4 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteD#, note4 - mus_note noteC#, note8 - mus_note noteE, note4 - mus_vel 11, 3 - mus_call branch_ab8a - mus_note noteA, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note4 - mus_note noteF#, note4 - mus_note noteG#, note8 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note4 - mus_note noteG#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 -branch_ab12: - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct1 - mus_note noteB, note4 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_jump 2, branch_ab12 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note4 - - mus_octave oct2 - mus_note noteE, note4 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteG#, note8 - mus_note noteG#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteF#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteD#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_call branch_ab8a - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteA, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteC#, note8 - mus_note noteG#, note8 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteE, note4 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteD#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteD#, note8 - mus_note noteF#, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteE, note8 - - mus_octave oct1 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteD#, note8 - - mus_octave oct1 - mus_note noteB, note8 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteD#, note8 - mus_vel 11, 6 - mus_note noteF#, note2 - mus_note noteF#, note4 - mus_note noteD#, note4 - mus_note noteE, note2 - mus_vel 8, 4 - - mus_octave oct1 - mus_note noteB, note4 - - mus_octave oct2 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_jump 0, branch_aa80 - -branch_ab7d: - mus_octave oct2 - mus_note noteF#, note8 - mus_note noteD#, note4 - mus_note noteE, note8 - mus_note noteD#, note4 - mus_note noteC#, note4 - - mus_octave oct1 - mus_note noteB, note4 - - mus_octave oct2 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - mus_end - ; AB89 - - ; AB8A -branch_ab8a: - mus_note noteA, note8 - mus_note noteE, note8 - mus_note noteC#, note8 - mus_note noteE, note4 - mus_note noteA, note8 - mus_note noteC#, note8 - mus_note noteE, note8 - mus_end - ; AB91 - -Cities1_md_2: ;AB92 - AC02 - ; AB92 - mus_mod 5, 1, 5 - mus_call branch_ac00 - - mus_octave oct3 - mus_note noteG#, note8 - mus_vel 12, 4 - mus_note noteE, note4_8 - mus_vel 12, 5 - mus_duty duty75 - - mus_octave oct2 - mus_note noteC#, note4 - mus_note noteD#, note4 - mus_note noteE, note4_8 - mus_note noteF#, note4_8 - mus_note noteG#, note4 - mus_call branch_ac00 - - mus_octave oct3 - mus_note noteG#, note8 - mus_vel 12, 4 - mus_note noteE, note2_4_8 - mus_duty duty75 - - mus_octave oct2 - mus_note noteE, note4_8 - mus_note noteF#, note4_8 - mus_note noteG#, note4 - mus_vel 11, 7 - mus_duty duty50 - mus_mod 8, 1, 7 - - mus_octave oct4 - mus_note noteC#, note2_4 - - mus_octave oct3 - mus_note noteA, note4 - - mus_octave oct4 - mus_note noteE, note2 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - mus_note noteC#, note8 - - mus_octave oct3 - mus_note noteB, note2_4 - mus_note noteG#, note4 - mus_note noteB, note1 - mus_note noteF#, note2_4 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteF#, note4 - mus_note noteG#, note2_4 - mus_note noteE, note4 - mus_note noteB, note1 - - mus_octave oct4 - mus_note noteC#, note2_4 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note4 - mus_note noteE, note4 - mus_note noteD#, note4 - mus_note noteC#, note4 - - mus_octave oct3 - mus_note noteB, note2_4 - - mus_octave oct4 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteC#, note4 - - mus_octave oct3 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteA, note2_4 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC, note8 - mus_note noteC, note4 - - mus_octave oct3 - mus_note noteB, note4 - mus_note noteA, note4 - mus_note noteF#, note4 - mus_vel 11, 7 - mus_note noteA, note2 - - mus_octave oct4 - mus_note noteC, note2 - - mus_octave oct3 - mus_note noteB, note2_4_8 - mus_vel 8, 4 - mus_note noteG#, note16 - mus_vel 10, 4 - mus_note noteA, note16 - mus_jump 0, Cities1_md_2 - -branch_ac00: - mus_duty duty50 - mus_vel 12, 3 - - mus_octave oct3 - mus_note noteB, note4 - mus_note noteA, note4 - mus_vel 12, 4 - mus_note noteG#, note2_8 - mus_vel 12, 3 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteB, note4 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_vel 12, 4 - mus_note noteF#, note2_8 - mus_vel 12, 5 - mus_duty duty75 - - mus_octave oct2 - mus_note noteE, note4 - mus_note noteD#, note2 - mus_note noteE, note4 - mus_note noteF#, note4 - mus_vel 12, 3 - mus_duty duty50 - - mus_octave oct3 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_vel 12, 4 - mus_note noteF#, note2_8 - mus_vel 12, 3 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note4 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_end - ; AC31 - -Cities1_md_3: ;AC32 - ACEE --AC7F - ; AC32 - mus_vel 1, 1 - db $E8 - -branch_ac35: - mus_mod 0, 0, 0 - - mus_octave oct3 - mus_call branch_acc5 - mus_call branch_acc5 - mus_call branch_acce - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_call branch_acc5 - mus_note noteB, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_call branch_acc5 - mus_call branch_acce - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteB, note8 - mus_note noteE, note8 - mus_mod 8, 2, 5 - mus_note noteA, note2 - mus_note noteE, note2 - mus_note noteA, note2 - mus_note noteF#, note2 - mus_note noteG#, note2 - mus_note noteE, note2 - mus_note noteG#, note2_4 - mus_note noteE, note4 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteE, note4 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteF#, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteA, note2 - mus_note noteE, note2 - mus_note noteA, note2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteG#, note2 - mus_note noteE, note2 - mus_note noteB, note4 - mus_note noteE, note4 - mus_note noteF#, note4 - mus_note noteG#, note4 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteF#, note8 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteA, note4 - mus_note noteG#, note4 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note16 - mus_note noteG#, note16 - mus_note noteE, note16 - mus_note noteF#, note16 - mus_note noteG#, note4 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_jump 0, branch_ac35 - -branch_acc5: - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteRst, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_end - ; ACCD - - ; ACCE -branch_acce: - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteD#, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteRst, note8 - mus_note noteD#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_end - ; ACEE - -Cities1_md_4: ;ACEF - ADAD - ; ACEF - mus_vel 15, 13 - mus_note noteD#, note4_8_16 - mus_note noteF#, note2_4_8 - -branch_acf3: - mus_call branch_ad36 - mus_call branch_ad45 - mus_call branch_ad45 - mus_jump 2, branch_acf3 - mus_call branch_ad36 - mus_call branch_ad5f - mus_call branch_ad52 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4 - mus_note noteC, note2 - mus_call branch_ad6e - mus_call branch_ad5f - mus_call branch_ad52 - mus_call branch_ad6e - mus_call branch_ad52 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note8 - mus_note noteC, note2 - mus_note noteB, note8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4 - mus_note noteC, note2_16 - mus_jump 0, Cities1_md_4 - -branch_ad36: - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4 - mus_note noteC, note2_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note8 - mus_note noteC, note2_16 - mus_note noteB, note8 - mus_note noteC, note2_16 - mus_end - ; AD44 - - ; AD45 -branch_ad45: - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4 - mus_note noteC, note2_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4_8 - mus_note noteC, note2_16 - mus_note noteB, note4 - mus_note noteC, note2_16 - mus_end - ; AD51 - - ; AD52 -branch_ad52: - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4 - mus_note noteC, note2 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4 - mus_note noteC, note2 - mus_end - ; AD5E - - ; AD5F -branch_ad5f: - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4 - mus_note noteC, note2 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note8 - mus_note noteC, note2 - mus_note noteB, note8 - mus_note noteC, note4_8_16 - mus_end - ; AD6D - - ; AD6E -branch_ad6e: - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note4_8 - mus_note noteC, note4_8_16 - mus_note noteB, note8 - mus_note noteC, note2 - mus_note noteB, note8 - mus_note noteC, note2 - mus_end - ; AD76 - - ; AD77 -branch_ad77: - db $F8 - mus_tempo 1, 0 - mus_volume 119 - mus_mod 6, 2, 6 - mus_duty duty50 - db $E8 - db $D4 - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteG#, note8 - mus_note noteG#, note8 - mus_note noteG#, note8 - mus_vel 11, 3 - - mus_octave oct3 - mus_note noteE, note4 - mus_end - ; AD8D - - ; AD8E -branch_ad8e: - db $F8 - mus_mod 8, 2, 7 - mus_duty duty50 - db $D4 - mus_note noteRst, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteE, note8 - mus_note noteE, note8 - mus_vel 12, 3 - mus_note noteB, note4 - mus_end - ; AD9D - - ; AD9E -branch_ad9e: - db $F8 - db $D4 - mus_note noteC#, note16 - - mus_octave oct3 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_vel 1, 0 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteRst, note8 - mus_end - ; ADAD - -;Guy walks you to museum -MuseumGuy_md_1: ;ADAE - ADF0 - ; ADAE - mus_tempo 0, 128 - mus_volume 119 - mus_duty duty50 - db $E8 - mus_vel 11, 1 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD#, note8 - - mus_octave oct1 - mus_note noteB, note4 - mus_note noteB, note16 - - mus_octave oct2 - mus_note noteD#, note16 - mus_note noteE, note16 - mus_note noteG#, note16 - mus_note noteB, note2_8 - mus_call branch_ade7 - mus_call branch_adec - mus_call branch_ade7 - mus_note noteE, note4 - mus_note noteE, note4 - mus_note noteE, note8 - mus_note noteE, note4_8 - -branch_add6: - mus_call branch_ade7 - mus_call branch_adec - mus_call branch_ade7 - mus_note noteE, note4 - mus_note noteE, note4 - mus_note noteE, note8 - mus_note noteE, note4_8 - mus_jump 0, branch_add6 - -branch_ade7: - mus_note noteE, note8 - mus_note noteE, note4_8 - mus_note noteF#, note8 - mus_note noteF#, note4_8 - mus_end - ; ADEB - - ; ADEC -branch_adec: - mus_note noteE, note8 - mus_note noteE, note4_8 - mus_note noteD, note8 - mus_note noteD, note4_8 - mus_end - ; ADF0 - -MuseumGuy_md_2: ;ADF1 - AE6D - ; ADF1 - mus_duty duty50 - mus_vel 12, 1 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteC#, note8 - mus_note noteD, note8 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteE, note4 - mus_note noteE, note16 - mus_note noteG#, note16 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteD#, note16 - mus_note noteE, note2 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteE, note4 - mus_note noteD, note8 - mus_note noteF#, note8 - mus_note noteA, note4 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteE, note4 - mus_note noteD, note8 - mus_note noteC#, note8 - - mus_octave oct2 - mus_note noteB, note4 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteE, note4 - mus_note noteD, note8 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteE, note8 - mus_note noteF#, note8 - mus_note noteG#, note8 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteA, note4 - -branch_ae26: - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteE, note8_16 - mus_vel 8, 1 - mus_note noteE, note16 - mus_vel 12, 1 - mus_note noteD, note8 - mus_note noteF#, note8 - mus_note noteA, note8_16 - mus_vel 9, 1 - mus_note noteA, note16 - mus_vel 12, 1 - - mus_octave oct2 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteE, note4 - mus_note noteD, note16 - mus_note noteC#, note16 - mus_note noteC, note16 - - mus_octave oct2 - mus_note noteB, note16 - mus_note noteB, note8_16 - mus_vel 10, 1 - mus_note noteG#, note16 - mus_vel 12, 1 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteE, note8_16 - mus_vel 9, 1 - mus_note noteE, note16 - mus_vel 12, 1 - mus_note noteD, note8 - mus_note noteF#, note8 - mus_note noteA, note8_16 - mus_vel 8, 1 - mus_note noteA, note16 - mus_vel 12, 1 - mus_note noteG#, note8 - mus_note noteE, note16 - mus_vel 8, 1 - mus_note noteE, note16 - mus_vel 12, 1 - mus_note noteF#, note8 - mus_vel 8, 1 - mus_note noteF#, note16 - mus_vel 12, 1 - mus_note noteG#, note16 - mus_note noteA, note8 - mus_note noteA, note8 - mus_note noteA, note4 - mus_jump 0, branch_ae26 - ; AE6D - -MuseumGuy_md_3: ;AE6E - AED0 - ; AE6E - mus_vel 1, 0 - mus_note noteRst, note1 - - mus_octave oct3 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note8_16 - mus_note noteE, note16 - mus_note noteRst, note2_16 - mus_call branch_aeb8 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note4_16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note4_16 - mus_call branch_aeb8 - mus_note noteB, note16 - mus_note noteRst, note8_16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note8_16 - -branch_ae8e: - mus_call branch_aec1 - mus_note noteRst, note8_16 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note8_16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_call branch_aec1 - mus_note noteRst, note16 - - mus_octave oct5 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteD, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note8_16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note8_16 - mus_jump 0, branch_ae8e - -branch_aeb8: - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note4_16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note4_16 - mus_end - ; AEC0 - - ; AEC1 -branch_aec1: - mus_octave oct5 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note8_16 - - mus_octave oct5 - mus_note noteF#, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_end - ; AED0 - -MuseumGuy_md_4: ;AED1 - AF58 - ; AED1 - mus_vel 12, 15 - mus_note noteRst, note1 - mus_note noteRst, note1 - mus_note noteRst, note1 - mus_note noteRst, note1 - mus_note noteRst, note2_4_8 - db $D6 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - -branch_aee1: - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4_8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note4_8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4_8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4_8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note4_8 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note4 - mus_note noteC#, note8 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note4 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_note noteB, note16 - mus_note noteC#, note8_16 - mus_jump 0, branch_aee1 - ; AF58 - -;Meet Prof. Oak -MeetProfOak_md_1: ;AF59 - AFA8 - ; AF59 - mus_tempo 0, 112 - mus_volume 119 - mus_duty duty75 - db $E8 - mus_vel 11, 4 - - mus_octave oct2 - mus_note noteF#, note16 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteD#, note16 - mus_note noteE, note16 - mus_note noteF#, note2_4 - mus_vel 10, 2 - - mus_octave oct2 - mus_note noteE, note4_8 - mus_note noteB, note2_8 - mus_note noteE, note4_8 - mus_note noteB, note2_8 - mus_note noteE, note4_8 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteF#, note4 - mus_note noteE, note4_8 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteF#, note4 - mus_note noteE, note4_8 - mus_note noteB, note2_8 - mus_note noteE, note4_8 - mus_note noteB, note2_8 - mus_note noteE, note4_8 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteF#, note4 - mus_note noteE, note4_8 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteF#, note4 - -branch_af85: - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteA, note8 - mus_note noteA, note4 - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteA, note8 - mus_note noteA, note4 - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteG#, note8 - mus_note noteG#, note4 - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteG#, note8 - mus_note noteG#, note4 - mus_note noteE, note4_8 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteF#, note4 - mus_note noteE, note4_8 - mus_note noteD#, note4 - mus_note noteF#, note8 - mus_note noteF#, note4 - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteG#, note8 - mus_note noteG#, note4 - mus_note noteF#, note4_8 - mus_note noteE, note4 - mus_note noteG#, note8 - mus_note noteG#, note4 - mus_jump 0, branch_af85 - ; AFA8 - -MeetProfOak_md_2: ;AFA9 - B03D - ; AFA9 - mus_mod 8, 1, 1 - mus_duty duty50 - mus_vel 12, 4 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteD#, note16 - mus_note noteF#, note16 - mus_note noteA#, note16 - mus_note noteB, note2_4 - mus_vel 11, 2 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteE, note4 - mus_note noteD#, note8 - mus_note noteC#, note4 - mus_vel 6, 4 - - mus_octave oct3 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteE, note4 - mus_note noteD#, note8 - mus_note noteC#, note4 - mus_vel 11, 2 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note4 - mus_note noteB, note8 - mus_note noteB, note4 - mus_vel 8, 1 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note4 - mus_note noteB, note8 - mus_note noteB, note4 - mus_vel 11, 2 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteE, note4 - mus_note noteD#, note8 - mus_note noteC#, note4 - mus_vel 6, 4 - - mus_octave oct3 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC#, note8 - mus_note noteD#, note8 - mus_note noteE, note4 - mus_note noteD#, note8 - mus_note noteC#, note4 - mus_vel 11, 2 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note4 - mus_note noteB, note8 - mus_note noteB, note4 - mus_vel 8, 1 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteA, note8 - mus_note noteG#, note8 - mus_note noteA, note4 - mus_note noteB, note8 - mus_note noteB, note4 - mus_vel 11, 5 - -branch_b005: - mus_octave oct3 - mus_note noteC#, note4_8 - - mus_octave oct2 - mus_note noteA, note16 - - mus_octave oct3 - mus_note noteC#, note16 - mus_note noteE, note4_8 - mus_note noteC#, note16 - mus_note noteE, note16 - mus_note noteF#, note4 - mus_note noteE, note4 - mus_note noteD#, note4 - mus_note noteC#, note4 - - mus_octave oct2 - mus_note noteB, note4_8 - mus_note noteG#, note16 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteE, note2 - mus_vel 6, 5 - - mus_octave oct3 - mus_note noteB, note4_8 - mus_note noteG#, note16 - mus_note noteB, note16 - - mus_octave oct4 - mus_note noteE, note2 - mus_vel 11, 5 - - mus_octave oct2 - mus_note noteA, note4_8 - mus_note noteF#, note16 - mus_note noteA, note16 - - mus_octave oct3 - mus_note noteD#, note2 - mus_note noteE, note4 - mus_note noteD#, note4 - mus_note noteC#, note4 - mus_note noteC, note4 - - mus_octave oct2 - mus_note noteB, note4_8 - mus_note noteG#, note16 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteE, note4_8 - - mus_octave oct2 - mus_note noteB, note16 - - mus_octave oct3 - mus_note noteE, note16 - mus_vel 11, 7 - mus_note noteG#, note1 - mus_jump 0, branch_b005 - ; B03C - -MeetProfOak_md_3: ;B03D - B11F - ; B03D - mus_vel 1, 2 - mus_note noteRst, note2_8 - - mus_octave oct3 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteB, note16 - mus_note noteRst, note4_16 - - mus_octave oct4 - mus_note noteE, note4 - mus_note noteRst, note4_8 - - mus_octave oct3 - mus_note noteB, note16 - mus_note noteRst, note4_16 - - mus_octave oct4 - mus_note noteE, note4 - - mus_octave oct3 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteE, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteG, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - -branch_bobc: - mus_octave oct3 - mus_note noteA, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteA, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteA, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC#, note16 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteA, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteC#, note16 - mus_note noteRst, note16 - mus_jump 2, branch_bobc - -branch_b0d8: - mus_octave oct3 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_jump 2, branch_b0d8 - -branch_b0ed: - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_note noteF#, note16 - mus_note noteRst, note16 - mus_note noteA, note16 - mus_note noteRst, note16 - mus_jump 2, branch_b0ed - -branch_b101: - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_note noteG#, note16 - mus_note noteRst, note16 - mus_note noteB, note16 - mus_note noteRst, note16 - mus_jump 2, branch_b101 - mus_jump 0, branch_bobc - mus_tempo 0, 100 - mus_jump 0, $7123 - ; B11F - -;Meet Rival -MeetRival_md_1: ;B120 - B1BA -; B120 - mus_tempo 0, 112 - mus_volume 119 - mus_duty duty75 - mus_mod 6, 3, 4 - db $e8; B12A - mus_vel 11, 3 - - mus_octave oct3 - mus_note noteD, note16 - mus_note noteC#, note16 - mus_note noteC, note16; B130 - - mus_octave oct2 - mus_note noteB, note16 - mus_note noteA#, note8 - mus_note noteA, note16 - mus_note noteG#, note16; B135 - mus_note noteG, note16 - mus_note noteF#, note16 - mus_note noteF, note4_8 - mus_note noteD, note16 - mus_note noteRst, note8_16; B13A - - mus_note noteD, note16 - mus_note noteRst, note4_16 - - mus_note noteA, note8 - mus_note noteG, note8 - mus_note noteA, note8; B13F - -branch_b140: - mus_note noteB, note4 - mus_note noteA#, note8 - mus_note noteA, note4 - mus_note noteG, note8 - - mus_octave oct3; B144 - mus_note noteC, note4 - mus_note noteD, note8 - mus_note noteRst, note4 - - mus_note noteD, note4 - mus_note noteC#, note8; B149 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note4; B14E - mus_note noteE, note8 - mus_note noteD, note4 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteB, note4; B153 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteRst, note4 - - mus_note noteG, note4 - mus_note noteG, note8; B158 - mus_note noteF#, note8 - mus_note noteE, note8 - mus_note noteD, note8 - mus_note noteF#, note8 - - mus_octave oct2; B15D - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteF#, note8 - - mus_octave oct2; B162 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteD, note8 - - mus_octave oct2 - mus_note noteD, note8; B167 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteRst, note8 - - mus_octave oct2 - mus_note noteD, note8; B16C - - mus_octave oct3 - mus_note noteC, note4 - - mus_octave oct2 - mus_note noteB, note8 - mus_note noteA#, note8; B171 - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteF, note8 - - mus_octave oct2; B176 - mus_note noteG, note8 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteF, note8 - mus_note noteD#, note8; B17B - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteA#, note8 - mus_note noteG, note8 - mus_note noteRst, note4; B180 - - mus_note noteA#, note4 - - mus_octave oct3 - mus_note noteC, note8 - - mus_octave oct2 - mus_note noteA#, note8; B185 - - mus_octave oct3 - mus_note noteC, note8 - - mus_vel 11, 7 - - mus_octave oct2 - mus_note noteG, note4; B18B - mus_note noteD, note8 - mus_note noteF, note4_8 - mus_note noteF#, note4 - mus_note noteD, note8 - mus_note noteRst, note4; B190 - - mus_note noteD, note4 - - mus_vel 11, 3 - mus_note noteA, note8 - mus_note noteG, note8 - mus_note noteA, note8; B196 - - mus_jump 0, branch_b140 - mus_tempo 0, 100 - mus_jump 0, branch_b1a5 - mus_tempo 0, 112 - -branch_b1a5: - mus_volume 119; B1A6 - mus_duty duty75 - mus_mod 6, 3, 4 - db $e8 - mus_vel 11, 3 - - mus_octave oct2; B1AF - mus_note noteD, note16 - mus_note noteRst, note8_16 - - mus_note noteD, note16 - mus_note noteRst, note4_16 - - mus_note noteA, note8; B1B4 - mus_note noteG, note8 - mus_note noteA, note8 - - mus_jump 0, branch_b140 -; B1BA - -MeetRival_md_2: ;B1BB - B232 -; B1BB - mus_duty duty75 - mus_mod 10, 2, 6 - mus_vel 12, 7 - - mus_octave oct3 - mus_note noteB, note16; B1C3 - mus_note noteA#, note16 - mus_note noteA, note16 - mus_note noteG#, note16 - mus_note noteG, note8 - mus_note noteF#, note16; B1C8 - mus_note noteF, note16 - mus_note noteE, note16 - mus_note noteD#, note16 - mus_note noteD, note4_8 - - mus_octave oct2; B1CD - mus_note noteG, note16 - mus_note noteRst, note8_16 - - mus_note noteG, note16 - mus_note noteRst, note8_16 - - mus_note noteD, note16; B1D2 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteD, note8 - mus_note noteF, note8 - mus_note noteF#, note8; B1D7 - -branch_b1d8: - mus_vel 12, 7 - mus_note noteG, note4 - mus_note noteD, note8 - mus_note noteF, note4_8 - mus_note noteF#, note4; B1DD - mus_note noteG, note8 - mus_note noteRst, note4 - - mus_note noteG, note4 - mus_note noteG, note8 - mus_note noteA#, note8; B1E2 - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC, note4 - - mus_octave oct3 - mus_note noteG, note8; B1E7 - mus_note noteA#, note4_8 - mus_note noteB, note4 - - mus_octave oct4 - mus_note noteC, note8 - mus_note noteRst, note4; B1EC - - mus_note noteC, note4 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteB, note8 - - mus_octave oct4; B1F1 - mus_note noteC, note8 - - mus_vel 11, 0 - mus_note noteD, note1 - - mus_vel 11, 5 - mus_note noteD, note4_8; B1F8 - - mus_vel 12, 7 - mus_note noteF, note4 - mus_note noteD, note8 - mus_note noteC, note8 - mus_note noteD, note8; B1FE - - mus_vel 11, 0 - mus_note noteC, note2 - - mus_vel 12, 7 - mus_note noteC, note2 - - mus_octave oct3; B205 - mus_note noteC, note8 - mus_note noteRst, note4 - - mus_note noteA#, note4 - mus_note noteG, note8 - mus_note noteF, note8; B20A - - mus_vel 11, 0 - mus_note noteG, note1 - - mus_vel 11, 3 - mus_note noteG, note8 - - mus_octave oct2; B211 - mus_note noteG, note8 - mus_note noteRst, note4 - - mus_note noteG, note4 - - mus_octave oct3 - mus_note noteD, note8; B216 - mus_note noteF, note8 - mus_note noteF#, note8 - - mus_jump 0, branch_b1d8 - mus_duty duty75 - mus_mod 10, 2, 6; B221 - mus_vel 12, 7 - - mus_octave oct2 - mus_note noteG, note16 - mus_note noteRst, note8_16 - - mus_note noteG, note16; B227 - mus_note noteRst, note8_16 - - mus_note noteD, note16 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteD, note8; B22C - mus_note noteF, note8 - mus_note noteF#, note8 - - mus_jump 0, branch_b1d8 -; B232 - -MeetRival_md_3: ;B233 - B3A6 -; B233 - mus_vel 1, 4 - - mus_octave oct4 - mus_note noteD, note8 - mus_note noteRst, note8 - - mus_note noteC#, note8; B238 - mus_note noteRst, note8 - - mus_note noteC, note8 - mus_note noteRst, note8 - - mus_octave oct3 - mus_note noteB, note8; B23D - mus_note noteRst, note8 - - mus_note noteG, note16 - mus_note noteRst, note8_16 - - mus_note noteG, note16 - mus_note noteRst, note8_16; B242 - - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_note noteG, note16; B247 - mus_note noteRst, note16 - - mus_note noteG, note16 - mus_note noteRst, note16 - -branch_b24b: - mus_note noteG, note8 - - mus_octave oct4; B24C - mus_note noteD, note8 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteRst, note8 - - mus_octave oct4; B251 - mus_note noteD, note8 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteRst, note8 - - mus_octave oct4; B256 - mus_note noteD, note8 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteRst, note4 - - mus_octave oct4; B25B - mus_note noteD, note4 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteA#, note8 - mus_note noteB, note8; B260 - mus_note noteG, note8 - - mus_octave oct4 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteG, note8; B265 - mus_note noteRst, note8 - - mus_octave oct4 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteG, note8; B26A - mus_note noteRst, note8 - - mus_note noteB, note8 - - mus_octave oct4 - mus_note noteC, note8 - mus_note noteRst, note4; B26F - - mus_note noteC, note4 - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteA, note8; B274 - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteRst, note8 - - mus_note noteF#, note8 - mus_note noteA, note8; B279 - mus_note noteF#, note8 - mus_note noteRst, note8 - - mus_note noteA, note8 - mus_note noteF#, note8 - mus_note noteA, note8; B27E - mus_note noteRst, note8 - - mus_note noteF#, note8 - mus_note noteA, note8 - mus_note noteF#, note8 - - mus_octave oct4; B283 - mus_note noteD, note8 - - mus_octave oct3 - mus_note noteA, note8 - mus_note noteE, note8 - - mus_octave oct4; B288 - mus_note noteC, note8 - mus_note noteRst, note8 - - mus_octave oct3 - mus_note noteE, note8 - - mus_octave oct4; B28D - mus_note noteC, note8 - - mus_octave oct3 - mus_note noteE, note8 - mus_note noteF, note8 - mus_note noteG, note8; B292 - mus_note noteE, note8 - mus_note noteRst, note4 - - mus_note noteE, note8 - - mus_octave oct4 - mus_note noteC, note8; B297 - - mus_octave oct3 - mus_note noteB, note8 - mus_note noteA#, note8 - mus_note noteA, note8 - mus_note noteG, note8; B29C - mus_note noteA#, note8 - mus_note noteRst, note8 - - mus_note noteG, note8 - mus_note noteA#, note8 - mus_note noteG, note8; B2A1 - mus_note noteRst, note8 - - mus_note noteA#, note8 - mus_note noteG, note8 - - mus_octave oct4 - mus_note noteD, note8; B2A6 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteRst, note8 - - mus_octave oct4 - mus_note noteD, note8; B2AB - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteRst, note8 - - mus_octave oct4 - mus_note noteD, note8; B2B0 - - mus_jump 0, branch_b24b - mus_vel 1, 4 - - mus_octave oct3 - mus_note noteG, note16 - mus_note noteRst, note8_16; B2B9 - - mus_note noteG, note16 - mus_note noteRst, note8_16 - - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_note noteG, note16; B2BE - mus_note noteRst, note16 - - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_note noteG, note16 - mus_note noteRst, note16; B2C3 - - mus_jump 0, branch_b24b - db $f8 - mus_tempo 1, 0 - mus_volume 119 - mus_duty duty50; B2CF - db $d5 - - mus_note noteB, note8 - - mus_octave oct2 - mus_note noteA, note8 - mus_note noteA, note8; B2D4 - mus_note noteG, note8 - mus_note noteG, note8 - mus_note noteF, note8 - mus_note noteE, note8 - mus_note noteF, note8; B2D9 - mus_note noteA, note8 - - mus_octave oct3 - mus_note noteC, note4 - mus_note noteE, note4 - - mus_octave oct2; B2DE - mus_note noteF, note4 - - mus_end -; B2E0 - -; B2E1 -branch_b2e1: - db $f8 - mus_duty duty50 - db $d5 - - mus_note noteRst, note8_16 - - mus_octave oct4; B2E6 - mus_note noteF, note8 - mus_note noteE, note16 - mus_note noteRst, note16 - - mus_note noteD, note8 - mus_note noteC, note16; B2EB - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteA#, note8 - - mus_octave oct4 - mus_note noteC, note8; B2F0 - mus_note noteD, note8 - mus_note noteE, note8 - mus_note noteF, note4 - mus_note noteG, note4 - mus_note noteF, note4; B2F5 - - mus_end -; B2F6 - -; B2F7 -branch_b2f7: - db $f8 - db $d5 - - mus_note noteC#, note16 - - mus_octave oct4 - mus_note noteC, note16; B2FB - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteF, note8 - - mus_octave oct4 - mus_note noteC, note16; B300 - mus_note noteRst, note16 - - mus_octave oct3 - mus_note noteA#, note16 - mus_note noteRst, note16 - - mus_note noteA, note16; B305 - mus_note noteRst, note16 - - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_note noteF, note16 - mus_note noteRst, note16; B30A - - mus_note noteE, note16 - mus_note noteRst, note16 - - mus_octave oct4 - mus_note noteF, note16 - mus_note noteRst, note8_16; B30F - - mus_note noteC, note16 - mus_note noteRst, note8_16 - - mus_octave oct3 - mus_note noteF, note8 - mus_note noteRst, note8; B314 - - mus_end -; B315 - -; B316 -branch_b316: - db $f8 - mus_tempo 1, 0 - mus_volume 119 - mus_duty duty50 - db $e8; B31E - db $d5 - - mus_note noteB, note4_16 - - mus_octave oct3 - mus_note noteD, note4 - mus_note noteC, note4; B323 - - mus_octave oct2 - mus_note noteA, note2 - - db $d5 - - mus_note noteB, note8_16 - - mus_octave oct3; B328 - mus_note noteD#, note8 - mus_note noteD#, note8 - mus_note noteD, note8 - mus_note noteC, note8 - mus_note noteC, note8; B32D - - mus_octave oct2 - mus_note noteA#, note8 - - db $d5 - - mus_note noteB, note4_16 - - mus_octave oct3; B332 - mus_note noteC, note2 - - mus_end -; B334 - -; B335 -branch_b335: - db $f8 - mus_mod 8, 2, 7 - mus_duty duty50 - db $d5 - - mus_note noteRst, note4_8; B33C - - mus_octave oct3 - mus_note noteA, note4 - mus_note noteF, note4 - mus_note noteC, note2 - - db $d5; B341 - - mus_note noteRst, note8_16 - - mus_note noteA#, note8 - mus_note noteA#, note8 - mus_note noteA#, note8 - mus_note noteG, note8; B346 - mus_note noteG, note8 - mus_note noteA#, note8 - - db $d5 - - mus_note noteRst, note4_16 - - mus_note noteA, note2; B34B - - mus_end -; B34C - -; B34D -branch_b34d: - db $f8 - db $d5 - - mus_note noteC#, note16 - - mus_octave oct4 - mus_note noteF, note4; B351 - mus_note noteD#, note4 - mus_note noteC, note2 - mus_note noteD#, note16 - mus_note noteRst, note16 - - mus_note noteD#, note16; B356 - mus_note noteRst, note16 - - mus_note noteE, note16 - mus_note noteRst, note16 - - mus_note noteF, note16 - mus_note noteRst, note16; B35B - - mus_note noteF, note16 - mus_note noteRst, note16 - - mus_note noteG, note16 - mus_note noteRst, note16 - - mus_note noteA, note2; B360 - - mus_end -; B361 - -; B362 -branch_b362: - db $f8 - mus_tempo 1, 0 - mus_volume 119 - mus_duty duty50 - db $e8; B36A - db $d5 - - mus_note noteA#, note4_16 - - mus_octave oct2 - mus_note noteA#, note4 - - db $d5; B36F - - mus_note noteB, note8 - - mus_octave oct3 - mus_note noteC, note8 - mus_note noteC, note16 - mus_note noteC, note16; B374 - - db $d5 - - mus_note noteA#, note4_16 - mus_note noteD#, note4 - - db $d5 - - mus_note noteB, note8; B379 - mus_note noteF, note8 - mus_note noteF, note16 - mus_note noteF, note16 - - db $d5 - - mus_note noteB, note4_16; B37E - mus_note noteA#, note2 - - mus_end -; B380 - -; B381 -branch_b381: - db $f8 - mus_mod 4, 2, 3 - mus_duty duty50 - db $d5 - db $d1; B388 - - mus_octave oct3 - mus_note noteG, note8 - mus_note noteG, note16 - mus_note noteG, note16 - - db $d5; B38D - - mus_note noteRst, note4_16 - - mus_note noteD#, note4 - - db $d5 - db $d1 - - mus_note noteG#, note8; B392 - mus_note noteG#, note16 - mus_note noteG#, note16 - mus_note noteA#, note8 - mus_note noteA#, note16 - mus_note noteA#, note16; B397 - - db $d5 - - mus_note noteRst, note4_16 - - mus_octave oct4 - mus_note noteD#, note2 - - mus_end; B39C -; B39C - -; B39D -branch_b39d: - db $f8 - db $d5 - - mus_note noteC#, note16 - - mus_octave oct3 - mus_note noteD#, note4; B3A1 - mus_note noteG#, note4 - mus_note noteG, note4 - mus_note noteF, note4 - mus_note noteD#, note2 - - mus_end; B3A6 -; B3A6 - -;SS Anne -SSAnne_md_1: ;B3A7 - B418 -INCBIN "baserom.gbc",$b3a7,$b419 - $b3a7 - -SSAnne_md_2: ;B419 - B4CA -INCBIN "baserom.gbc",$b419,$b4cb - $b419 - -SSAnne_md_3: ;B4CB - B503 -INCBIN "baserom.gbc",$b4cb,$b504 - $b4cb - -;Cerulean City, Fuchsia City -Cities2_md_1: ;B504 - B568 -INCBIN "baserom.gbc",$b504,$b569 - $b504 - -Cities2_md_2: ;B569 - B63F -INCBIN "baserom.gbc",$b569,$b640 - $b569 - -Cities2_md_3: ;B640 - B6C6 -INCBIN "baserom.gbc",$b640,$b6c7 - $b640 - -;Celadon City -Celadon_md_1: ;B6C7 - B739 -INCBIN "baserom.gbc",$b6c7,$b73a - $b6c7 - -Celadon_md_2: ;B73A - B7B4 -INCBIN "baserom.gbc",$b73a,$b7b5 - $b73a - -Celadon_md_3: ;B7B5 - B86C -INCBIN "baserom.gbc",$b7b5,$b86d - $b7b5 - -;Cinnabar Island -Cinnabar_md_1: ;B86D - B8D3 -INCBIN "baserom.gbc",$b86d,$b8d4 - $b86d - -Cinnabar_md_2: ;B8D4 - B93C -INCBIN "baserom.gbc",$b8d4,$b93d - $b8d4 - -Cinnabar_md_3: ;B93D - B9EA -INCBIN "baserom.gbc",$b93d,$b9eb - $b93d - -;Vermilion City -Vermilion_md_1: ;B9EB - BA60 -INCBIN "baserom.gbc",$b9eb,$ba61 - $b9eb - -Vermilion_md_2: ;BA61 - BAA5 -INCBIN "baserom.gbc",$ba61,$baa6 - $ba61 - -Vermilion_md_3: ;BAA6 - BB0C -INCBIN "baserom.gbc",$baa6,$bb0d - $baa6 - -Vermilion_md_4: ;BB0D - BB57 -INCBIN "baserom.gbc",$bb0d,$bb58 - $bb0d - -;Lavender Town -Lavender_md_1: ;BB58 - BB9D -INCBIN "baserom.gbc",$bb58,$bb9e - $bb58 - -Lavender_md_2: ;BB9E - BBAD -INCBIN "baserom.gbc",$bb9e,$bbae - $bb9e - -Lavender_md_3: ;BBAE - BC20 -INCBIN "baserom.gbc",$bbae,$bc21 - $bbae - -Lavender_md_4: ;BC21 - BC2D -INCBIN "baserom.gbc",$bc21,$bc2e - $bc21 - -;Safari Zone -SafariZone_md_1: ;BC2E - BC69 -INCBIN "baserom.gbc",$bc2e,$bc6a - $bc2e - -SafariZone_md_2: ;BC6A - BC93 -INCBIN "baserom.gbc",$bc6a,$bc94 - $bc6a - -SafariZone_md_3: ;BC94 - BCBA -INCBIN "baserom.gbc",$bc94,$bcbb - $bc94 - -;Gyms -Gym_md_1: ;bcbb - bd6a (175 bytes) -INCBIN "baserom.gbc",$bcbb,$bd6b - $bcbb - -Gym_md_2: ;bd6b - bdf9 (142 bytes) -INCBIN "baserom.gbc",$bd6b,$bdfa - $bd6b - -Gym_md_3: ;bdfa - be55 (91 bytes) -INCBIN "baserom.gbc",$bdfa,$be56 - $bdfa - -;Pokemon Center -Pokecenter_md_1: ;be56 - bef8 (162 bytes) -INCBIN "baserom.gbc",$be56,$bef9 - $be56 - -Pokecenter_md_2: ;0xbef9 - bf6f (118 bytes) -INCBIN "baserom.gbc",$bef9,$bf70 - $bef9 - -Pokecenter_md_3: ;0xbf70 - bfff (143 bytes) -INCBIN "baserom.gbc",$bf70,$c000 - $bf70 diff --git a/music/bikeriding.asm b/music/bikeriding.asm new file mode 100644 index 00000000..4afac7f3 --- /dev/null +++ b/music/bikeriding.asm @@ -0,0 +1,705 @@ +Music_BikeRiding_Ch1: ; 7dbbb (1f:5bbb) + tempo 0, 144 + stereopanning 119 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 5 + octave 3 + note G_, 2 + +Music_BikeRiding_branch_7dbc9: + octave 4 + note C_, 4 + note D_, 4 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 4 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note F_, 4 + note D_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + notetype 12, 11, 6 + note F_, 10 + notetype 12, 10, 6 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 10 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + unknownmusic0xe8 + notetype 12, 11, 3 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 2 + note E_, 1 + note F_, 1 + unknownmusic0xe8 + notetype 12, 11, 5 + note G_, 6 + note G_, 6 + note A_, 2 + note F_, 2 + note G_, 6 + notetype 12, 11, 4 + note G_, 2 + note F_, 4 + notetype 12, 10, 4 + note E_, 2 + note D_, 2 + notetype 12, 9, 3 + octave 3 + note A_, 2 + octave 4 + note C_, 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note C_, 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note B_, 2 + note A_, 2 + octave 4 + note C_, 4 + octave 3 + note A_, 2 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 2 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 4 + notetype 12, 3, 13 + note C_, 4 + notetype 12, 11, 4 + note F_, 6 + note G_, 4 + note F_, 1 + note G_, 1 + note F_, 4 + note E_, 6 + note F_, 2 + note E_, 2 + note D_, 1 + note E_, 1 + note D_, 2 + note C_, 2 + notetype 12, 11, 5 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note C_, 4 + note F_, 4 + note D_, 4 + note F#, 4 + vibrato 10, 2, 6 + notetype 12, 8, 0 + note G_, 16 + note G_, 4 + notetype 12, 8, 7 + note G_, 12 + notetype 12, 11, 5 + vibrato 8, 1, 4 + loopchannel 0, Music_BikeRiding_branch_7dbc9 + + +Music_BikeRiding_Ch2: ; 7dc6c (1f:5c6c) + duty 2 + vibrato 6, 1, 5 + notetype 12, 12, 3 + octave 4 + note C_, 2 + +Music_BikeRiding_branch_7dc75: + note E_, 4 + note F_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 10 + note F_, 2 + note G_, 2 + note A_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 1 + note B_, 1 + octave 5 + note C_, 6 + octave 4 + note A_, 2 + note G_, 4 + duty 3 + notetype 12, 8, 4 + note A#, 6 + duty 2 + notetype 12, 12, 5 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 10 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 10 + notetype 12, 12, 3 + octave 5 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + notetype 12, 11, 0 + note D_, 4 + notetype 12, 12, 7 + note D_, 10 + note D_, 1 + note C_, 1 + notetype 12, 11, 0 + octave 4 + note B_, 4 + notetype 12, 12, 7 + note B_, 12 + notetype 12, 12, 4 + note F_, 6 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note F_, 2 + note E_, 2 + note G_, 4 + note F_, 2 + note E_, 6 + notetype 6, 12, 2 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + notetype 12, 12, 3 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 4 + note A_, 4 + note G_, 2 + note A#, 4 + note A_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + notetype 8, 12, 4 + note A_, 4 + note G_, 4 + note F_, 4 + note B_, 4 + note A_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note A_, 4 + octave 5 + note D_, 4 + note E_, 4 + note C_, 4 + notetype 12, 12, 7 + note D_, 12 + note C_, 4 + notetype 12, 11, 0 + octave 4 + note B_, 4 + notetype 12, 12, 7 + note B_, 12 + notetype 12, 12, 3 + loopchannel 0, Music_BikeRiding_branch_7dc75 + + +Music_BikeRiding_Ch3: ; 7dd14 (1f:5d14) + notetype 12, 1, 3 + rest 2 + +Music_BikeRiding_branch_7dd17: + octave 4 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note G_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + note C_, 1 + rest 1 + note A_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + note C_, 1 + rest 1 + note A_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note C_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note C_, 1 + rest 1 + note G_, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + note C_, 1 + rest 1 + note A_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note A#, 1 + rest 1 + note E_, 1 + rest 1 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note D_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note C_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + note B_, 1 + rest 1 + note G_, 1 + rest 1 + note B_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + loopchannel 0, Music_BikeRiding_branch_7dd17 + + +Music_BikeRiding_Ch4: ; 7de68 (1f:5e68) + dspeed 12 + rest 2 + +Music_BikeRiding_branch_7de6a: + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dec2 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dec2 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + loopchannel 0, Music_BikeRiding_branch_7de6a + +Music_BikeRiding_branch_7dea7: + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + endchannel + +Music_BikeRiding_branch_7deb4: + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + dnote 2, triangle3 + dnote 2, triangle3 + endchannel + +Music_BikeRiding_branch_7dec2: + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + rest 2 + dnote 2, triangle3 + rest 2 + dnote 1, triangle3 + dnote 1, triangle3 + endchannel +; 0x7ded1 \ No newline at end of file diff --git a/music/blue/sfx_1f_5d.asm b/music/blue/sfx_1f_5d.asm new file mode 100644 index 00000000..5d10f3d1 --- /dev/null +++ b/music/blue/sfx_1f_5d.asm @@ -0,0 +1,52 @@ +SFX_1f_5d_Ch1: ; 7c45e (1f:445e) + duty 2 + note D_, 4 + octave 4 + note C_, 1 + note C_, 7 + note D_, 4 + octave 4 + note G#, 1 + note C_, 7 + note D_, 4 + octave 4 + rest 1 + note C_, 7 + note D_, 4 + octave 4 + note C_, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf2 + octave 8 + note C_, 8 + endchannel + + +SFX_1f_5d_Ch2: ; 7c475 (1f:4475) + duty 2 + note D_, 4 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 4 + rest 5 + note C_, 2 + note C_, 7 + note D_, 4 + rest 5 + note G#, 2 + note C_, 7 + note D_, 4 + rest 5 + rest 2 + note C_, 7 + note D_, 4 + rest 5 + note C_, 2 + note C_, 8 + note D_, 16 + notetype 2, 14, 1 + note C_, 8 + endchannel +; 0x7c490 \ No newline at end of file diff --git a/music/celadon.asm b/music/celadon.asm new file mode 100644 index 00000000..bf73ff2c --- /dev/null +++ b/music/celadon.asm @@ -0,0 +1,412 @@ +Music_Celadon_Ch1: ; b6c7 (2:76c7) + tempo 0, 144 + stereopanning 119 + duty 3 + unknownmusic0xe8 + notetype 12, 2, 15 + rest 8 + octave 3 + note D_, 8 + +Music_Celadon_branch_b6d4: + duty 2 + notetype 12, 11, 2 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 8 + note F#, 4 + note A_, 4 + note F#, 2 + note A_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + octave 4 + note G_, 4 + octave 3 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 8 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 8 + notetype 12, 9, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + loopchannel 0, Music_Celadon_branch_b6d4 + + +Music_Celadon_Ch2: ; b73a (2:773a) + duty 3 + notetype 12, 12, 2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + notetype 12, 10, 0 + note A_, 8 + +Music_Celadon_branch_b74a: + duty 2 + notetype 12, 12, 2 + octave 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 6 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 4 + note F#, 4 + note A_, 2 + note F#, 6 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + note B_, 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 4 + octave 3 + note B_, 2 + octave 4 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 8 + octave 5 + note D_, 8 + notetype 12, 11, 4 + octave 4 + note D_, 8 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note F#, 4 + note D_, 8 + note C_, 8 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + note D_, 8 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 8 + note C_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + loopchannel 0, Music_Celadon_branch_b74a + + +Music_Celadon_Ch3: ; b7b5 (2:77b5) + notetype 12, 1, 3 + rest 8 + octave 5 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + +Music_Celadon_branch_b7c1: + octave 4 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note C#, 2 + note D_, 2 + rest 6 + note F#, 2 + rest 4 + note F#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note B_, 2 + note G_, 2 + octave 5 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note B_, 2 + note G_, 2 + octave 5 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + loopchannel 0, Music_Celadon_branch_b7c1 +; 0xb86d \ No newline at end of file diff --git a/music/cinnabar.asm b/music/cinnabar.asm new file mode 100644 index 00000000..283e8f71 --- /dev/null +++ b/music/cinnabar.asm @@ -0,0 +1,355 @@ +Music_Cinnabar_Ch1: ; b86d (2:786d) + tempo 0, 144 + stereopanning 119 + duty 3 + vibrato 12, 3, 4 + unknownmusic0xe8 + +Music_Cinnabar_branch_b878: + notetype 12, 11, 5 + rest 4 + octave 3 + note D_, 4 + note E_, 6 + note C#, 2 + notetype 12, 11, 1 + note D_, 4 + notetype 12, 11, 5 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + notetype 12, 11, 1 + note B_, 4 + notetype 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + notetype 12, 11, 1 + note G_, 4 + notetype 12, 11, 5 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + notetype 12, 11, 1 + note G_, 4 + notetype 12, 11, 5 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + notetype 12, 10, 2 + note G_, 4 + octave 4 + note D_, 1 + note E_, 1 + note D_, 4 + notetype 12, 7, 2 + note D_, 1 + note E_, 1 + note D_, 4 + notetype 12, 10, 7 + octave 3 + note B_, 6 + note G_, 2 + note E_, 8 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note F#, 8 + octave 4 + note F#, 6 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + loopchannel 0, Music_Cinnabar_branch_b878 + + +Music_Cinnabar_Ch2: ; b8d4 (2:78d4) + duty 3 + vibrato 10, 2, 3 + +Music_Cinnabar_branch_b8d9: + notetype 12, 12, 7 + octave 3 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + notetype 12, 12, 1 + note D_, 4 + notetype 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + notetype 12, 12, 1 + note D_, 4 + notetype 12, 12, 7 + octave 3 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + notetype 12, 12, 1 + note D_, 4 + notetype 12, 12, 7 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + notetype 12, 12, 1 + note D_, 4 + notetype 12, 12, 7 + octave 3 + note A_, 4 + note G_, 4 + note F#, 4 + notetype 12, 11, 0 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + note G_, 8 + octave 4 + note E_, 6 + note C_, 2 + octave 3 + note A_, 8 + octave 4 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 6 + loopchannel 0, Music_Cinnabar_branch_b8d9 + + +Music_Cinnabar_Ch3: ; b93d (2:793d) + notetype 12, 1, 0 + +Music_Cinnabar_branch_b93f: + octave 4 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note A_, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note B_, 4 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note B_, 1 + rest 3 + octave 5 + note D_, 2 + octave 4 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 5 + note C_, 2 + octave 4 + note B_, 1 + rest 1 + note G_, 1 + rest 3 + octave 5 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + rest 1 + note C_, 1 + rest 1 + note E_, 2 + note C_, 1 + rest 1 + octave 4 + note A_, 1 + rest 3 + octave 5 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 2 + note C_, 1 + rest 1 + octave 4 + note B_, 1 + rest 3 + octave 5 + note D_, 2 + note C_, 1 + note C_, 1 + octave 4 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 2 + octave 5 + note C_, 1 + rest 1 + loopchannel 0, Music_Cinnabar_branch_b93f +; 0xb9eb \ No newline at end of file diff --git a/music/cinnabarmansion.asm b/music/cinnabarmansion.asm new file mode 100644 index 00000000..36b911ec --- /dev/null +++ b/music/cinnabarmansion.asm @@ -0,0 +1,173 @@ +Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f) + tempo 0, 144 + stereopanning 119 + vibrato 11, 2, 5 + duty 2 + +Music_CinnabarMansion_branch_7ed19: + notetype 12, 6, 2 + octave 5 + note E_, 1 + note E_, 1 + octave 4 + note B_, 1 + note B_, 1 + note C_, 1 + rest 2 + octave 5 + note B_, 2 + note E_, 2 + octave 4 + note C_, 2 + note B_, 2 + note E_, 2 + note C_, 1 + octave 5 + note B_, 1 + rest 2 + loopchannel 14, Music_CinnabarMansion_branch_7ed19 + notetype 12, 10, 5 + rest 16 + rest 16 + rest 15 + octave 4 + note C_, 1 + octave 5 + note B_, 1 + note B_, 2 + loopchannel 0, Music_CinnabarMansion_branch_7ed19 + + +Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40) + duty 2 + unknownmusic0xe8 + vibrato 10, 2, 4 + notetype 12, 12, 2 + +Music_CinnabarMansion_branch_7ed48: + rest 16 + rest 16 + loopchannel 4, Music_CinnabarMansion_branch_7ed48 + +Music_CinnabarMansion_branch_7ed4e: + notetype 12, 12, 2 + +Music_CinnabarMansion_branch_7ed50: + callchannel Music_CinnabarMansion_branch_7ed6c + loopchannel 3, Music_CinnabarMansion_branch_7ed50 + octave 3 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + rest 4 + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note D#, 4 + loopchannel 0, Music_CinnabarMansion_branch_7ed4e + +Music_CinnabarMansion_branch_7ed6c: + octave 3 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + rest 4 + note A#, 4 + endchannel + + +Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e) + notetype 12, 1, 1 + +Music_CinnabarMansion_branch_7ed80: + octave 2 + note B_, 2 + rest 2 + octave 3 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note C_, 2 + rest 2 + octave 3 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + note D#, 2 + rest 2 + loopchannel 8, Music_CinnabarMansion_branch_7ed80 + note E_, 16 + note D#, 16 + note G_, 16 + note G#, 8 + note D#, 8 + loopchannel 0, Music_CinnabarMansion_branch_7ed80 + + +Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0) + dspeed 6 + rest 16 + rest 16 + rest 16 + rest 16 + +Music_CinnabarMansion_branch_7edb5: + dnote 2, cymbal1 + dnote 2, cymbal1 + dnote 4, cymbal2 + dnote 2, cymbal1 + dnote 2, cymbal1 + dnote 4, cymbal2 + dnote 2, cymbal1 + dnote 2, cymbal1 + dnote 4, cymbal2 + dnote 2, cymbal1 + dnote 2, cymbal1 + dnote 4, cymbal3 + dnote 2, cymbal1 + dnote 2, cymbal1 + rest 2 + rest 10 + rest 8 + dnote 8, cymbal3 + loopchannel 0, Music_CinnabarMansion_branch_7edb5 +; 0x7edda \ No newline at end of file diff --git a/music/cities1.asm b/music/cities1.asm new file mode 100644 index 00000000..9512adbf --- /dev/null +++ b/music/cities1.asm @@ -0,0 +1,658 @@ +Music_Cities1_branch_aa6f: + tempo 0, 232 + loopchannel 0, Music_Cities1_branch_aa79 + +Music_Cities1_Ch1: ; aa76 (2:6a76) + tempo 0, 144 + +Music_Cities1_branch_aa79: + stereopanning 119 + vibrato 8, 2, 4 + duty 3 + +Music_Cities1_branch_aa80: + notetype 12, 12, 5 + octave 3 + note G#, 4 + note F#, 4 + note E_, 2 + note E_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 2 + note E_, 2 + note E_, 4 + notetype 12, 10, 5 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note C#, 2 + note C#, 4 + octave 2 + note B_, 4 + notetype 12, 12, 5 + callchannel Music_Cities1_branch_ab7d + octave 3 + note D#, 6 + note E_, 2 + octave 2 + note B_, 4 + notetype 12, 10, 5 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + note A_, 4 + note B_, 4 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + notetype 12, 12, 5 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note E_, 2 + note E_, 4 + notetype 12, 10, 5 + note C#, 2 + octave 2 + note A_, 2 + note B_, 6 + octave 3 + note C#, 2 + note C#, 2 + octave 2 + note B_, 2 + note B_, 4 + notetype 12, 12, 5 + callchannel Music_Cities1_branch_ab7d + octave 3 + note D#, 4 + note D#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note G#, 2 + note E_, 4 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + notetype 12, 10, 5 + note C#, 4 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note C#, 2 + note E_, 4 + notetype 12, 11, 3 + callchannel Music_Cities1_branch_ab8a + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 4 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + +Music_Cities1_branch_ab12: + note C#, 2 + note D#, 2 + note C#, 2 + octave 2 + note B_, 4 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + loopchannel 2, Music_Cities1_branch_ab12 + note E_, 2 + octave 2 + note B_, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note G#, 2 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + callchannel Music_Cities1_branch_ab8a + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note D#, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note G#, 2 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note F#, 2 + note D#, 2 + note D#, 2 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D#, 2 + notetype 12, 11, 6 + note F#, 8 + note F#, 4 + note D#, 4 + note E_, 8 + notetype 12, 8, 4 + octave 2 + note B_, 4 + octave 3 + note E_, 2 + note F#, 2 + loopchannel 0, Music_Cities1_branch_aa80 + +Music_Cities1_branch_ab7d: + octave 3 + note F#, 2 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 4 + octave 2 + note B_, 4 + octave 3 + note C#, 2 + note D#, 2 + note C#, 2 + endchannel + +Music_Cities1_branch_ab8a: + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + endchannel + + +Music_Cities1_Ch2: ; ab92 (2:6b92) + vibrato 5, 1, 5 + callchannel Music_Cities1_branch_ac00 + octave 4 + note G#, 2 + notetype 12, 12, 4 + note E_, 6 + notetype 12, 12, 5 + duty 3 + octave 3 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + callchannel Music_Cities1_branch_ac00 + octave 4 + note G#, 2 + notetype 12, 12, 4 + note E_, 14 + duty 3 + octave 3 + note E_, 6 + note F#, 6 + note G#, 4 + notetype 12, 11, 7 + duty 2 + vibrato 8, 1, 7 + octave 5 + note C#, 12 + octave 4 + note A_, 4 + octave 5 + note E_, 8 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 4 + note B_, 12 + note G#, 4 + note B_, 16 + note F#, 12 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note G#, 12 + note E_, 4 + note B_, 16 + octave 5 + note C#, 12 + note D#, 2 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 4 + note B_, 12 + octave 5 + note C#, 2 + note D#, 2 + note C#, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note A_, 12 + note B_, 2 + octave 5 + note C_, 2 + note C_, 4 + octave 4 + note B_, 4 + note A_, 4 + note F#, 4 + notetype 12, 11, 7 + note A_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 14 + notetype 12, 8, 4 + note G#, 1 + notetype 12, 10, 4 + note A_, 1 + loopchannel 0, Music_Cities1_Ch2 + +Music_Cities1_branch_ac00: + duty 2 + notetype 12, 12, 3 + octave 4 + note B_, 4 + note A_, 4 + notetype 12, 12, 4 + note G#, 10 + notetype 12, 12, 3 + note G#, 2 + note A_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + notetype 12, 12, 4 + note F#, 10 + notetype 12, 12, 5 + duty 3 + octave 3 + note E_, 4 + note D#, 8 + note E_, 4 + note F#, 4 + notetype 12, 12, 3 + duty 2 + octave 4 + note A_, 4 + note G#, 4 + notetype 12, 12, 4 + note F#, 10 + notetype 12, 12, 3 + note F#, 2 + note G#, 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + endchannel + + +Music_Cities1_Ch3: ; ac32 (2:6c32) + notetype 12, 1, 1 + unknownmusic0xe8 + +Music_Cities1_branch_ac35: + vibrato 0, 0, 0 + octave 4 + callchannel Music_Cities1_branch_acc5 + callchannel Music_Cities1_branch_acc5 + callchannel Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + callchannel Music_Cities1_branch_acc5 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + callchannel Music_Cities1_branch_acc5 + callchannel Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + note G#, 2 + note E_, 2 + note B_, 2 + rest 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + vibrato 8, 2, 5 + note A_, 8 + note E_, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note E_, 8 + note G#, 12 + note E_, 4 + note F#, 2 + note F#, 2 + note D#, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 8 + note E_, 8 + note A_, 8 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 8 + note E_, 8 + note B_, 4 + note E_, 4 + note F#, 4 + note G#, 4 + rest 2 + note D#, 2 + note E_, 2 + note F#, 2 + rest 2 + note F#, 2 + note B_, 2 + note A_, 2 + note A_, 4 + note G#, 4 + note F#, 2 + note D#, 2 + note A_, 2 + note F#, 2 + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + note E_, 2 + note F#, 1 + note G#, 1 + note E_, 1 + note F#, 1 + note G#, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + loopchannel 0, Music_Cities1_branch_ac35 + +Music_Cities1_branch_acc5: + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + note E_, 2 + note F#, 2 + note G#, 2 + endchannel + +Music_Cities1_branch_acce: + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + rest 2 + note A_, 2 + note G#, 2 + note F#, 2 + rest 2 + note F#, 2 + note G#, 2 + note A_, 2 + rest 2 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + rest 2 + note D#, 2 + note E_, 2 + note F#, 2 + rest 2 + note D#, 2 + note E_, 2 + note F#, 2 + rest 2 + note D#, 2 + note E_, 2 + note F#, 2 + endchannel + + +Music_Cities1_Ch4: ; acef (2:6cef) + dspeed 12 + callchannel Music_Cities1_branch_ad36 + +Music_Cities1_branch_acf3: + callchannel Music_Cities1_branch_ad36 + callchannel Music_Cities1_branch_ad45 + callchannel Music_Cities1_branch_ad45 + loopchannel 2, Music_Cities1_branch_acf3 + callchannel Music_Cities1_branch_ad36 + callchannel Music_Cities1_branch_ad5f + callchannel Music_Cities1_branch_ad52 + dnote 6, triangle1 + dnote 6, triangle1 + dnote 4, triangle2 + callchannel Music_Cities1_branch_ad6e + callchannel Music_Cities1_branch_ad5f + callchannel Music_Cities1_branch_ad52 + callchannel Music_Cities1_branch_ad6e + callchannel Music_Cities1_branch_ad52 + dnote 6, triangle1 + dnote 6, triangle1 + dnote 2, triangle2 + dnote 2, triangle1 + dnote 6, triangle1 + dnote 6, triangle1 + dnote 4, triangle1 + dnote 6, triangle1 + dnote 6, snare6 + dnote 4, snare6 + loopchannel 0, Music_Cities1_Ch4 + +Music_Cities1_branch_ad36: + dnote 6, snare6 + dnote 6, snare6 + dnote 4, snare6 + dnote 6, snare6 + dnote 6, snare6 + dnote 2, snare6 + dnote 2, snare6 + endchannel + +Music_Cities1_branch_ad45: + dnote 6, snare6 + dnote 6, snare6 + dnote 4, snare6 + dnote 6, snare6 + dnote 6, snare6 + dnote 4, snare6 + endchannel + +Music_Cities1_branch_ad52: + dnote 6, triangle1 + dnote 6, triangle1 + dnote 4, triangle2 + dnote 6, triangle1 + dnote 6, triangle1 + dnote 4, triangle2 + endchannel + +Music_Cities1_branch_ad5f: + dnote 6, triangle1 + dnote 6, triangle1 + dnote 4, triangle2 + dnote 6, triangle1 + dnote 6, triangle1 + dnote 2, triangle2 + dnote 2, triangle1 + endchannel + +Music_Cities1_branch_ad6e: + dnote 6, triangle1 + dnote 6, triangle1 + dnote 2, triangle2 + dnote 2, triangle2 + endchannel +; 0xad77 \ No newline at end of file diff --git a/music/cities2.asm b/music/cities2.asm new file mode 100644 index 00000000..b1ed7353 --- /dev/null +++ b/music/cities2.asm @@ -0,0 +1,417 @@ +Music_Cities2_Ch1: ; b504 (2:7504) + tempo 0, 148 + stereopanning 119 + duty 3 + vibrato 8, 3, 2 + unknownmusic0xe8 + notetype 12, 11, 6 + rest 8 + octave 3 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + rest 14 + +Music_Cities2_branch_b51a: + octave 3 + note B_, 4 + octave 4 + note C#, 2 + note D#, 1 + note D_, 1 + note C#, 4 + octave 3 + note B_, 4 + note G#, 8 + note E_, 8 + note A_, 4 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + rest 16 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 1 + note D#, 1 + note C#, 4 + octave 3 + note B_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 3 + note G#, 8 + note B_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + rest 2 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + note F#, 2 + note G#, 2 + note A_, 2 + rest 2 + octave 4 + note F#, 4 + note D#, 4 + octave 3 + note E_, 2 + rest 4 + note F#, 2 + rest 4 + note A_, 2 + rest 2 + note B_, 2 + rest 16 + rest 16 + rest 14 + note E_, 16 + note F#, 8 + note G#, 4 + note F#, 4 + note E_, 2 + rest 14 + loopchannel 0, Music_Cities2_branch_b51a + + +Music_Cities2_Ch2: ; b569 (2:7569) + duty 3 + vibrato 8, 2, 3 + notetype 12, 12, 2 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 6 + notetype 12, 12, 2 + duty 2 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + +Music_Cities2_branch_b58b: + notetype 12, 10, 6 + note G#, 6 + notetype 12, 12, 2 + note A_, 1 + note G#, 1 + notetype 12, 12, 4 + note F#, 14 + notetype 12, 12, 2 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 12, 4 + note G#, 6 + notetype 12, 12, 2 + note E_, 1 + note G#, 1 + notetype 12, 12, 5 + note B_, 14 + notetype 12, 12, 2 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 10, 6 + note G#, 6 + notetype 12, 12, 2 + note A_, 1 + note G#, 1 + notetype 12, 12, 4 + note F#, 8 + notetype 12, 10, 1 + duty 1 + octave 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + notetype 12, 12, 2 + duty 2 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 12, 4 + note G#, 6 + note E_, 1 + note G#, 1 + notetype 12, 12, 6 + note B_, 8 + notetype 12, 12, 2 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 4 + notetype 12, 12, 7 + note G#, 4 + note E_, 4 + notetype 12, 12, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 4 + notetype 12, 12, 7 + note B_, 4 + note F#, 4 + notetype 12, 12, 2 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note G#, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note F#, 1 + notetype 12, 12, 2 + note B_, 8 + notetype 12, 11, 7 + octave 3 + note E_, 8 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note G#, 4 + note A_, 4 + note B_, 8 + note B_, 8 + note G#, 4 + octave 4 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + notetype 12, 12, 2 + note E_, 6 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + loopchannel 0, Music_Cities2_branch_b58b + + +Music_Cities2_Ch3: ; b640 (2:7640) + notetype 12, 1, 1 + rest 16 + octave 4 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + +Music_Cities2_branch_b64c: + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + rest 2 + note E_, 4 + note G#, 4 + note F#, 2 + note A_, 2 + note F#, 2 + rest 2 + note F#, 4 + note A_, 4 + note C#, 2 + rest 4 + note E_, 2 + rest 4 + note G#, 2 + note A_, 2 + note B_, 2 + rest 8 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + loopchannel 0, Music_Cities2_branch_b64c +; 0xb6c7 \ No newline at end of file diff --git a/music/credits.asm b/music/credits.asm new file mode 100644 index 00000000..3013b3d0 --- /dev/null +++ b/music/credits.asm @@ -0,0 +1,821 @@ +Music_Credits_Ch1: ; 7fc1f (1f:7c1f) + tempo 0, 140 + stereopanning 119 + duty 3 + vibrato 8, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 5 + octave 4 + note E_, 6 + octave 3 + note A_, 1 + octave 4 + note E_, 1 + note D_, 6 + octave 3 + note G_, 1 + octave 4 + note D_, 1 + note C#, 6 + octave 3 + note F#, 1 + octave 4 + note C#, 1 + note D_, 4 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 1 + rest 1 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + notetype 12, 11, 6 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 6 + note E_, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note E_, 6 + note C#, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + notetype 12, 11, 7 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + notetype 12, 12, 7 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + notetype 12, 9, 0 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 + rest 16 + rest 16 + rest 8 + notetype 12, 11, 6 + note E_, 6 + note D#, 1 + note D_, 1 + notetype 12, 10, 0 + note C#, 8 + notetype 12, 10, 7 + note C#, 8 + rest 16 + rest 16 + rest 8 + note E_, 6 + note C#, 1 + note E_, 1 + notetype 12, 10, 0 + note A_, 8 + notetype 12, 10, 7 + note A_, 8 + notetype 12, 11, 6 + note G_, 6 + note D_, 4 + note G_, 2 + note B_, 4 + notetype 12, 11, 7 + note G_, 8 + note F#, 4 + note G#, 4 + notetype 12, 9, 0 + note A_, 8 + note F#, 8 + note E_, 8 + note C#, 8 + notetype 12, 11, 7 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note D_, 8 + notetype 12, 9, 0 + note E_, 8 + note D_, 8 + note F#, 8 + note E_, 8 + notetype 12, 10, 0 + note D_, 8 + note E_, 8 + note D_, 8 + note C_, 8 + note G_, 8 + note F_, 8 + note E_, 8 + note D_, 8 + notetype 12, 10, 0 + note C#, 6 + notetype 12, 10, 7 + note C#, 6 + notetype 12, 11, 7 + note D_, 4 + note E_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + notetype 12, 10, 0 + note E_, 6 + notetype 12, 10, 7 + note E_, 6 + notetype 12, 11, 7 + note D_, 4 + notetype 12, 10, 0 + note C#, 8 + notetype 12, 10, 7 + note C#, 8 + notetype 12, 11, 7 + note E_, 6 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 4 + note C#, 4 + note E_, 4 + note F#, 4 + notetype 12, 10, 0 + note E_, 6 + notetype 12, 11, 7 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + notetype 12, 10, 0 + octave 4 + note C#, 16 + note C#, 8 + notetype 12, 10, 7 + note C#, 8 + notetype 12, 11, 5 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + note A_, 1 + notetype 12, 11, 1 + note A_, 8 + endchannel + + +Music_Credits_Ch2: ; 7fd5f (1f:7d5f) + duty 3 + vibrato 10, 2, 5 + notetype 12, 12, 5 + octave 4 + note A_, 6 + note E_, 1 + note A_, 1 + note G_, 6 + note D_, 1 + note G_, 1 + notetype 12, 12, 7 + note F#, 12 + note G#, 2 + note E_, 1 + note G#, 1 + notetype 12, 12, 2 + note A_, 2 + notetype 12, 12, 1 + octave 3 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + notetype 12, 12, 4 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + notetype 12, 12, 7 + octave 4 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 8 + octave 3 + note A_, 6 + note E_, 2 + octave 4 + note C#, 8 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 8 + octave 3 + note A_, 6 + note E_, 2 + notetype 12, 11, 0 + octave 4 + note C#, 8 + notetype 12, 12, 7 + note D_, 6 + octave 3 + note B_, 2 + octave 4 + note G_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + notetype 12, 11, 0 + octave 4 + note C#, 6 + notetype 12, 11, 7 + note C#, 6 + note D_, 4 + notetype 12, 10, 0 + note E_, 8 + notetype 12, 10, 7 + note E_, 8 + notetype 12, 12, 7 + note D_, 6 + octave 3 + note B_, 2 + octave 4 + note G_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + notetype 12, 11, 0 + octave 4 + note E_, 7 + notetype 12, 11, 7 + note E_, 7 + notetype 12, 12, 3 + note E_, 1 + note G#, 1 + notetype 12, 11, 0 + note A_, 8 + notetype 12, 11, 7 + note A_, 8 + notetype 12, 12, 6 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + notetype 12, 10, 0 + note C#, 8 + notetype 12, 10, 7 + note C#, 8 + notetype 12, 9, 0 + octave 3 + note A_, 8 + notetype 12, 9, 7 + note A_, 8 + notetype 12, 11, 0 + note E_, 8 + notetype 12, 11, 7 + note E_, 8 + notetype 12, 12, 7 + note D_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + notetype 12, 11, 7 + note G_, 6 + note F#, 1 + note F_, 1 + notetype 12, 11, 0 + note E_, 8 + notetype 12, 11, 7 + note E_, 8 + notetype 12, 11, 0 + note D_, 8 + notetype 12, 11, 7 + note D_, 8 + notetype 12, 12, 7 + octave 2 + note B_, 8 + octave 3 + note F#, 6 + note D_, 1 + note F#, 1 + note E_, 8 + note B_, 6 + note G_, 1 + note B_, 1 + notetype 12, 11, 0 + octave 4 + note C#, 8 + notetype 12, 11, 7 + note C#, 8 + notetype 12, 11, 0 + note D_, 8 + notetype 12, 11, 7 + note D_, 8 + notetype 12, 12, 7 + octave 3 + note B_, 8 + octave 4 + note D_, 6 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + notetype 12, 11, 0 + note C#, 6 + notetype 12, 11, 7 + note C#, 6 + notetype 12, 12, 7 + octave 3 + note B_, 4 + notetype 12, 11, 0 + note A_, 8 + notetype 12, 11, 7 + note A_, 8 + notetype 12, 11, 0 + note F#, 6 + notetype 12, 11, 7 + note F#, 6 + notetype 12, 12, 7 + note G#, 4 + note A_, 8 + note F#, 8 + notetype 12, 11, 0 + note G#, 6 + notetype 12, 11, 7 + note G#, 6 + notetype 12, 12, 7 + note A_, 4 + note B_, 8 + note G#, 8 + notetype 12, 11, 0 + note A_, 6 + notetype 12, 11, 7 + note A_, 6 + notetype 12, 12, 7 + note B_, 4 + octave 4 + note C_, 8 + octave 3 + note A_, 8 + notetype 12, 11, 0 + note B_, 6 + notetype 12, 11, 7 + note B_, 6 + notetype 12, 12, 7 + octave 4 + note C_, 4 + notetype 12, 11, 0 + note D_, 8 + octave 3 + note B_, 8 + notetype 12, 11, 0 + octave 4 + note C#, 16 + note C#, 8 + notetype 12, 11, 7 + note C#, 8 + notetype 12, 11, 0 + octave 3 + note A_, 16 + note A_, 8 + notetype 12, 11, 7 + note A_, 8 + notetype 12, 12, 7 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + octave 3 + note B_, 6 + octave 4 + note D_, 2 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + octave 3 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note C#, 4 + note D_, 4 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + octave 3 + note B_, 6 + octave 4 + note D_, 2 + note G_, 8 + notetype 12, 11, 0 + note A_, 16 + notetype 12, 10, 0 + note A_, 8 + notetype 12, 10, 7 + note A_, 8 + notetype 12, 12, 1 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + notetype 12, 12, 1 + note A_, 8 + endchannel + + +Music_Credits_Ch3: ; 7fec2 (1f:7ec2) + notetype 12, 1, 0 + octave 5 + note C#, 6 + octave 4 + note A_, 1 + octave 5 + note C#, 1 + note D_, 6 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 4 + note G#, 2 + note E_, 1 + note G#, 1 + note A_, 1 + rest 15 + rest 16 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffae + callchannel Music_Credits_branch_7ffa4 + octave 4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffae + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffc1 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffc1 + callchannel Music_Credits_branch_7ffc1 + octave 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 5 + note D_, 4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffae + callchannel Music_Credits_branch_7ffae + callchannel Music_Credits_branch_7ffa4 + note E_, 4 + note A_, 2 + note E_, 4 + note A_, 2 + note E_, 2 + note A_, 2 + callchannel Music_Credits_branch_7ffae + callchannel Music_Credits_branch_7ffae + callchannel Music_Credits_branch_7ffa4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + callchannel Music_Credits_branch_7ffd2 + callchannel Music_Credits_branch_7ffd2 + callchannel Music_Credits_branch_7ffdb + callchannel Music_Credits_branch_7ffdb + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffb8 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffe4 + callchannel Music_Credits_branch_7ffe4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffa4 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffb8 + callchannel Music_Credits_branch_7ffed + callchannel Music_Credits_branch_7ffed + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + note A_, 1 + note A_, 1 + rest 7 + endchannel + +Music_Credits_branch_7ffa4: + octave 4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + endchannel + +Music_Credits_branch_7ffae: + octave 4 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + endchannel + +Music_Credits_branch_7ffb8: + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + endchannel + +Music_Credits_branch_7ffc1: + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + endchannel + +Music_Credits_branch_7ffd2: + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + endchannel + +Music_Credits_branch_7ffdb: + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + endchannel + +Music_Credits_branch_7ffe4: + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + endchannel + +Music_Credits_branch_7ffed: + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + note A_, 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + endchannel +; 0x7fffa \ No newline at end of file diff --git a/music/defeatedgymleader.asm b/music/defeatedgymleader.asm new file mode 100644 index 00000000..3629249c --- /dev/null +++ b/music/defeatedgymleader.asm @@ -0,0 +1,608 @@ +Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) + tempo 0, 112 + stereopanning 119 + duty 3 + vibrato 18, 3, 1 + unknownmusic0xe8 + tempo 0, 112 + notetype 12, 10, 6 + octave 4 + note D_, 6 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + notetype 12, 10, 0 + note A_, 8 + notetype 12, 10, 7 + note A_, 8 + +Music_DefeatedGymLeader_branch_23ccc: + notetype 12, 11, 2 + octave 3 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + notetype 12, 11, 1 + octave 2 + note B_, 8 + notetype 12, 11, 2 + octave 3 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + notetype 12, 11, 1 + octave 2 + note B_, 8 + notetype 12, 9, 7 + octave 3 + note D_, 6 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 8 + notetype 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + notetype 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + notetype 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + notetype 12, 9, 7 + note C#, 6 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 8 + notetype 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + notetype 12, 9, 0 + note F#, 8 + note E_, 8 + note D_, 8 + note C#, 8 + notetype 12, 9, 7 + note D_, 6 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 8 + notetype 12, 11, 0 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + notetype 12, 9, 7 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + notetype 12, 11, 0 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + notetype 12, 9, 7 + note C#, 6 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 8 + notetype 12, 11, 0 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + notetype 12, 9, 7 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + notetype 12, 10, 7 + note G_, 8 + note E_, 8 + loopchannel 0, Music_DefeatedGymLeader_branch_23ccc + + +Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) + duty 2 + vibrato 24, 2, 4 + notetype 12, 12, 4 + octave 4 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 6 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + notetype 12, 11, 0 + note F#, 8 + notetype 12, 11, 7 + note F#, 8 + +Music_DefeatedGymLeader_branch_23d84: + notetype 12, 12, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 12, 4 + note A_, 4 + note A_, 4 + notetype 12, 12, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 12, 1 + note D_, 6 + notetype 6, 12, 2 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + notetype 12, 12, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 12, 4 + note A_, 4 + note A_, 3 + notetype 6, 12, 2 + note B_, 1 + octave 4 + note C#, 1 + notetype 12, 12, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 12, 1 + note D_, 8 + notetype 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + notetype 12, 11, 0 + octave 4 + note D_, 8 + notetype 12, 10, 0 + note D_, 8 + notetype 12, 9, 7 + note D_, 8 + notetype 12, 12, 7 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + notetype 12, 8, 0 + octave 4 + note E_, 8 + notetype 12, 10, 0 + note E_, 8 + notetype 12, 12, 7 + note E_, 8 + octave 3 + note G_, 6 + note E_, 1 + note G_, 1 + notetype 12, 6, 15 + octave 4 + note C#, 8 + notetype 12, 12, 7 + note C#, 8 + note F#, 4 + note E_, 4 + notetype 12, 11, 0 + note D_, 14 + octave 3 + note B_, 2 + notetype 12, 10, 0 + note A_, 8 + notetype 12, 11, 7 + note A_, 8 + notetype 12, 12, 7 + note A_, 6 + note F#, 1 + note A_, 1 + notetype 12, 11, 0 + octave 4 + note D_, 8 + notetype 12, 10, 0 + note D_, 8 + notetype 12, 9, 7 + note D_, 8 + notetype 12, 12, 7 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + notetype 12, 4, 15 + octave 4 + note E_, 8 + notetype 12, 11, 0 + note E_, 8 + notetype 12, 12, 7 + note E_, 8 + octave 3 + note G_, 6 + note E_, 1 + note G_, 1 + notetype 12, 11, 0 + octave 4 + note C#, 8 + notetype 12, 11, 7 + note C#, 8 + octave 3 + note A_, 4 + octave 4 + note C#, 4 + notetype 12, 11, 0 + note D_, 14 + note E_, 2 + note D_, 12 + notetype 12, 12, 2 + octave 3 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + + +Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) + notetype 12, 1, 0 + vibrato 16, 1, 2 + octave 4 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 6 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + note F#, 8 + +Music_DefeatedGymLeader_branch_23e65: + octave 4 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note F#, 3 + rest 1 + note F#, 3 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note D_, 1 + rest 5 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 3 + rest 1 + note D_, 3 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 7 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note E_, 2 + loopchannel 0, Music_DefeatedGymLeader_branch_23e65 +; 0x23f52 \ No newline at end of file diff --git a/music/defeatedtrainer.asm b/music/defeatedtrainer.asm new file mode 100644 index 00000000..b4ec6c33 --- /dev/null +++ b/music/defeatedtrainer.asm @@ -0,0 +1,267 @@ +Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) + tempo 0, 224 + stereopanning 119 + duty 2 + unknownmusic0xe8 + tempo 0, 224 + notetype 4, 10, 2 + octave 4 + note D_, 2 + tempo 0, 224 + notetype 4, 10, 2 + note D_, 2 + note D_, 2 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + notetype 4, 11, 3 + note F#, 12 + duty 1 + tempo 0, 224 + +Music_DefeatedTrainer_branch_23a76: + notetype 4, 6, 3 + octave 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 + octave 4 + note C#, 3 + note D_, 3 + note E_, 3 + note F#, 3 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + octave 4 + note C#, 3 + octave 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 + octave 4 + note C_, 6 + octave 3 + note A_, 3 + octave 4 + note C_, 3 + note D_, 3 + octave 3 + note B_, 3 + octave 4 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + loopchannel 0, Music_DefeatedTrainer_branch_23a76 + + +Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1) + duty 2 + notetype 4, 12, 3 + octave 4 + note A_, 2 + notetype 4, 12, 3 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + notetype 4, 12, 4 + note D_, 12 + +Music_DefeatedTrainer_branch_23ad2: + notetype 4, 8, 5 + octave 4 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note E_, 3 + note F#, 3 + note G_, 6 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note G_, 3 + note A_, 6 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note G_, 3 + note D_, 3 + note G_, 6 + notetype 4, 7, 0 + note F#, 12 + notetype 4, 7, 7 + note F#, 12 + notetype 4, 6, 0 + note E_, 12 + notetype 4, 6, 7 + note E_, 12 + loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + + +Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) + notetype 4, 1, 0 + octave 5 + note D_, 2 + notetype 4, 1, 0 + note D_, 2 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 12 + notetype 4, 2, 1 + +Music_DefeatedTrainer_branch_23b24: + note F#, 3 + rest 3 + note F#, 3 + rest 3 + note G#, 3 + rest 3 + note G#, 3 + rest 3 + note A_, 3 + rest 3 + note A_, 3 + rest 3 + note B_, 3 + rest 3 + note B_, 3 + rest 3 + note F#, 3 + rest 3 + note F#, 3 + rest 3 + note G#, 3 + rest 3 + note G#, 3 + rest 3 + note A_, 3 + rest 3 + note A_, 3 + rest 3 + octave 5 + note C#, 3 + rest 3 + note C#, 3 + octave 4 + note A_, 3 + note F#, 3 + octave 5 + note D_, 3 + octave 4 + note F#, 3 + rest 3 + note G#, 3 + octave 5 + note E_, 3 + octave 4 + note G#, 3 + rest 3 + note A_, 3 + octave 5 + note F_, 3 + octave 4 + note A_, 3 + rest 3 + note B_, 3 + octave 5 + note G_, 3 + octave 4 + note B_, 3 + note A#, 3 + note A_, 3 + rest 3 + note A_, 3 + rest 3 + note A_, 3 + rest 3 + note A_, 3 + octave 5 + note C_, 3 + note C#, 3 + rest 3 + note C#, 3 + rest 3 + note C#, 3 + rest 3 + note C#, 3 + octave 4 + note A_, 3 + loopchannel 0, Music_DefeatedTrainer_branch_23b24 +; 0x23b74 \ No newline at end of file diff --git a/music/defeatedwildmon.asm b/music/defeatedwildmon.asm new file mode 100644 index 00000000..6d17496a --- /dev/null +++ b/music/defeatedwildmon.asm @@ -0,0 +1,303 @@ +Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) + tempo 0, 112 + stereopanning 119 + unknownmusic0xf8 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + tempo 0, 112 + notetype 12, 11, 7 + octave 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 12 + +Music_DefeatedWildMon_branch_23b8b: + notetype 12, 6, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 2 + note G#, 4 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 8 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 8 + loopchannel 0, Music_DefeatedWildMon_branch_23b8b + + +Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) + unknownmusic0xf8 + duty 2 + notetype 12, 12, 3 + octave 4 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 12, 7 + note B_, 12 + +Music_DefeatedWildMon_branch_23bce: + notetype 12, 8, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note C#, 2 + note C#, 2 + note C#, 4 + octave 3 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note C#, 2 + note C#, 2 + note C#, 4 + octave 3 + note B_, 8 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 2 + note C_, 2 + note C_, 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + loopchannel 0, Music_DefeatedWildMon_branch_23bce + + +Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) + unknownmusic0xf8 + notetype 12, 2, 0 + octave 5 + note E_, 1 + rest 1 + octave 6 + note C#, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + octave 6 + note D#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + +Music_DefeatedWildMon_branch_23c21: + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 3 + octave 5 + note E_, 1 + rest 3 + octave 4 + note F#, 1 + rest 1 + octave 5 + note F#, 1 + rest 1 + octave 4 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + octave 5 + note D#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 3 + octave 5 + note E_, 1 + rest 3 + octave 4 + note F#, 1 + rest 1 + octave 5 + note F#, 1 + rest 1 + octave 4 + note F#, 1 + rest 3 + octave 5 + note E_, 1 + rest 3 + octave 4 + note D#, 4 + octave 4 + note F_, 1 + rest 1 + octave 5 + note F_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + octave 5 + note F_, 1 + rest 1 + octave 4 + note F_, 1 + rest 3 + octave 5 + note F_, 1 + rest 3 + octave 4 + note G_, 1 + rest 1 + octave 5 + note G_, 1 + rest 1 + octave 4 + note G_, 1 + rest 3 + note F_, 1 + rest 1 + octave 5 + note F_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 5 + note F_, 1 + rest 1 + octave 4 + note F_, 1 + rest 1 + octave 5 + note F_, 1 + rest 1 + octave 4 + note F_, 1 + rest 3 + octave 5 + note F_, 1 + rest 3 + octave 4 + note G_, 1 + rest 1 + octave 5 + note G_, 1 + rest 1 + octave 4 + note G_, 1 + rest 3 + octave 5 + note F_, 1 + rest 3 + octave 4 + note D#, 4 + loopchannel 0, Music_DefeatedWildMon_branch_23c21 +; 0x23cad \ No newline at end of file diff --git a/music/dungeon1.asm b/music/dungeon1.asm new file mode 100644 index 00000000..33d74e36 --- /dev/null +++ b/music/dungeon1.asm @@ -0,0 +1,676 @@ +Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) + tempo 0, 144 + stereopanning 119 + duty 3 + unknownmusic0xe8 + vibrato 10, 1, 4 + notetype 12, 4, 13 + rest 8 + unknownmusic0xee 237 + octave 4 + note F#, 8 + unknownmusic0xee 255 + +Music_Dungeon1_branch_7dee5: + notetype 12, 11, 2 + octave 3 + +Music_Dungeon1_branch_7dee8: + callchannel Music_Dungeon1_branch_7dfaa + loopchannel 3, Music_Dungeon1_branch_7dee8 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + rest 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + +Music_Dungeon1_branch_7deff: + callchannel Music_Dungeon1_branch_7dfaa + loopchannel 4, Music_Dungeon1_branch_7deff + callchannel Music_Dungeon1_branch_7dfd5 + octave 3 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + callchannel Music_Dungeon1_branch_7dfd5 + octave 3 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + callchannel Music_Dungeon1_branch_7dfd5 + octave 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + notetype 12, 12, 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + notetype 12, 12, 2 + callchannel Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C#, 3 + notetype 12, 12, 3 + octave 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 2 + note B_, 4 + notetype 12, 12, 2 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note G#, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note G#, 1 + note B_, 1 + octave 3 + note C#, 1 + note C_, 1 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + note D_, 1 + note C#, 1 + octave 2 + note A#, 1 + octave 3 + note C#, 1 + note D_, 1 + note C#, 1 + octave 2 + note A#, 1 + octave 3 + note C#, 1 + +Music_Dungeon1_branch_7df6e: + rest 16 + loopchannel 8, Music_Dungeon1_branch_7df6e + notetype 12, 12, 3 + callchannel Music_Dungeon1_branch_7dfbb + note B_, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 4 + note F#, 2 + callchannel Music_Dungeon1_branch_7dfbb + note A#, 2 + note G_, 2 + note B_, 4 + note G_, 2 + note F#, 2 + note G_, 2 + note D#, 2 + notetype 12, 12, 2 + callchannel Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C#, 3 + notetype 12, 12, 7 + octave 3 + note F#, 8 + note D#, 8 + notetype 12, 12, 2 + callchannel Music_Dungeon1_branch_7dfaa + callchannel Music_Dungeon1_branch_7dfaa + loopchannel 0, Music_Dungeon1_branch_7dee5 + +Music_Dungeon1_branch_7dfaa: + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + rest 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + rest 1 + note A#, 1 + endchannel + +Music_Dungeon1_branch_7dfbb: + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + endchannel + +Music_Dungeon1_branch_7dfc5: + octave 3 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note A#, 1 + note E_, 1 + note B_, 1 + note E_, 1 + octave 4 + note C_, 1 + endchannel + +Music_Dungeon1_branch_7dfd5: + note E_, 1 + note E_, 1 + rest 4 + octave 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + endchannel + + +Music_Dungeon1_Ch2: ; 7dfde (1f:5fde) + vibrato 11, 1, 5 + duty 3 + notetype 12, 0, 15 + octave 4 + note G#, 8 + notetype 12, 4, 13 + octave 5 + note D_, 8 + +Music_Dungeon1_branch_7dfeb: + notetype 12, 12, 2 + +Music_Dungeon1_branch_7dfed: + callchannel Music_Dungeon1_branch_7e097 + loopchannel 3, Music_Dungeon1_branch_7dfed + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note D#, 1 + +Music_Dungeon1_branch_7e006: + callchannel Music_Dungeon1_branch_7e097 + loopchannel 4, Music_Dungeon1_branch_7e006 + rest 2 + callchannel Music_Dungeon1_branch_7e0ab + octave 3 + note C_, 4 + callchannel Music_Dungeon1_branch_7e0ab + octave 3 + note C#, 4 + callchannel Music_Dungeon1_branch_7e0ab + octave 3 + note D#, 4 + notetype 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + notetype 12, 13, 2 + callchannel Music_Dungeon1_branch_7e0b5 + octave 3 + note F#, 4 + callchannel Music_Dungeon1_branch_7e0b5 + octave 3 + note G_, 4 + callchannel Music_Dungeon1_branch_7e0b5 + octave 3 + note A#, 4 + notetype 12, 13, 3 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + notetype 12, 13, 6 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + notetype 12, 13, 2 + callchannel Music_Dungeon1_branch_7e0ba + rest 10 + note E_, 1 + rest 1 + callchannel Music_Dungeon1_branch_7e0ba + rest 12 + callchannel Music_Dungeon1_branch_7e0ba + rest 12 + callchannel Music_Dungeon1_branch_7e0ba + rest 14 + notetype 12, 13, 3 + callchannel Music_Dungeon1_branch_7e0cd + note D#, 4 + callchannel Music_Dungeon1_branch_7e0cd + note D#, 2 + rest 2 + notetype 12, 13, 2 + callchannel Music_Dungeon1_branch_7e0c0 + rest 2 + octave 3 + note F#, 4 + octave 2 + note E_, 1 + note E_, 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 1 + rest 1 + note C#, 1 + rest 1 + note D_, 1 + note C#, 1 + rest 2 + octave 3 + note G_, 4 + callchannel Music_Dungeon1_branch_7e0c0 + octave 3 + note A#, 4 + notetype 12, 13, 6 + note B_, 8 + octave 4 + note D#, 8 + notetype 12, 13, 2 + callchannel Music_Dungeon1_branch_7e097 + callchannel Music_Dungeon1_branch_7e097 + loopchannel 0, Music_Dungeon1_branch_7dfeb + +Music_Dungeon1_branch_7e097: + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + rest 2 + note C_, 1 + octave 2 + note B_, 1 + endchannel + +Music_Dungeon1_branch_7e0ab: + octave 2 + note E_, 1 + note E_, 1 + rest 2 + octave 1 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + endchannel + +Music_Dungeon1_branch_7e0b5: + octave 2 + note E_, 1 + note E_, 1 + rest 10 + endchannel + +Music_Dungeon1_branch_7e0ba: + octave 1 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + endchannel + +Music_Dungeon1_branch_7e0c0: + octave 2 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note D_, 1 + rest 1 + note C#, 1 + note C_, 1 + endchannel + +Music_Dungeon1_branch_7e0cd: + octave 3 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 + octave 4 + note C_, 6 + octave 3 + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + endchannel + + +Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc) + notetype 12, 1, 1 + vibrato 8, 2, 6 + rest 14 + octave 4 + note D_, 1 + note D#, 1 + +Music_Dungeon1_branch_7e0e5: + callchannel Music_Dungeon1_branch_7e140 + callchannel Music_Dungeon1_branch_7e140 + octave 5 + note E_, 2 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + octave 4 + note F#, 4 + callchannel Music_Dungeon1_branch_7e154 + octave 4 + note G_, 4 + callchannel Music_Dungeon1_branch_7e154 + octave 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + rest 6 + callchannel Music_Dungeon1_branch_7e177 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + callchannel Music_Dungeon1_branch_7e15e + rest 12 + callchannel Music_Dungeon1_branch_7e15e + rest 12 + callchannel Music_Dungeon1_branch_7e15e + rest 10 + note E_, 1 + rest 1 + callchannel Music_Dungeon1_branch_7e15e + rest 12 + callchannel Music_Dungeon1_branch_7e15e + rest 12 + callchannel Music_Dungeon1_branch_7e15e + rest 10 + note D_, 1 + note D#, 1 + callchannel Music_Dungeon1_branch_7e164 + callchannel Music_Dungeon1_branch_7e164 + note E_, 2 + rest 4 + callchannel Music_Dungeon1_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 + rest 16 + rest 16 + loopchannel 0, Music_Dungeon1_branch_7e0e5 + +Music_Dungeon1_branch_7e140: + octave 5 + note E_, 4 + note B_, 4 + note A#, 4 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + endchannel + +Music_Dungeon1_branch_7e154: + octave 6 + note E_, 1 + note E_, 1 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + endchannel + +Music_Dungeon1_branch_7e15e: + octave 3 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + endchannel + +Music_Dungeon1_branch_7e164: + note E_, 4 + note B_, 4 + note A#, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + endchannel + +Music_Dungeon1_branch_7e177: + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G_, 4 + rest 6 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note A#, 4 + endchannel + + +Music_Dungeon1_Ch4: ; 7e18a (1f:618a) + dspeed 12 + rest 14 + dnote 1, cymbal1 + dnote 1, cymbal1 + +Music_Dungeon1_branch_7e190: + callchannel Music_Dungeon1_branch_7e1f1 + loopchannel 3, Music_Dungeon1_branch_7e190 + dnote 4, cymbal2 + dnote 4, cymbal1 + dnote 4, cymbal2 + dnote 2, cymbal1 + dnote 2, cymbal1 + +Music_Dungeon1_branch_7e1a1: + callchannel Music_Dungeon1_branch_7e1f1 + loopchannel 3, Music_Dungeon1_branch_7e1a1 + dnote 4, cymbal2 + dnote 4, cymbal1 + dnote 4, cymbal2 + dnote 4, cymbal2 + +Music_Dungeon1_branch_7e1b0: + callchannel Music_Dungeon1_branch_7e1fa + loopchannel 3, Music_Dungeon1_branch_7e1b0 + callchannel Music_Dungeon1_branch_7e202 + +Music_Dungeon1_branch_7e1ba: + callchannel Music_Dungeon1_branch_7e1fa + loopchannel 3, Music_Dungeon1_branch_7e1ba + callchannel Music_Dungeon1_branch_7e202 + dnote 4, snare7 + dnote 4, snare8 + dnote 4, snare8 + rest 2 + dnote 2, snare7 + dnote 4, cymbal2 + +Music_Dungeon1_branch_7e1cf: + rest 16 + loopchannel 13, Music_Dungeon1_branch_7e1cf + rest 12 + +Music_Dungeon1_branch_7e1d5: + callchannel Music_Dungeon1_branch_7e1fa + loopchannel 3, Music_Dungeon1_branch_7e1d5 + dnote 4, cymbal1 + dnote 4, cymbal1 + dnote 4, cymbal1 + rest 2 + dnote 1, cymbal1 + dnote 1, cymbal1 + callchannel Music_Dungeon1_branch_7e1f1 + callchannel Music_Dungeon1_branch_7e1f1 + loopchannel 0, Music_Dungeon1_branch_7e190 + +Music_Dungeon1_branch_7e1f1: + dnote 4, cymbal2 + dnote 4, cymbal1 + dnote 4, cymbal2 + dnote 4, cymbal1 + endchannel + +Music_Dungeon1_branch_7e1fa: + dnote 1, cymbal1 + dnote 1, cymbal1 + rest 10 + dnote 4, cymbal3 + endchannel + +Music_Dungeon1_branch_7e202: + dnote 4, snare7 + dnote 4, snare8 + dnote 4, snare8 + dnote 4, snare9 + endchannel +; 0x7e20b \ No newline at end of file diff --git a/music/dungeon2.asm b/music/dungeon2.asm new file mode 100644 index 00000000..6bf6eb51 --- /dev/null +++ b/music/dungeon2.asm @@ -0,0 +1,318 @@ +Music_Dungeon2_Ch1: ; 7e887 (1f:6887) + tempo 0, 144 + stereopanning 119 + duty 3 + unknownmusic0xe8 + vibrato 10, 1, 4 + +Music_Dungeon2_branch_7e892: + notetype 12, 11, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + octave 5 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + octave 3 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 4 + note F#, 2 + loopchannel 2, Music_Dungeon2_branch_7e892 + notetype 12, 1, 15 + octave 3 + note E_, 16 + note C_, 16 + note D_, 16 + octave 2 + note A#, 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + loopchannel 0, Music_Dungeon2_branch_7e892 + + +Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8) + vibrato 11, 1, 5 + +Music_Dungeon2_branch_7e8db: + duty 3 + notetype 12, 12, 2 + octave 3 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + octave 4 + note F#, 4 + note F#, 4 + note F#, 4 + note F#, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + loopchannel 2, Music_Dungeon2_branch_7e8db + octave 3 + note E_, 2 + note G_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note E_, 2 + octave 5 + note E_, 2 + rest 2 + note D#, 2 + rest 2 + note D_, 2 + rest 2 + note C#, 2 + note C_, 2 + octave 4 + note E_, 2 + note G_, 2 + octave 3 + note A#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note G_, 2 + octave 5 + note G_, 2 + rest 2 + note F#, 2 + rest 2 + note F_, 2 + rest 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + rest 16 + rest 16 + rest 16 + rest 16 + notetype 12, 12, 7 + duty 1 + octave 4 + note E_, 16 + note D_, 16 + note C_, 16 + note D_, 16 + loopchannel 0, Music_Dungeon2_branch_7e8db + + +Music_Dungeon2_Ch3: ; 7e93b (1f:693b) + notetype 12, 1, 3 + vibrato 8, 2, 6 + +Music_Dungeon2_branch_7e940: + callchannel Music_Dungeon2_branch_7e9d1 + loopchannel 16, Music_Dungeon2_branch_7e940 + note E_, 4 + rest 4 + rest 4 + note E_, 4 + note C_, 4 + rest 4 + rest 4 + note C_, 4 + note D_, 4 + rest 4 + rest 4 + note D_, 4 + octave 3 + note A#, 4 + rest 4 + rest 4 + note A#, 4 + +Music_Dungeon2_branch_7e958: + octave 5 + note E_, 2 + rest 2 + note B_, 2 + rest 2 + note A#, 2 + rest 2 + octave 6 + note D_, 2 + rest 2 + note C#, 2 + rest 2 + octave 5 + note G#, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note A#, 2 + rest 2 + note E_, 2 + rest 2 + note D#, 2 + rest 2 + note A_, 2 + rest 2 + note G#, 2 + rest 2 + note E_, 2 + rest 2 + note F#, 2 + rest 2 + note D#, 2 + rest 2 + loopchannel 3, Music_Dungeon2_branch_7e958 + octave 4 + note E_, 4 + note B_, 4 + note A#, 4 + octave 5 + note D_, 4 + note C#, 4 + octave 4 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + octave 3 + note E_, 16 + note C_, 16 + note D_, 16 + octave 2 + note A#, 16 + octave 3 + note E_, 16 + note F_, 16 + note G_, 16 + octave 3 + note B_, 16 + rest 16 + rest 16 + rest 16 + rest 16 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + loopchannel 0, Music_Dungeon2_branch_7e940 + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 + rest 2 + endchannel + +Music_Dungeon2_branch_7e9d1: + octave 4 + note E_, 2 + rest 4 + octave 3 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + octave 4 + note F#, 4 + endchannel + + +Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc) + dspeed 12 + +Music_Dungeon2_branch_7e9dd: + dnote 4, cymbal1 + dnote 4, cymbal2 + dnote 4, cymbal1 + dnote 4, snare8 + dnote 4, cymbal1 + dnote 4, cymbal2 + dnote 4, snare9 + dnote 4, snare7 + loopchannel 0, Music_Dungeon2_branch_7e9dd +; 0x7e9f1 \ No newline at end of file diff --git a/music/dungeon3.asm b/music/dungeon3.asm new file mode 100644 index 00000000..4f7eb74d --- /dev/null +++ b/music/dungeon3.asm @@ -0,0 +1,757 @@ +Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1) + tempo 0, 160 + stereopanning 119 + duty 3 + unknownmusic0xe8 + vibrato 8, 1, 4 + +Music_Dungeon3_branch_7e9fc: + notetype 12, 12, 3 + +Music_Dungeon3_branch_7e9fe: + callchannel Music_Dungeon3_branch_7eab2 + loopchannel 3, Music_Dungeon3_branch_7e9fe + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 + +Music_Dungeon3_branch_7ea11: + callchannel Music_Dungeon3_branch_7eac1 + loopchannel 4, Music_Dungeon3_branch_7ea11 + +Music_Dungeon3_branch_7ea18: + callchannel Music_Dungeon3_branch_7eab2 + loopchannel 4, Music_Dungeon3_branch_7ea18 + octave 4 + note F_, 2 + note F_, 2 + rest 2 + note F_, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note D#, 2 + rest 2 + note D#, 2 + note D_, 2 + note D_, 2 + callchannel Music_Dungeon3_branch_7eafc + octave 4 + note D_, 2 + note D_, 2 + rest 2 + note D_, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note E_, 2 + rest 2 + note E_, 2 + note F_, 2 + note F_, 2 + +Music_Dungeon3_branch_7ea3c: + callchannel Music_Dungeon3_branch_7eace + loopchannel 4, Music_Dungeon3_branch_7ea3c + +Music_Dungeon3_branch_7ea43: + callchannel Music_Dungeon3_branch_7eadd + loopchannel 3, Music_Dungeon3_branch_7ea43 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + callchannel Music_Dungeon3_branch_7eaea + callchannel Music_Dungeon3_branch_7eaea + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + rest 16 + rest 8 + callchannel Music_Dungeon3_branch_7eaf7 + callchannel Music_Dungeon3_branch_7eaf7 + callchannel Music_Dungeon3_branch_7eaf7 + callchannel Music_Dungeon3_branch_7eaf7 + note D#, 2 + rest 16 + rest 16 + loopchannel 0, Music_Dungeon3_branch_7e9fc + +Music_Dungeon3_branch_7eab2: + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + endchannel + +Music_Dungeon3_branch_7eac1: + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G#, 2 + endchannel + +Music_Dungeon3_branch_7eace: + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note D#, 2 + octave 2 + note B_, 2 + endchannel + +Music_Dungeon3_branch_7eadd: + note A_, 2 + note F_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + endchannel + +Music_Dungeon3_branch_7eaea: + octave 3 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + endchannel + +Music_Dungeon3_branch_7eaf7: + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + endchannel + +Music_Dungeon3_branch_7eafc: + tempo 0, 168 + octave 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + tempo 0, 176 + octave 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + tempo 0, 184 + octave 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + tempo 0, 192 + octave 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + tempo 0, 200 + octave 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + tempo 0, 208 + octave 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + tempo 0, 216 + octave 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + tempo 0, 224 + octave 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + tempo 0, 160 + endchannel + + +Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68) + vibrato 11, 1, 5 + duty 3 + +Music_Dungeon3_branch_7eb6d: + notetype 12, 13, 3 + octave 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 + rest 2 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 6 + note F#, 6 + note E_, 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 + rest 2 + note G#, 2 + note G#, 2 + rest 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A#, 2 + note A#, 2 + rest 2 + note A#, 2 + note B_, 2 + note B_, 2 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + rest 8 + octave 4 + note B_, 2 + note B_, 2 + rest 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A_, 2 + note A_, 2 + rest 2 + note A_, 2 + note G#, 2 + note G#, 2 + note C#, 8 + rest 2 + octave 3 + note B_, 6 + note A#, 2 + note B_, 2 + octave 4 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 6 + note G_, 6 + octave 3 + note G_, 8 + rest 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note G_, 6 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note G_, 6 + note A_, 6 + octave 4 + note C#, 6 + note G_, 8 + rest 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G_, 6 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G_, 6 + note A_, 6 + octave 5 + note C#, 6 + octave 4 + note F#, 8 + rest 2 + note E_, 6 + note D#, 2 + note E_, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note G#, 6 + octave 5 + note C_, 6 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 2 + note E_, 2 + note G#, 2 + octave 3 + note C_, 2 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + loopchannel 0, Music_Dungeon3_branch_7eb6d + + +Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) + notetype 12, 1, 2 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 12 + notetype 6, 1, 0 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + rest 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + rest 16 + rest 16 + rest 10 + octave 5 + note E_, 8 + octave 4 + note B_, 8 + octave 5 + note D#, 8 + octave 4 + note A#, 8 + octave 5 + note D_, 8 + octave 4 + note A_, 8 + octave 5 + note C#, 8 + octave 4 + note G#, 8 + octave 5 + note C_, 8 + octave 4 + note G_, 8 + note B_, 8 + note F#, 8 + note A#, 8 + note F_, 8 + note A_, 8 + note E_, 8 + rest 16 + rest 16 + rest 8 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + rest 2 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + rest 10 + rest 16 + notetype 12, 1, 0 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 10 + loopchannel 0, Music_Dungeon3_Ch3 + + +Music_Dungeon3_Ch4: ; 7ece4 (1f:6ce4) + dspeed 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 10 + endchannel +; 0x7ed0f \ No newline at end of file diff --git a/music/finalbattle.asm b/music/finalbattle.asm new file mode 100644 index 00000000..d3c45a90 --- /dev/null +++ b/music/finalbattle.asm @@ -0,0 +1,1345 @@ +Music_FinalBattle_Ch1: ; 233a6 (8:73a6) + tempo 0, 112 + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 2 + octave 3 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + notetype 12, 10, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + notetype 12, 9, 2 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + notetype 12, 8, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + notetype 12, 12, 1 + octave 3 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note F_, 1 + note F_, 7 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note G#, 1 + note G#, 3 + note D#, 4 + notetype 12, 12, 1 + note E_, 1 + note E_, 3 + notetype 12, 11, 3 + note E_, 4 + notetype 12, 12, 1 + note F_, 1 + note F_, 3 + notetype 12, 11, 3 + note F_, 4 + notetype 12, 12, 1 + note G_, 1 + note G_, 3 + notetype 12, 11, 3 + note G_, 4 + notetype 12, 12, 1 + note F_, 1 + note F_, 3 + notetype 12, 11, 3 + note F_, 4 + notetype 12, 12, 1 + note E_, 1 + note E_, 3 + notetype 12, 11, 3 + note E_, 4 + notetype 12, 12, 1 + note F_, 1 + note F_, 3 + notetype 12, 11, 3 + note F_, 4 + notetype 12, 12, 1 + note G_, 1 + note G_, 3 + notetype 12, 11, 3 + note G_, 4 + notetype 12, 12, 1 + note G#, 1 + note G#, 3 + notetype 12, 11, 7 + note D#, 4 + +Music_FinalBattle_branch_23429: + notetype 12, 11, 7 + octave 3 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 4 + notetype 12, 11, 1 + note F#, 2 + note F_, 1 + note F#, 1 + note A_, 1 + note F#, 2 + note F#, 1 + notetype 12, 11, 7 + octave 2 + note B_, 6 + notetype 12, 10, 0 + octave 3 + note D_, 6 + notetype 12, 11, 7 + note F#, 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 12 + note A#, 4 + notetype 12, 5, 14 + note B_, 12 + notetype 12, 11, 2 + note E_, 3 + note E_, 3 + note E_, 2 + note E_, 1 + note F#, 1 + note E_, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + notetype 12, 12, 2 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + notetype 12, 13, 2 + note E_, 1 + note F#, 1 + note B_, 1 + notetype 12, 12, 1 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + notetype 12, 11, 5 + note D_, 4 + notetype 12, 12, 1 + note E_, 1 + note E_, 3 + notetype 12, 11, 5 + note F_, 4 + notetype 12, 12, 1 + note E_, 1 + note E_, 3 + notetype 12, 11, 5 + note D_, 4 + notetype 12, 12, 1 + note E_, 1 + notetype 12, 11, 7 + note E_, 7 + notetype 12, 12, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 1 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note F#, 2 + octave 4 + note C#, 1 + note C_, 3 + octave 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + notetype 12, 11, 7 + octave 4 + note C_, 2 + notetype 12, 11, 0 + note C#, 8 + notetype 12, 11, 7 + note C#, 8 + notetype 12, 10, 0 + octave 3 + note F#, 8 + note F#, 8 + notetype 12, 11, 0 + octave 3 + note A_, 8 + notetype 12, 11, 7 + note A_, 8 + note G_, 4 + note B_, 12 + notetype 12, 11, 0 + note A_, 8 + notetype 12, 11, 7 + note A_, 8 + notetype 12, 11, 0 + note E_, 8 + notetype 12, 11, 7 + note E_, 8 + notetype 12, 11, 0 + note A#, 8 + notetype 12, 11, 7 + note A#, 8 + octave 4 + note F_, 8 + octave 3 + note A#, 8 + octave 4 + note C#, 4 + note E_, 12 + octave 3 + note A_, 4 + octave 4 + note C#, 12 + notetype 12, 4, 0 + callchannel Music_FinalBattle_branch_23710 + callchannel Music_FinalBattle_branch_23710 + notetype 12, 11, 7 + octave 3 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 12 + notetype 12, 11, 0 + note A_, 8 + note G_, 8 + notetype 12, 11, 7 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 12 + notetype 12, 11, 0 + note A_, 8 + notetype 12, 11, 7 + octave 4 + note C_, 8 + notetype 12, 11, 0 + octave 3 + note B_, 8 + notetype 12, 11, 7 + note B_, 8 + notetype 12, 11, 0 + octave 4 + note E_, 8 + notetype 12, 11, 7 + note E_, 8 + loopchannel 0, Music_FinalBattle_branch_23429 + + +Music_FinalBattle_Ch2: ; 2356a (8:756a) + duty 3 + vibrato 8, 2, 5 + notetype 12, 12, 2 + octave 5 + note C_, 1 + octave 4 + note G#, 1 + note B_, 1 + note F#, 1 + note A_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note D#, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + octave 5 + note C_, 1 + octave 4 + note C_, 1 + octave 3 + note G#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + octave 3 + note G#, 1 + note D#, 1 + note G_, 1 + note D_, 1 + note F_, 1 + note C#, 1 + note E_, 1 + octave 5 + note C_, 1 + notetype 12, 12, 1 + octave 4 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + notetype 12, 12, 2 + octave 5 + note E_, 4 + notetype 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + notetype 12, 12, 2 + octave 5 + note E_, 4 + notetype 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + notetype 12, 12, 2 + octave 5 + note E_, 4 + notetype 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + notetype 12, 12, 2 + note D#, 4 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + notetype 12, 12, 1 + octave 4 + note E_, 1 + note E_, 3 + notetype 12, 4, 10 + octave 3 + note G#, 4 + +Music_FinalBattle_branch_235e6: + notetype 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + notetype 12, 13, 7 + note A#, 4 + note B_, 12 + notetype 12, 11, 1 + note F_, 2 + note F#, 3 + note A_, 1 + note B_, 1 + note A_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 2 + note A_, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note A#, 1 + notetype 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + notetype 12, 13, 7 + note A#, 4 + note B_, 12 + octave 4 + note D#, 4 + note E_, 12 + notetype 12, 10, 0 + octave 3 + note B_, 8 + octave 4 + note D_, 8 + note F_, 8 + note D_, 8 + notetype 12, 13, 1 + note E_, 1 + note E_, 3 + notetype 12, 12, 4 + octave 3 + note D_, 4 + notetype 12, 13, 1 + octave 4 + note E_, 1 + note E_, 3 + notetype 12, 12, 4 + octave 3 + note F_, 4 + notetype 12, 13, 1 + octave 4 + note E_, 1 + note E_, 3 + notetype 12, 12, 4 + octave 3 + note D_, 4 + notetype 12, 13, 1 + octave 4 + note E_, 1 + note E_, 1 + notetype 12, 12, 4 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + notetype 12, 12, 2 + octave 4 + note E_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note F_, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note E_, 1 + notetype 12, 12, 4 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + notetype 12, 13, 7 + octave 4 + note E_, 4 + note F_, 2 + note F#, 12 + notetype 12, 12, 2 + octave 3 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 4 + note B_, 2 + notetype 12, 13, 7 + octave 4 + note F_, 4 + note F#, 2 + note G_, 12 + notetype 12, 12, 2 + note C_, 2 + note C_, 4 + note C_, 2 + note C_, 4 + note C_, 2 + notetype 12, 13, 7 + note F#, 4 + note G_, 2 + note G#, 12 + notetype 12, 8, 2 + note C#, 2 + note C#, 4 + notetype 12, 10, 2 + note C#, 2 + note C#, 4 + note C#, 4 + notetype 12, 13, 2 + note C#, 2 + note C#, 4 + notetype 12, 15, 2 + note C#, 2 + note C#, 4 + notetype 12, 12, 4 + note E_, 1 + note F_, 1 + notetype 12, 12, 0 + note F#, 12 + notetype 12, 12, 7 + note F#, 4 + notetype 12, 1, 15 + octave 3 + note F#, 8 + notetype 12, 9, 0 + note F#, 8 + notetype 12, 12, 7 + octave 4 + note C#, 4 + notetype 12, 12, 0 + note D_, 12 + note D_, 8 + notetype 12, 12, 7 + note D_, 8 + notetype 12, 12, 0 + note E_, 8 + notetype 12, 12, 7 + note E_, 8 + notetype 12, 12, 0 + octave 3 + note A_, 8 + notetype 12, 12, 7 + note A_, 8 + notetype 12, 12, 0 + octave 4 + note F_, 8 + notetype 12, 12, 7 + note F_, 8 + octave 5 + note C_, 8 + octave 4 + note A#, 8 + notetype 12, 12, 0 + note A_, 16 + note A_, 8 + notetype 12, 12, 7 + note A_, 8 + notetype 12, 12, 5 + callchannel Music_FinalBattle_branch_23710 + notetype 12, 11, 1 + callchannel Music_FinalBattle_branch_23710 + notetype 12, 13, 7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 4 + note B_, 12 + notetype 12, 12, 7 + octave 4 + note D_, 8 + notetype 12, 4, 12 + note C_, 8 + notetype 12, 13, 7 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 4 + note B_, 12 + notetype 12, 5, 13 + octave 4 + note D_, 8 + notetype 12, 12, 0 + note F_, 8 + notetype 12, 12, 0 + note E_, 8 + notetype 12, 12, 7 + note E_, 8 + note A#, 4 + note B_, 12 + loopchannel 0, Music_FinalBattle_branch_235e6 + +Music_FinalBattle_branch_23704: + octave 4 + note E_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note E_, 1 + note C_, 1 + octave 4 + note G_, 1 + note F_, 1 + endchannel + +Music_FinalBattle_branch_23710: + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + note F#, 2 + note D_, 2 + endchannel + + +Music_FinalBattle_Ch3: ; 2371c (8:771c) + notetype 12, 1, 1 + octave 4 + note E_, 4 + octave 5 + note E_, 4 + octave 4 + note F_, 4 + octave 5 + note D#, 4 + octave 4 + note G_, 4 + octave 5 + note D_, 4 + octave 4 + note G#, 4 + note B_, 4 + note E_, 1 + note E_, 1 + rest 6 + note E_, 1 + note E_, 1 + rest 6 + note E_, 1 + note E_, 1 + rest 6 + note E_, 1 + note E_, 1 + rest 2 + note D#, 4 + note E_, 1 + note E_, 1 + rest 2 + note B_, 4 + note E_, 1 + note E_, 1 + rest 2 + octave 5 + note C_, 4 + octave 4 + note E_, 1 + note E_, 1 + rest 2 + octave 5 + note D_, 4 + octave 4 + note E_, 1 + note E_, 1 + octave 5 + note C_, 4 + octave 4 + note A#, 2 + note E_, 1 + note E_, 1 + rest 2 + note B_, 4 + note E_, 1 + note E_, 1 + rest 2 + octave 5 + note C_, 4 + octave 4 + note E_, 1 + note E_, 1 + rest 2 + octave 5 + note D_, 4 + octave 4 + note E_, 1 + note E_, 1 + octave 5 + note C_, 4 + note D_, 2 + octave 4 + note E_, 1 + note E_, 1 + rest 2 + note B_, 4 + note E_, 1 + note E_, 1 + rest 2 + octave 5 + note C_, 4 + octave 4 + note E_, 1 + note E_, 1 + rest 2 + octave 5 + note D_, 4 + octave 4 + note E_, 1 + note E_, 1 + rest 2 + note E_, 1 + note D#, 1 + note E_, 1 + note G_, 1 + +Music_FinalBattle_branch_2377d: + octave 4 + note E_, 1 + octave 3 + note E_, 1 + rest 2 + octave 4 + note F#, 4 + note D#, 1 + octave 3 + note D#, 1 + rest 2 + octave 4 + note F_, 4 + note D_, 1 + octave 3 + note D_, 1 + rest 2 + octave 4 + note E_, 4 + note F#, 1 + octave 3 + note F#, 1 + rest 2 + octave 4 + note F#, 4 + note F_, 4 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + note E_, 1 + octave 3 + note E_, 1 + rest 2 + octave 4 + note F#, 4 + note D#, 1 + octave 3 + note D#, 1 + rest 2 + octave 4 + note F_, 4 + note D_, 1 + octave 3 + note D_, 1 + rest 2 + octave 4 + note E_, 4 + note F#, 1 + octave 3 + note F#, 1 + rest 2 + octave 4 + note F#, 4 + note F_, 4 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 1 + note E_, 1 + rest 2 + note D_, 4 + note E_, 1 + note E_, 1 + rest 2 + note F_, 4 + note E_, 1 + note E_, 1 + rest 2 + note D_, 4 + note E_, 1 + note E_, 1 + octave 3 + note B_, 6 + octave 4 + note E_, 1 + note E_, 1 + rest 2 + note D_, 4 + note E_, 1 + note E_, 1 + rest 2 + note F_, 4 + note E_, 1 + note E_, 1 + rest 2 + note D_, 4 + note E_, 1 + note E_, 1 + octave 3 + note B_, 6 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + octave 5 + note C#, 2 + octave 4 + note B_, 2 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note C_, 2 + note C_, 2 + octave 4 + note F_, 2 + octave 5 + note C_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + callchannel Music_FinalBattle_branch_2395b + callchannel Music_FinalBattle_branch_2395b + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + callchannel Music_FinalBattle_branch_2396c + callchannel Music_FinalBattle_branch_2396c + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 4 + note A#, 2 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + note F_, 2 + note E_, 2 + note B_, 2 + octave 5 + note E_, 4 + octave 4 + note E_, 2 + note B_, 2 + octave 5 + note D#, 4 + octave 4 + note E_, 2 + note B_, 2 + octave 5 + note D_, 4 + octave 4 + note E_, 2 + note A_, 2 + note B_, 4 + loopchannel 0, Music_FinalBattle_branch_2377d + +Music_FinalBattle_branch_2395b: + octave 4 + note F#, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + endchannel + +Music_FinalBattle_branch_2396c: + octave 4 + note A_, 2 + octave 5 + note E_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + endchannel +; 0x2397d \ No newline at end of file diff --git a/music/gamecorner.asm b/music/gamecorner.asm new file mode 100644 index 00000000..15379284 --- /dev/null +++ b/music/gamecorner.asm @@ -0,0 +1,628 @@ +Music_GameCorner_Ch1: ; 7e20b (1f:620b) + tempo 0, 120 + stereopanning 119 + duty 3 + vibrato 12, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 5 + octave 3 + note A_, 6 + notetype 12, 11, 1 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 + +Music_GameCorner_branch_7e222: + notetype 12, 11, 5 + octave 3 + note C#, 4 + octave 2 + note G#, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + notetype 12, 10, 7 + note G#, 2 + note A_, 2 + note B_, 2 + notetype 12, 11, 5 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + notetype 12, 10, 7 + note F#, 8 + note D#, 8 + notetype 12, 11, 5 + note D#, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + notetype 12, 11, 7 + octave 4 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 6 + note C#, 2 + octave 3 + note D#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + notetype 12, 9, 7 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 2 + notetype 12, 11, 7 + note F#, 8 + notetype 12, 11, 5 + note C#, 4 + octave 2 + note G#, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + notetype 12, 11, 7 + note G#, 2 + note A_, 2 + note B_, 2 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 8 + notetype 12, 9, 7 + note D#, 4 + note C#, 4 + notetype 12, 11, 5 + note D#, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + notetype 12, 11, 7 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + notetype 12, 12, 2 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note E_, 2 + note E_, 4 + note E_, 4 + notetype 12, 11, 7 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D_, 2 + note D#, 10 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + notetype 12, 11, 5 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note D#, 4 + notetype 12, 11, 7 + note E_, 3 + note D#, 1 + notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 10 + notetype 12, 11, 7 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D_, 2 + note D#, 10 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + notetype 12, 11, 5 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note A_, 4 + notetype 12, 11, 7 + note G#, 2 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 8 + loopchannel 0, Music_GameCorner_branch_7e222 + + +Music_GameCorner_Ch2: ; 7e2df (1f:62df) + duty 2 + vibrato 10, 2, 3 + notetype 12, 12, 6 + octave 4 + note C#, 6 + notetype 12, 12, 1 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + duty 3 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 8 + +Music_GameCorner_branch_7e2fa: + duty 2 + notetype 12, 12, 7 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 16 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + notetype 12, 12, 1 + note E_, 2 + notetype 12, 10, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 2 + notetype 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + notetype 12, 12, 5 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note A_, 4 + note G#, 3 + note A_, 1 + notetype 12, 12, 2 + note G#, 2 + note F#, 2 + note E_, 2 + notetype 12, 12, 7 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + note B_, 16 + loopchannel 0, Music_GameCorner_branch_7e2fa + + +Music_GameCorner_Ch3: ; 7e38b (1f:638b) + notetype 12, 1, 3 + octave 5 + note C#, 1 + rest 5 + octave 4 + note F#, 1 + rest 1 + note G#, 1 + rest 1 + note A_, 1 + rest 1 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note B_, 1 + rest 9 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + +Music_GameCorner_branch_7e3a5: + callchannel Music_GameCorner_branch_7e418 + callchannel Music_GameCorner_branch_7e42d + callchannel Music_GameCorner_branch_7e442 + callchannel Music_GameCorner_branch_7e457 + callchannel Music_GameCorner_branch_7e46c + callchannel Music_GameCorner_branch_7e481 + callchannel Music_GameCorner_branch_7e496 + note D#, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + note D#, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + callchannel Music_GameCorner_branch_7e418 + callchannel Music_GameCorner_branch_7e42d + callchannel Music_GameCorner_branch_7e442 + callchannel Music_GameCorner_branch_7e457 + callchannel Music_GameCorner_branch_7e46c + callchannel Music_GameCorner_branch_7e481 + callchannel Music_GameCorner_branch_7e496 + note E_, 1 + rest 3 + octave 3 + note B_, 1 + rest 3 + octave 4 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note B_, 1 + rest 1 + callchannel Music_GameCorner_branch_7e46c + callchannel Music_GameCorner_branch_7e418 + callchannel Music_GameCorner_branch_7e4ab + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + callchannel Music_GameCorner_branch_7e46c + callchannel Music_GameCorner_branch_7e418 + callchannel Music_GameCorner_branch_7e4ab + callchannel Music_GameCorner_branch_7e42d + loopchannel 0, Music_GameCorner_branch_7e3a5 + +Music_GameCorner_branch_7e418: + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e42d: + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e442: + note E_, 1 + rest 1 + note B_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e457: + note D#, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + note D#, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e46c: + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e481: + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e496: + note F#, 1 + rest 1 + note B_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + endchannel + +Music_GameCorner_branch_7e4ab: + note F#, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + endchannel +; 0x7e4c0 \ No newline at end of file diff --git a/music/gym.asm b/music/gym.asm new file mode 100644 index 00000000..a024f052 --- /dev/null +++ b/music/gym.asm @@ -0,0 +1,358 @@ +Music_Gym_Ch1: ; bcbb (2:7cbb) + tempo 0, 138 + stereopanning 119 + duty 3 + vibrato 8, 2, 2 + unknownmusic0xe8 + notetype 12, 11, 5 + octave 3 + note G_, 6 + note C_, 1 + note G_, 1 + note F_, 6 + octave 2 + note A#, 1 + octave 3 + note F_, 1 + note E_, 6 + octave 2 + note A_, 1 + octave 3 + note E_, 1 + note F_, 4 + note G_, 4 + +Music_Gym_branch_bcd8: + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + notetype 12, 11, 1 + note D_, 3 + notetype 12, 11, 5 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + notetype 12, 11, 1 + note A#, 3 + notetype 12, 11, 5 + note F_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note A#, 2 + note F_, 1 + note A#, 1 + octave 4 + note D_, 4 + octave 3 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note C_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note C_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note D_, 2 + note E_, 2 + note F_, 2 + note F_, 2 + note G_, 2 + note E_, 1 + note G_, 1 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_Gym_branch_bcd8 + + +Music_Gym_Ch2: ; bd6b (2:7d6b) + duty 3 + vibrato 10, 2, 5 + notetype 12, 12, 7 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note A#, 6 + note F_, 1 + note A#, 1 + notetype 12, 10, 0 + note A_, 12 + notetype 12, 12, 7 + note B_, 4 + +Music_Gym_branch_bd82: + octave 4 + note C_, 12 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + notetype 12, 12, 2 + note D_, 3 + octave 3 + note A#, 1 + notetype 12, 12, 7 + note A#, 12 + octave 4 + note C_, 12 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + notetype 12, 12, 4 + octave 3 + note A#, 2 + notetype 12, 12, 7 + note A#, 1 + octave 4 + note C_, 1 + note D_, 12 + note E_, 12 + note D_, 2 + note E_, 2 + notetype 12, 12, 2 + note F_, 3 + note D_, 1 + notetype 12, 12, 7 + note D_, 4 + notetype 12, 12, 2 + note A#, 3 + note F_, 1 + notetype 12, 12, 7 + note F_, 4 + note E_, 12 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 1 + note F_, 1 + note A#, 12 + octave 3 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + notetype 12, 12, 3 + note E_, 2 + notetype 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 6 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A#, 4 + note A_, 4 + note G_, 4 + note C_, 2 + note D_, 2 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + notetype 12, 12, 3 + note E_, 2 + notetype 12, 12, 7 + note E_, 1 + note F_, 1 + note G_, 4 + notetype 12, 12, 3 + note G_, 2 + notetype 12, 12, 7 + note G_, 1 + note A_, 1 + note A#, 4 + notetype 12, 12, 4 + octave 4 + note C_, 2 + notetype 12, 12, 7 + note C_, 1 + note D_, 1 + note E_, 12 + loopchannel 0, Music_Gym_branch_bd82 + + +Music_Gym_Ch3: ; bdfa (2:7dfa) + notetype 12, 1, 1 + rest 16 + rest 10 + octave 4 + note G_, 2 + note F_, 2 + note D_, 2 + +Music_Gym_branch_be02: + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be44 + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be44 + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be44 + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be44 + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be4d + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be4d + callchannel Music_Gym_branch_be3b + callchannel Music_Gym_branch_be4d + callchannel Music_Gym_branch_be3b + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note F_, 2 + loopchannel 0, Music_Gym_branch_be02 + +Music_Gym_branch_be3b: + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + endchannel + +Music_Gym_branch_be44: + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + endchannel + +Music_Gym_branch_be4d: + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + endchannel +; 0xbe56 \ No newline at end of file diff --git a/music/gymleaderbattle.asm b/music/gymleaderbattle.asm new file mode 100644 index 00000000..04cb09be --- /dev/null +++ b/music/gymleaderbattle.asm @@ -0,0 +1,1401 @@ +Music_GymLeaderBattle_Ch1: ; 22370 (8:6370) + tempo 0, 104 + stereopanning 119 + duty 3 + vibrato 8, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 3 + rest 6 + octave 3 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + octave 2 + note F#, 1 + rest 15 + note F#, 1 + rest 9 + note G_, 6 + note F#, 1 + rest 15 + note F#, 1 + rest 9 + note F_, 6 + note F#, 1 + rest 15 + note F#, 1 + rest 9 + note G_, 6 + note F#, 1 + rest 15 + note F#, 1 + rest 9 + note A_, 6 + +Music_GymLeaderBattle_branch_223b0: + note F#, 1 + octave 3 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 2 + note E_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + note F#, 1 + octave 3 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 2 + note E_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + rest 2 + octave 1 + note B_, 1 + rest 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note E_, 4 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + rest 1 + octave 2 + note C#, 2 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note E_, 4 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 2 + note C#, 2 + octave 1 + note B_, 2 + note A_, 2 + octave 2 + note C#, 2 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + rest 16 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + notetype 12, 11, 5 + octave 3 + note C#, 12 + notetype 12, 11, 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + notetype 12, 11, 5 + octave 3 + note A_, 12 + notetype 12, 11, 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note F#, 2 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + notetype 12, 11, 5 + octave 3 + note A_, 12 + notetype 12, 11, 3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + notetype 12, 11, 5 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note E_, 2 + note D#, 4 + note C#, 6 + rest 16 + rest 10 + note E_, 6 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note E_, 4 + note D#, 2 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note E_, 6 + loopchannel 0, Music_GymLeaderBattle_branch_223b0 + + +Music_GymLeaderBattle_Ch2: ; 225a1 (8:65a1) + duty 3 + vibrato 8, 2, 5 + notetype 12, 12, 3 + octave 4 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + rest 5 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + note A#, 6 + octave 3 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + rest 15 + note B_, 1 + rest 9 + octave 4 + note C#, 6 + +Music_GymLeaderBattle_branch_225e0: + notetype 12, 12, 5 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + notetype 12, 11, 7 + duty 2 + octave 3 + note A_, 8 + octave 4 + note C#, 8 + note E_, 8 + note C#, 8 + notetype 12, 12, 5 + duty 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + notetype 12, 11, 7 + duty 2 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + notetype 12, 12, 3 + octave 4 + note E_, 4 + note E_, 2 + note C#, 2 + notetype 12, 12, 5 + duty 3 + octave 1 + note B_, 1 + rest 3 + octave 3 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + rest 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + rest 4 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + rest 2 + note E_, 1 + note C#, 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + rest 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + rest 4 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + rest 1 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + note C#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + octave 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + notetype 12, 11, 0 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note G_, 4 + notetype 12, 11, 0 + note F#, 8 + notetype 12, 11, 7 + note F#, 8 + notetype 12, 12, 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + notetype 12, 11, 0 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + notetype 12, 11, 0 + octave 3 + note B_, 16 + notetype 12, 3, 15 + octave 4 + note F#, 16 + notetype 12, 12, 3 + duty 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + notetype 12, 12, 7 + octave 3 + note A_, 12 + notetype 12, 12, 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + notetype 12, 12, 7 + octave 4 + note C#, 12 + notetype 12, 11, 0 + note D#, 16 + notetype 12, 11, 7 + note D#, 16 + notetype 12, 12, 3 + octave 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + notetype 12, 12, 7 + octave 4 + note C#, 12 + notetype 12, 12, 0 + note A_, 8 + note E_, 8 + note B_, 16 + notetype 12, 12, 7 + note B_, 16 + notetype 12, 12, 4 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + rest 2 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + notetype 12, 12, 0 + note B_, 16 + note F#, 16 + note A_, 16 + octave 5 + note C#, 8 + rest 2 + notetype 12, 12, 3 + octave 4 + note A_, 6 + loopchannel 0, Music_GymLeaderBattle_branch_225e0 + + +Music_GymLeaderBattle_Ch3: ; 226ef (8:66ef) + vibrato 0, 2, 0 + notetype 12, 1, 3 + rest 12 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F_, 6 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 6 + notetype 12, 1, 4 + +Music_GymLeaderBattle_branch_227b1: + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note E_, 4 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 2 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note E_, 4 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note B_, 1 + rest 1 + note B_, 1 + rest 13 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note C#, 12 + octave 3 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note E_, 12 + note D#, 16 + octave 3 + note B_, 16 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 4 + note E_, 12 + note C#, 8 + note E_, 8 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 6 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note G_, 6 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 6 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note G_, 6 + loopchannel 0, Music_GymLeaderBattle_branch_227b1 +; 0x22919 \ No newline at end of file diff --git a/music/halloffame.asm b/music/halloffame.asm new file mode 100644 index 00000000..820e6ab0 --- /dev/null +++ b/music/halloffame.asm @@ -0,0 +1,97 @@ +Music_HallOfFame_Ch1: ; 7fbaf (1f:7baf) + tempo 0, 112 + stereopanning 119 + duty 3 + vibrato 12, 2, 2 + unknownmusic0xe8 + notetype 12, 11, 3 + rest 16 + rest 16 + rest 16 + rest 12 + octave 3 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + +Music_HallOfFame_branch_7fbc5: + notetype 12, 8, 0 + octave 4 + note C_, 16 + note E_, 16 + note F#, 16 + notetype 12, 6, 0 + note F_, 16 + loopchannel 3, Music_HallOfFame_branch_7fbc5 + rest 16 + rest 16 + rest 16 + rest 16 + loopchannel 0, Music_HallOfFame_branch_7fbc5 + + +Music_HallOfFame_Ch2: ; 7fbda (1f:7bda) + vibrato 8, 2, 5 + duty 3 + +Music_HallOfFame_branch_7fbdf: + notetype 12, 12, 4 + octave 3 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note F_, 2 + note C_, 2 + note F_, 2 + note A#, 4 + note A_, 4 + note F_, 2 + loopchannel 0, Music_HallOfFame_branch_7fbdf + + +Music_HallOfFame_Ch3: ; 7fbfc (1f:7bfc) + notetype 12, 1, 2 + +Music_HallOfFame_branch_7fbfe: + octave 4 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + loopchannel 12, Music_HallOfFame_branch_7fbfe + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note F#, 4 + note A_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + loopchannel 0, Music_HallOfFame_Ch3 +; 0x7fc1f \ No newline at end of file diff --git a/music/headers/musicheaders02.asm b/music/headers/musicheaders02.asm new file mode 100644 index 00000000..be7e78e0 --- /dev/null +++ b/music/headers/musicheaders02.asm @@ -0,0 +1,186 @@ +Music_PalletTown: ; 822e (2:422e) + db ( $80 | CH0 ) + dw Music_PalletTown_Ch1 + db CH1 + dw Music_PalletTown_Ch2 + db CH2 + dw Music_PalletTown_Ch3 + +Music_Pokecenter: ; 8237 (2:4237) + db ( $80 | CH0 ) + dw Music_Pokecenter_Ch1 + db CH1 + dw Music_Pokecenter_Ch2 + db CH2 + dw Music_Pokecenter_Ch3 + +Music_Gym: ; 8240 (2:4240) + db ( $80 | CH0 ) + dw Music_Gym_Ch1 + db CH1 + dw Music_Gym_Ch2 + db CH2 + dw Music_Gym_Ch3 + +; Viridian City, Pewter City, Saffron City +Music_Cities1: ; 8249 (2:4249) + db ( $C0 | CH0 ) + dw Music_Cities1_Ch1 + db CH1 + dw Music_Cities1_Ch2 + db CH2 + dw Music_Cities1_Ch3 + db CH3 + dw Music_Cities1_Ch4 + +; Cerulean City, Fuchsia City +Music_Cities2: ; 8255 (2:4255) + db ( $80 | CH0 ) + dw Music_Cities2_Ch1 + db CH1 + dw Music_Cities2_Ch2 + db CH2 + dw Music_Cities2_Ch3 + +Music_Celadon: ; 825e (2:425e) + db ( $80 | CH0 ) + dw Music_Celadon_Ch1 + db CH1 + dw Music_Celadon_Ch2 + db CH2 + dw Music_Celadon_Ch3 + +Music_Cinnabar: ; 8267 (2:4267) + db ( $80 | CH0 ) + dw Music_Cinnabar_Ch1 + db CH1 + dw Music_Cinnabar_Ch2 + db CH2 + dw Music_Cinnabar_Ch3 + +Music_Vermilion: ; 8270 (2:4270) + db ( $C0 | CH0 ) + dw Music_Vermilion_Ch1 + db CH1 + dw Music_Vermilion_Ch2 + db CH2 + dw Music_Vermilion_Ch3 + db CH3 + dw Music_Vermilion_Ch4 + +Music_Lavender: ; 827c (2:427c) + db ( $C0 | CH0 ) + dw Music_Lavender_Ch1 + db CH1 + dw Music_Lavender_Ch2 + db CH2 + dw Music_Lavender_Ch3 + db CH3 + dw Music_Lavender_Ch4 + +Music_SSAnne: ; 8288 (2:4288) + db ( $80 | CH0 ) + dw Music_SSAnne_Ch1 + db CH1 + dw Music_SSAnne_Ch2 + db CH2 + dw Music_SSAnne_Ch3 + +Music_MeetProfOak: ; 8291 (2:4291) + db ( $80 | CH0 ) + dw Music_MeetProfOak_Ch1 + db CH1 + dw Music_MeetProfOak_Ch2 + db CH2 + dw Music_MeetProfOak_Ch3 + +Music_MeetRival: ; 829a (2:429a) + db ( $80 | CH0 ) + dw Music_MeetRival_Ch1 + db CH1 + dw Music_MeetRival_Ch2 + db CH2 + dw Music_MeetRival_Ch3 + +Music_MuseumGuy: ; 82a3 (2:42a3) + db ( $C0 | CH0 ) + dw Music_MuseumGuy_Ch1 + db CH1 + dw Music_MuseumGuy_Ch2 + db CH2 + dw Music_MuseumGuy_Ch3 + db CH3 + dw Music_MuseumGuy_Ch4 + +Music_SafariZone: ; 82af (2:42af) + db ( $80 | CH0 ) + dw Music_SafariZone_Ch1 + db CH1 + dw Music_SafariZone_Ch2 + db CH2 + dw Music_SafariZone_Ch3 + +Music_PkmnHealed: ; 82b8 (2:42b8) + db ( $80 | CH0 ) + dw Music_PkmnHealed_Ch1 + db CH1 + dw Music_PkmnHealed_Ch2 + db CH2 + dw Music_PkmnHealed_Ch3 + +; Routes 1 and 2 +Music_Routes1: ; 82c1 (2:42c1) + db ( $C0 | CH0 ) + dw Music_Routes1_Ch1 + db CH1 + dw Music_Routes1_Ch2 + db CH2 + dw Music_Routes1_Ch3 + db CH3 + dw Music_Routes1_Ch4 + +; Routes 24 and 25 +Music_Routes2: ; 82cd (2:42cd) + db ( $C0 | CH0 ) + dw Music_Routes2_Ch1 + db CH1 + dw Music_Routes2_Ch2 + db CH2 + dw Music_Routes2_Ch3 + db CH3 + dw Music_Routes2_Ch4 + +; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 +Music_Routes3: ; 82d9 (2:42d9) + db ( $C0 | CH0 ) + dw Music_Routes3_Ch1 + db CH1 + dw Music_Routes3_Ch2 + db CH2 + dw Music_Routes3_Ch3 + db CH3 + dw Music_Routes3_Ch4 + +; Routes 11, 12, 13, 14, 15 +Music_Routes4: ; 82d5 (2:42d5) + db ( $C0 | CH0 ) + dw Music_Routes4_Ch1 + db CH1 + dw Music_Routes4_Ch2 + db CH2 + dw Music_Routes4_Ch3 + db CH3 + dw Music_Routes4_Ch4 + +; Route 3, Indigo Plateau +Music_IndigoPlateau: ; 82f1 (2:42f1) + db ( $C0 | CH0 ) + dw Music_IndigoPlateau_Ch1 + db CH1 + dw Music_IndigoPlateau_Ch2 + db CH2 + dw Music_IndigoPlateau_Ch3 + db CH3 + dw Music_IndigoPlateau_Ch4 + +; 0x82fd \ No newline at end of file diff --git a/music/headers/musicheaders08.asm b/music/headers/musicheaders08.asm new file mode 100644 index 00000000..f3def95d --- /dev/null +++ b/music/headers/musicheaders08.asm @@ -0,0 +1,57 @@ +Music_GymLeaderBattle: ; 202be (8:42be) + db ( $80 | CH0 ) + dw Music_GymLeaderBattle_Ch1 + db CH1 + dw Music_GymLeaderBattle_Ch2 + db CH2 + dw Music_GymLeaderBattle_Ch3 + +Music_TrainerBattle: ; 202c7 (8:42c7) + db ( $80 | CH0 ) + dw Music_TrainerBattle_Ch1 + db CH1 + dw Music_TrainerBattle_Ch2 + db CH2 + dw Music_TrainerBattle_Ch3 + +Music_WildBattle: ; 202d0 (8:42d0) + db ( $80 | CH0 ) + dw Music_WildBattle_Ch1 + db CH1 + dw Music_WildBattle_Ch2 + db CH2 + dw Music_WildBattle_Ch3 + +Music_FinalBattle: ; 202d9 (8:42d9) + db ( $80 | CH0 ) + dw Music_FinalBattle_Ch1 + db CH1 + dw Music_FinalBattle_Ch2 + db CH2 + dw Music_FinalBattle_Ch3 + +Music_DefeatedTrainer: ; 202e2 (8:42e2) + db ( $80 | CH0 ) + dw Music_DefeatedTrainer_Ch1 + db CH1 + dw Music_DefeatedTrainer_Ch2 + db CH2 + dw Music_DefeatedTrainer_Ch3 + +Music_DefeatedWildMon: ; 202eb (8:42eb) + db ( $80 | CH0 ) + dw Music_DefeatedWildMon_Ch1 + db CH1 + dw Music_DefeatedWildMon_Ch2 + db CH2 + dw Music_DefeatedWildMon_Ch3 + +Music_DefeatedGymLeader: ; 202f4 (8:42f4) + db ( $80 | CH0 ) + dw Music_DefeatedGymLeader_Ch1 + db CH1 + dw Music_DefeatedGymLeader_Ch2 + db CH2 + dw Music_DefeatedGymLeader_Ch3 + +; 202fd \ No newline at end of file diff --git a/music/headers/musicheaders1f.asm b/music/headers/musicheaders1f.asm new file mode 100644 index 00000000..f85b791d --- /dev/null +++ b/music/headers/musicheaders1f.asm @@ -0,0 +1,160 @@ +Music_TitleScreen: ; 7c249 (1f:4249) + db ( $C0 | CH0 ) + dw Music_TitleScreen_Ch1 + db CH1 + dw Music_TitleScreen_Ch2 + db CH2 + dw Music_TitleScreen_Ch3 + db CH3 + dw Music_TitleScreen_Ch4 + +Music_Credits: ; 7c255 (1f:4255) + db ( $80 | CH0 ) + dw Music_Credits_Ch1 + db CH1 + dw Music_Credits_Ch2 + db CH2 + dw Music_Credits_Ch3 + +Music_HallOfFame: ; 7c25e (1f:425e) + db ( $80 | CH0 ) + dw Music_HallOfFame_Ch1 + db CH1 + dw Music_HallOfFame_Ch2 + db CH2 + dw Music_HallOfFame_Ch3 + +Music_OaksLab: ; 7c267 (1f:4267) + db ( $80 | CH0 ) + dw Music_OaksLab_Ch1 + db CH1 + dw Music_OaksLab_Ch2 + db CH2 + dw Music_OaksLab_Ch3 + +Music_JigglypuffSong: ; 7c270 (1f:4270) + db $40 + dw Music_JigglypuffSong_Ch1 + db CH1 + dw Music_JigglypuffSong_Ch2 + +Music_BikeRiding: ; 7c276 (1f:4276) + db ( $C0 | CH0 ) + dw Music_BikeRiding_Ch1 + db CH1 + dw Music_BikeRiding_Ch2 + db CH2 + dw Music_BikeRiding_Ch3 + db CH3 + dw Music_BikeRiding_Ch4 + +Music_Surfing: ; 7c282 (1f:4282) + db ( $80 | CH0 ) + dw Music_Surfing_Ch1 + db CH1 + dw Music_Surfing_Ch2 + db CH2 + dw Music_Surfing_Ch3 + +Music_GameCorner: ; 7c28b (1f:428b) + db ( $80 | CH0 ) + dw Music_GameCorner_Ch1 + db CH1 + dw Music_GameCorner_Ch2 + db CH2 + dw Music_GameCorner_Ch3 + +Music_IntroBattle: ; 7c294 (1f:4294) + db ( $C0 | CH0 ) + dw Music_IntroBattle_Ch1 + db CH1 + dw Music_IntroBattle_Ch2 + db CH2 + dw Music_IntroBattle_Ch3 + db CH3 + dw Music_IntroBattle_Ch4 + +; Power Plant, Unknown Dungeon, Rocket HQ +Music_Dungeon1: ; 7c2a0 (1f:42a0) + db ( $C0 | CH0 ) + dw Music_Dungeon1_Ch1 + db CH1 + dw Music_Dungeon1_Ch2 + db CH2 + dw Music_Dungeon1_Ch3 + db CH3 + dw Music_Dungeon1_Ch4 + +; Viridian Forest, Seafoam Islands +Music_Dungeon2: ; 7c2ac (1f:42ac) + db ( $C0 | CH0 ) + dw Music_Dungeon2_Ch1 + db CH1 + dw Music_Dungeon2_Ch2 + db CH2 + dw Music_Dungeon2_Ch3 + db CH3 + dw Music_Dungeon2_Ch4 + +; Mt. Moon, Rock Tunnel, Victory Road +Music_Dungeon3: ; 7c2b8 (1f:42b8) + db ( $C0 | CH0 ) + dw Music_Dungeon3_Ch1 + db CH1 + dw Music_Dungeon3_Ch2 + db CH2 + dw Music_Dungeon3_Ch3 + db CH3 + dw Music_Dungeon3_Ch4 + +Music_CinnabarMansion: ; 7c2c4 (1f:42c4) + db ( $C0 | CH0 ) + dw Music_CinnabarMansion_Ch1 + db CH1 + dw Music_CinnabarMansion_Ch2 + db CH2 + dw Music_CinnabarMansion_Ch3 + db CH3 + dw Music_CinnabarMansion_Ch4 + +Music_PokemonTower: ; 7c2d0 (1f:42d0) + db ( $80 | CH0 ) + dw Music_PokemonTower_Ch1 + db CH1 + dw Music_PokemonTower_Ch2 + db CH2 + dw Music_PokemonTower_Ch3 + +Music_SilphCo: ; 7c2d9 (1f:42d9) + db ( $80 | CH0 ) + dw Music_SilphCo_Ch1 + db CH1 + dw Music_SilphCo_Ch2 + db CH2 + dw Music_SilphCo_Ch3 + +Music_MeetEvilTrainer: ; 7c2e2 (1f:42e2) + db ( $80 | CH0 ) + dw Music_MeetEvilTrainer_Ch1 + db CH1 + dw Music_MeetEvilTrainer_Ch2 + db CH2 + dw Music_MeetEvilTrainer_Ch3 + +Music_MeetFemaleTrainer: ; 7c2eb (1f:42eb) + db ( $80 | CH0 ) + dw Music_MeetFemaleTrainer_Ch1 + db CH1 + dw Music_MeetFemaleTrainer_Ch2 + db CH2 + dw Music_MeetFemaleTrainer_Ch3 + +Music_MeetMaleTrainer: ; 7c2f4 (1f:42f4) + db ( $80 | CH0 ) + dw Music_MeetMaleTrainer_Ch1 + db CH1 + dw Music_MeetMaleTrainer_Ch2 + db CH2 + dw Music_MeetMaleTrainer_Ch3 + +; 0x7c2fd \ No newline at end of file diff --git a/music/headers/sfxheaders02.asm b/music/headers/sfxheaders02.asm new file mode 100644 index 00000000..dc30f2b9 --- /dev/null +++ b/music/headers/sfxheaders02.asm @@ -0,0 +1,564 @@ +SFX_Headers_02: + db $ff, $ff, $ff ; padding + +SFX_02_01: ; 8003 (2:4003) + db CH7 + dw SFX_02_01_Ch1 + +SFX_02_02: ; 8006 (2:4006) + db CH7 + dw SFX_02_02_Ch1 + +SFX_02_03: ; 8009 (2:4009) + db CH7 + dw SFX_02_03_Ch1 + +SFX_02_04: ; 800c (2:400c) + db CH7 + dw SFX_02_04_Ch1 + +SFX_02_05: ; 800f (2:400f) + db CH7 + dw SFX_02_05_Ch1 + +SFX_02_06: ; 8012 (2:4012) + db CH7 + dw SFX_02_06_Ch1 + +SFX_02_07: ; 8015 (2:4015) + db CH7 + dw SFX_02_07_Ch1 + +SFX_02_08: ; 8018 (2:4018) + db CH7 + dw SFX_02_08_Ch1 + +SFX_02_09: ; 801b (2:401b) + db CH7 + dw SFX_02_09_Ch1 + +SFX_02_0a: ; 801e (2:401e) + db CH7 + dw SFX_02_0a_Ch1 + +SFX_02_0b: ; 8021 (2:4021) + db CH7 + dw SFX_02_0b_Ch1 + +SFX_02_0c: ; 8024 (2:4024) + db CH7 + dw SFX_02_0c_Ch1 + +SFX_02_0d: ; 8027 (2:4027) + db CH7 + dw SFX_02_0d_Ch1 + +SFX_02_0e: ; 802a (2:402a) + db CH7 + dw SFX_02_0e_Ch1 + +SFX_02_0f: ; 802d (2:402d) + db CH7 + dw SFX_02_0f_Ch1 + +SFX_02_10: ; 8030 (2:4030) + db CH7 + dw SFX_02_10_Ch1 + +SFX_02_11: ; 8033 (2:4033) + db CH7 + dw SFX_02_11_Ch1 + +SFX_02_12: ; 8036 (2:4036) + db CH7 + dw SFX_02_12_Ch1 + +SFX_02_13: ; 8039 (2:4039) + db CH7 + dw SFX_02_13_Ch1 + +SFX_02_14: ; 803c (2:403c) + db ( $80 | CH4 ) + dw SFX_02_14_Ch1 + db CH5 + dw SFX_02_14_Ch2 + db CH7 + dw SFX_02_14_Ch3 + +SFX_02_15: ; 8045 (2:4045) + db ( $80 | CH4 ) + dw SFX_02_15_Ch1 + db CH5 + dw SFX_02_15_Ch2 + db CH7 + dw SFX_02_15_Ch3 + +SFX_02_16: ; 804e (2:404e) + db ( $80 | CH4 ) + dw SFX_02_16_Ch1 + db CH5 + dw SFX_02_16_Ch2 + db CH7 + dw SFX_02_16_Ch3 + +SFX_02_17: ; 8057 (2:4057) + db ( $80 | CH4 ) + dw SFX_02_17_Ch1 + db CH5 + dw SFX_02_17_Ch2 + db CH7 + dw SFX_02_17_Ch3 + +SFX_02_18: ; 8060 (2:4060) + db ( $80 | CH4 ) + dw SFX_02_18_Ch1 + db CH5 + dw SFX_02_18_Ch2 + db CH7 + dw SFX_02_18_Ch3 + +SFX_02_19: ; 8069 (2:4069) + db ( $80 | CH4 ) + dw SFX_02_19_Ch1 + db CH5 + dw SFX_02_19_Ch2 + db CH7 + dw SFX_02_19_Ch3 + +SFX_02_1a: ; 8072 (2:4072) + db ( $80 | CH4 ) + dw SFX_02_1a_Ch1 + db CH5 + dw SFX_02_1a_Ch2 + db CH7 + dw SFX_02_1a_Ch3 + +SFX_02_1b: ; 807b (2:407b) + db ( $80 | CH4 ) + dw SFX_02_1b_Ch1 + db CH5 + dw SFX_02_1b_Ch2 + db CH7 + dw SFX_02_1b_Ch3 + +SFX_02_1c: ; 8084 (2:4084) + db ( $80 | CH4 ) + dw SFX_02_1c_Ch1 + db CH5 + dw SFX_02_1c_Ch2 + db CH7 + dw SFX_02_1c_Ch3 + +SFX_02_1d: ; 808d (2:408d) + db ( $80 | CH4 ) + dw SFX_02_1d_Ch1 + db CH5 + dw SFX_02_1d_Ch2 + db CH7 + dw SFX_02_1d_Ch3 + +SFX_02_1e: ; 8096 (2:4096) + db ( $80 | CH4 ) + dw SFX_02_1e_Ch1 + db CH5 + dw SFX_02_1e_Ch2 + db CH7 + dw SFX_02_1e_Ch3 + +SFX_02_1f: ; 809f (2:409f) + db ( $80 | CH4 ) + dw SFX_02_1f_Ch1 + db CH5 + dw SFX_02_1f_Ch2 + db CH7 + dw SFX_02_1f_Ch3 + +SFX_02_20: ; 80a8 (2:40a8) + db ( $80 | CH4 ) + dw SFX_02_20_Ch1 + db CH5 + dw SFX_02_20_Ch2 + db CH7 + dw SFX_02_20_Ch3 + +SFX_02_21: ; 80b1 (2:40b1) + db ( $80 | CH4 ) + dw SFX_02_21_Ch1 + db CH5 + dw SFX_02_21_Ch2 + db CH7 + dw SFX_02_21_Ch3 + +SFX_02_22: ; 80ba (2:40ba) + db ( $80 | CH4 ) + dw SFX_02_22_Ch1 + db CH5 + dw SFX_02_22_Ch2 + db CH7 + dw SFX_02_22_Ch3 + +SFX_02_23: ; 80c3 (2:40c3) + db ( $80 | CH4 ) + dw SFX_02_23_Ch1 + db CH5 + dw SFX_02_23_Ch2 + db CH7 + dw SFX_02_23_Ch3 + +SFX_02_24: ; 80cc (2:40cc) + db ( $80 | CH4 ) + dw SFX_02_24_Ch1 + db CH5 + dw SFX_02_24_Ch2 + db CH7 + dw SFX_02_24_Ch3 + +SFX_02_25: ; 80d5 (2:40d5) + db ( $80 | CH4 ) + dw SFX_02_25_Ch1 + db CH5 + dw SFX_02_25_Ch2 + db CH7 + dw SFX_02_25_Ch3 + +SFX_02_26: ; 80de (2:40de) + db ( $80 | CH4 ) + dw SFX_02_26_Ch1 + db CH5 + dw SFX_02_26_Ch2 + db CH7 + dw SFX_02_26_Ch3 + +SFX_02_27: ; 80e7 (2:40e7) + db ( $80 | CH4 ) + dw SFX_02_27_Ch1 + db CH5 + dw SFX_02_27_Ch2 + db CH7 + dw SFX_02_27_Ch3 + +SFX_02_28: ; 80f0 (2:40f0) + db ( $80 | CH4 ) + dw SFX_02_28_Ch1 + db CH5 + dw SFX_02_28_Ch2 + db CH7 + dw SFX_02_28_Ch3 + +SFX_02_29: ; 80f9 (2:40f9) + db ( $80 | CH4 ) + dw SFX_02_29_Ch1 + db CH5 + dw SFX_02_29_Ch2 + db CH7 + dw SFX_02_29_Ch3 + +SFX_02_2a: ; 8102 (2:4102) + db ( $80 | CH4 ) + dw SFX_02_2a_Ch1 + db CH5 + dw SFX_02_2a_Ch2 + db CH7 + dw SFX_02_2a_Ch3 + +SFX_02_2b: ; 810b (2:410b) + db ( $80 | CH4 ) + dw SFX_02_2b_Ch1 + db CH5 + dw SFX_02_2b_Ch2 + db CH7 + dw SFX_02_2b_Ch3 + +SFX_02_2c: ; 8114 (2:4114) + db ( $80 | CH4 ) + dw SFX_02_2c_Ch1 + db CH5 + dw SFX_02_2c_Ch2 + db CH7 + dw SFX_02_2c_Ch3 + +SFX_02_2d: ; 811d (2:411d) + db ( $80 | CH4 ) + dw SFX_02_2d_Ch1 + db CH5 + dw SFX_02_2d_Ch2 + db CH7 + dw SFX_02_2d_Ch3 + +SFX_02_2e: ; 8126 (2:4126) + db ( $80 | CH4 ) + dw SFX_02_2e_Ch1 + db CH5 + dw SFX_02_2e_Ch2 + db CH7 + dw SFX_02_2e_Ch3 + +SFX_02_2f: ; 812f (2:412f) + db ( $80 | CH4 ) + dw SFX_02_2f_Ch1 + db CH5 + dw SFX_02_2f_Ch2 + db CH7 + dw SFX_02_2f_Ch3 + +SFX_02_30: ; 8138 (2:4138) + db ( $80 | CH4 ) + dw SFX_02_30_Ch1 + db CH5 + dw SFX_02_30_Ch2 + db CH7 + dw SFX_02_30_Ch3 + +SFX_02_31: ; 8141 (2:4141) + db ( $80 | CH4 ) + dw SFX_02_31_Ch1 + db CH5 + dw SFX_02_31_Ch2 + db CH7 + dw SFX_02_31_Ch3 + +SFX_02_32: ; 814a (2:414a) + db ( $80 | CH4 ) + dw SFX_02_32_Ch1 + db CH5 + dw SFX_02_32_Ch2 + db CH7 + dw SFX_02_32_Ch3 + +SFX_02_33: ; 8153 (2:4153) + db ( $80 | CH4 ) + dw SFX_02_33_Ch1 + db CH5 + dw SFX_02_33_Ch2 + db CH7 + dw SFX_02_33_Ch3 + +SFX_02_34: ; 815c (2:415c) + db ( $80 | CH4 ) + dw SFX_02_34_Ch1 + db CH5 + dw SFX_02_34_Ch2 + db CH7 + dw SFX_02_34_Ch3 + +SFX_02_35: ; 8165 (2:4165) + db ( $80 | CH4 ) + dw SFX_02_35_Ch1 + db CH5 + dw SFX_02_35_Ch2 + db CH7 + dw SFX_02_35_Ch3 + +SFX_02_36: ; 816e (2:416e) + db ( $80 | CH4 ) + dw SFX_02_36_Ch1 + db CH5 + dw SFX_02_36_Ch2 + db CH7 + dw SFX_02_36_Ch3 + +SFX_02_37: ; 8177 (2:4177) + db ( $80 | CH4 ) + dw SFX_02_37_Ch1 + db CH5 + dw SFX_02_37_Ch2 + db CH7 + dw SFX_02_37_Ch3 + +SFX_02_38: ; 8180 (2:4180) + db ( $80 | CH4 ) + dw SFX_02_38_Ch1 + db CH5 + dw SFX_02_38_Ch2 + db CH7 + dw SFX_02_38_Ch3 + +SFX_02_39: ; 8189 (2:4189) + db ( $80 | CH4 ) + dw SFX_02_39_Ch1 + db CH5 + dw SFX_02_39_Ch2 + db CH7 + dw SFX_02_39_Ch3 + +SFX_02_3a: ; 8192 (2:4192) + db ( $80 | CH4 ) + dw SFX_02_3a_Ch1 + db CH5 + dw SFX_02_3a_Ch2 + db CH6 + dw SFX_02_3a_Ch3 + +SFX_02_3b: ; 819b (2:419b) + db ( $80 | CH4 ) + dw SFX_02_3b_Ch1 + db CH5 + dw SFX_02_3b_Ch2 + db CH6 + dw SFX_02_3b_Ch3 + +SFX_02_3c: ; 81a4 (2:41a4) + db CH4 + dw SFX_02_3c_Ch1 + +SFX_02_3d: ; 81a7 (2:41a7) + db CH4 + dw SFX_02_3d_Ch1 + +SFX_02_3e: ; 81aa (2:41aa) + db CH4 + dw SFX_02_3e_Ch1 + +SFX_02_3f: ; 81ad (2:41ad) + db CH7 + dw SFX_02_3f_Ch1 + +SFX_02_40: ; 81b0 (2:41b0) + db CH4 + dw SFX_02_40_Ch1 + +SFX_02_41: ; 81b3 (2:41b3) + db ( $80 | CH4 ) + dw SFX_02_41_Ch1 + db CH5 + dw SFX_02_41_Ch2 + db CH6 + dw SFX_02_41_Ch3 + +SFX_02_42: ; 81bc (2:41bc) + db ( $80 | CH4 ) + dw SFX_02_42_Ch1 + db CH5 + dw SFX_02_42_Ch2 + db CH6 + dw SFX_02_42_Ch3 + +SFX_02_43: ; 81c5 (2:41c5) + db CH4 + dw SFX_02_43_Ch1 + +SFX_02_44: ; 81c8 (2:41c8) + db CH4 + dw SFX_02_44_Ch1 + +SFX_02_45: ; 81cb (2:41cb) + db CH4 + dw SFX_02_45_Ch1 + +SFX_02_46: ; 81ce (2:41ce) + db CH4 + dw SFX_02_46_Ch1 + +SFX_02_47: ; 81d1 (2:41d1) + db CH4 + dw SFX_02_47_Ch1 + +SFX_02_48: ; 81d4 (2:41d4) + db CH4 + dw SFX_02_48_Ch1 + +SFX_02_49: ; 81d7 (2:41d7) + db CH4 + dw SFX_02_49_Ch1 + +SFX_02_4a: ; 81da (2:41da) + db CH4 + dw SFX_02_4a_Ch1 + +SFX_02_4b: ; 81dd (2:41dd) + db CH4 + dw SFX_02_4b_Ch1 + +SFX_02_4c: ; 81e0 (2:41e0) + db CH4 + dw SFX_02_4c_Ch1 + +SFX_02_4d: ; 81e3 (2:41e3) + db CH4 + dw SFX_02_4d_Ch1 + +SFX_02_4e: ; 81e6 (2:41e6) + db CH4 + dw SFX_02_4e_Ch1 + +SFX_02_4f: ; 81e9 (2:41e9) + db CH7 + dw SFX_02_4f_Ch1 + +SFX_02_50: ; 81ec (2:41ec) + db CH7 + dw SFX_02_50_Ch1 + +SFX_02_51: ; 81ef (2:41ef) + db ( $40 | CH4 ) + dw SFX_02_51_Ch1 + db CH5 + dw SFX_02_51_Ch2 + +SFX_02_52: ; 81f5 (2:41f5) + db CH4 + dw SFX_02_52_Ch1 + +SFX_02_53: ; 81f8 (2:41f8) + db CH7 + dw SFX_02_53_Ch1 + +SFX_02_54: ; 81fb (2:41fb) + db ( $40 | CH4 ) + dw SFX_02_54_Ch1 + db CH5 + dw SFX_02_54_Ch2 + +SFX_02_55: ; 8201 (2:4201) + db CH4 + dw SFX_02_55_Ch1 + +SFX_02_56: ; 8204 (2:4204) + db CH7 + dw SFX_02_56_Ch1 + +SFX_02_57: ; 8207 (2:4207) + db CH7 + dw SFX_02_57_Ch1 + +SFX_02_58: ; 820a (2:420a) + db ( $40 | CH4 ) + dw SFX_02_58_Ch1 + db CH5 + dw SFX_02_58_Ch2 + +SFX_02_59: ; 8210 (2:4210) + db ( $40 | CH4 ) + dw SFX_02_59_Ch1 + db CH5 + dw SFX_02_59_Ch2 + +SFX_02_5a: ; 8216 (2:4216) + db ( $40 | CH4 ) + dw SFX_02_5a_Ch1 + db CH5 + dw SFX_02_5a_Ch2 + +SFX_02_5b: ; 821c (2:421c) + db CH4 + dw SFX_02_5b_Ch1 + +SFX_02_5c: ; 821f (2:421f) + db CH7 + dw SFX_02_5c_Ch1 + +SFX_02_5d: ; 8222 (2:4222) + db ( $40 | CH4 ) + dw SFX_02_5d_Ch1 + db CH5 + dw SFX_02_5d_Ch2 + +SFX_02_5e: ; 8228 (2:4228) + db CH2 + dw SFX_02_5e_Ch1 + +SFX_02_5f: ; 822b (2:422b) + db CH4 + dw SFX_02_5f_Ch1 + +; 0x822e \ No newline at end of file diff --git a/music/headers/sfxheaders08.asm b/music/headers/sfxheaders08.asm new file mode 100644 index 00000000..16af945e --- /dev/null +++ b/music/headers/sfxheaders08.asm @@ -0,0 +1,708 @@ +SFX_Headers_08: + db $ff, $ff, $ff ; padding + +SFX_08_01: ; 20003 (8:4003) + db CH7 + dw SFX_08_01_Ch1 + +SFX_08_02: ; 20006 (8:4006) + db CH7 + dw SFX_08_02_Ch1 + +SFX_08_03: ; 20009 (8:4009) + db CH7 + dw SFX_08_03_Ch1 + +SFX_08_04: ; 2000c (8:400c) + db CH7 + dw SFX_08_04_Ch1 + +SFX_08_05: ; 2000f (8:400f) + db CH7 + dw SFX_08_05_Ch1 + +SFX_08_06: ; 20012 (8:4012) + db CH7 + dw SFX_08_06_Ch1 + +SFX_08_07: ; 20015 (8:4015) + db CH7 + dw SFX_08_07_Ch1 + +SFX_08_08: ; 20018 (8:4018) + db CH7 + dw SFX_08_08_Ch1 + +SFX_08_09: ; 2001b (8:401b) + db CH7 + dw SFX_08_09_Ch1 + +SFX_08_0a: ; 2001e (8:401e) + db CH7 + dw SFX_08_0a_Ch1 + +SFX_08_0b: ; 20021 (8:4021) + db CH7 + dw SFX_08_0b_Ch1 + +SFX_08_0c: ; 20024 (8:4024) + db CH7 + dw SFX_08_0c_Ch1 + +SFX_08_0d: ; 20027 (8:4027) + db CH7 + dw SFX_08_0d_Ch1 + +SFX_08_0e: ; 2002a (8:402a) + db CH7 + dw SFX_08_0e_Ch1 + +SFX_08_0f: ; 2002d (8:402d) + db CH7 + dw SFX_08_0f_Ch1 + +SFX_08_10: ; 20030 (8:4030) + db CH7 + dw SFX_08_10_Ch1 + +SFX_08_11: ; 20033 (8:4033) + db CH7 + dw SFX_08_11_Ch1 + +SFX_08_12: ; 20036 (8:4036) + db CH7 + dw SFX_08_12_Ch1 + +SFX_08_13: ; 20039 (8:4039) + db CH7 + dw SFX_08_13_Ch1 + +SFX_08_14: ; 2003c (8:403c) + db ( $80 | CH4 ) + dw SFX_08_14_Ch1 + db CH5 + dw SFX_08_14_Ch2 + db CH7 + dw SFX_08_14_Ch3 + +SFX_08_15: ; 20045 (8:4045) + db ( $80 | CH4 ) + dw SFX_08_15_Ch1 + db CH5 + dw SFX_08_15_Ch2 + db CH7 + dw SFX_08_15_Ch3 + +SFX_08_16: ; 2004e (8:404e) + db ( $80 | CH4 ) + dw SFX_08_16_Ch1 + db CH5 + dw SFX_08_16_Ch2 + db CH7 + dw SFX_08_16_Ch3 + +SFX_08_17: ; 20057 (8:4057) + db ( $80 | CH4 ) + dw SFX_08_17_Ch1 + db CH5 + dw SFX_08_17_Ch2 + db CH7 + dw SFX_08_17_Ch3 + +SFX_08_18: ; 20060 (8:4060) + db ( $80 | CH4 ) + dw SFX_08_18_Ch1 + db CH5 + dw SFX_08_18_Ch2 + db CH7 + dw SFX_08_18_Ch3 + +SFX_08_19: ; 20069 (8:4069) + db ( $80 | CH4 ) + dw SFX_08_19_Ch1 + db CH5 + dw SFX_08_19_Ch2 + db CH7 + dw SFX_08_19_Ch3 + +SFX_08_1a: ; 20072 (8:4072) + db ( $80 | CH4 ) + dw SFX_08_1a_Ch1 + db CH5 + dw SFX_08_1a_Ch2 + db CH7 + dw SFX_08_1a_Ch3 + +SFX_08_1b: ; 2007b (8:407b) + db ( $80 | CH4 ) + dw SFX_08_1b_Ch1 + db CH5 + dw SFX_08_1b_Ch2 + db CH7 + dw SFX_08_1b_Ch3 + +SFX_08_1c: ; 20084 (8:4084) + db ( $80 | CH4 ) + dw SFX_08_1c_Ch1 + db CH5 + dw SFX_08_1c_Ch2 + db CH7 + dw SFX_08_1c_Ch3 + +SFX_08_1d: ; 2008d (8:408d) + db ( $80 | CH4 ) + dw SFX_08_1d_Ch1 + db CH5 + dw SFX_08_1d_Ch2 + db CH7 + dw SFX_08_1d_Ch3 + +SFX_08_1e: ; 20096 (8:4096) + db ( $80 | CH4 ) + dw SFX_08_1e_Ch1 + db CH5 + dw SFX_08_1e_Ch2 + db CH7 + dw SFX_08_1e_Ch3 + +SFX_08_1f: ; 2009f (8:409f) + db ( $80 | CH4 ) + dw SFX_08_1f_Ch1 + db CH5 + dw SFX_08_1f_Ch2 + db CH7 + dw SFX_08_1f_Ch3 + +SFX_08_20: ; 200a8 (8:40a8) + db ( $80 | CH4 ) + dw SFX_08_20_Ch1 + db CH5 + dw SFX_08_20_Ch2 + db CH7 + dw SFX_08_20_Ch3 + +SFX_08_21: ; 200b1 (8:40b1) + db ( $80 | CH4 ) + dw SFX_08_21_Ch1 + db CH5 + dw SFX_08_21_Ch2 + db CH7 + dw SFX_08_21_Ch3 + +SFX_08_22: ; 200ba (8:40ba) + db ( $80 | CH4 ) + dw SFX_08_22_Ch1 + db CH5 + dw SFX_08_22_Ch2 + db CH7 + dw SFX_08_22_Ch3 + +SFX_08_23: ; 200c3 (8:40c3) + db ( $80 | CH4 ) + dw SFX_08_23_Ch1 + db CH5 + dw SFX_08_23_Ch2 + db CH7 + dw SFX_08_23_Ch3 + +SFX_08_24: ; 200cc (8:40cc) + db ( $80 | CH4 ) + dw SFX_08_24_Ch1 + db CH5 + dw SFX_08_24_Ch2 + db CH7 + dw SFX_08_24_Ch3 + +SFX_08_25: ; 200d5 (8:40d5) + db ( $80 | CH4 ) + dw SFX_08_25_Ch1 + db CH5 + dw SFX_08_25_Ch2 + db CH7 + dw SFX_08_25_Ch3 + +SFX_08_26: ; 200de (8:40de) + db ( $80 | CH4 ) + dw SFX_08_26_Ch1 + db CH5 + dw SFX_08_26_Ch2 + db CH7 + dw SFX_08_26_Ch3 + +SFX_08_27: ; 200e7 (8:40e7) + db ( $80 | CH4 ) + dw SFX_08_27_Ch1 + db CH5 + dw SFX_08_27_Ch2 + db CH7 + dw SFX_08_27_Ch3 + +SFX_08_28: ; 200f0 (8:40f0) + db ( $80 | CH4 ) + dw SFX_08_28_Ch1 + db CH5 + dw SFX_08_28_Ch2 + db CH7 + dw SFX_08_28_Ch3 + +SFX_08_29: ; 200f9 (8:40f9) + db ( $80 | CH4 ) + dw SFX_08_29_Ch1 + db CH5 + dw SFX_08_29_Ch2 + db CH7 + dw SFX_08_29_Ch3 + +SFX_08_2a: ; 20102 (8:4102) + db ( $80 | CH4 ) + dw SFX_08_2a_Ch1 + db CH5 + dw SFX_08_2a_Ch2 + db CH7 + dw SFX_08_2a_Ch3 + +SFX_08_2b: ; 2010b (8:410b) + db ( $80 | CH4 ) + dw SFX_08_2b_Ch1 + db CH5 + dw SFX_08_2b_Ch2 + db CH7 + dw SFX_08_2b_Ch3 + +SFX_08_2c: ; 20114 (8:4114) + db ( $80 | CH4 ) + dw SFX_08_2c_Ch1 + db CH5 + dw SFX_08_2c_Ch2 + db CH7 + dw SFX_08_2c_Ch3 + +SFX_08_2d: ; 2011d (8:411d) + db ( $80 | CH4 ) + dw SFX_08_2d_Ch1 + db CH5 + dw SFX_08_2d_Ch2 + db CH7 + dw SFX_08_2d_Ch3 + +SFX_08_2e: ; 20126 (8:4126) + db ( $80 | CH4 ) + dw SFX_08_2e_Ch1 + db CH5 + dw SFX_08_2e_Ch2 + db CH7 + dw SFX_08_2e_Ch3 + +SFX_08_2f: ; 2012f (8:412f) + db ( $80 | CH4 ) + dw SFX_08_2f_Ch1 + db CH5 + dw SFX_08_2f_Ch2 + db CH7 + dw SFX_08_2f_Ch3 + +SFX_08_30: ; 20138 (8:4138) + db ( $80 | CH4 ) + dw SFX_08_30_Ch1 + db CH5 + dw SFX_08_30_Ch2 + db CH7 + dw SFX_08_30_Ch3 + +SFX_08_31: ; 20141 (8:4141) + db ( $80 | CH4 ) + dw SFX_08_31_Ch1 + db CH5 + dw SFX_08_31_Ch2 + db CH7 + dw SFX_08_31_Ch3 + +SFX_08_32: ; 2014a (8:414a) + db ( $80 | CH4 ) + dw SFX_08_32_Ch1 + db CH5 + dw SFX_08_32_Ch2 + db CH7 + dw SFX_08_32_Ch3 + +SFX_08_33: ; 20153 (8:4153) + db ( $80 | CH4 ) + dw SFX_08_33_Ch1 + db CH5 + dw SFX_08_33_Ch2 + db CH7 + dw SFX_08_33_Ch3 + +SFX_08_34: ; 2015c (8:415c) + db ( $80 | CH4 ) + dw SFX_08_34_Ch1 + db CH5 + dw SFX_08_34_Ch2 + db CH7 + dw SFX_08_34_Ch3 + +SFX_08_35: ; 20165 (8:4165) + db ( $80 | CH4 ) + dw SFX_08_35_Ch1 + db CH5 + dw SFX_08_35_Ch2 + db CH7 + dw SFX_08_35_Ch3 + +SFX_08_36: ; 2016e (8:416e) + db ( $80 | CH4 ) + dw SFX_08_36_Ch1 + db CH5 + dw SFX_08_36_Ch2 + db CH7 + dw SFX_08_36_Ch3 + +SFX_08_37: ; 20177 (8:4177) + db ( $80 | CH4 ) + dw SFX_08_37_Ch1 + db CH5 + dw SFX_08_37_Ch2 + db CH7 + dw SFX_08_37_Ch3 + +SFX_08_38: ; 20180 (8:4180) + db ( $80 | CH4 ) + dw SFX_08_38_Ch1 + db CH5 + dw SFX_08_38_Ch2 + db CH7 + dw SFX_08_38_Ch3 + +SFX_08_39: ; 20189 (8:4189) + db ( $80 | CH4 ) + dw SFX_08_39_Ch1 + db CH5 + dw SFX_08_39_Ch2 + db CH7 + dw SFX_08_39_Ch3 + +SFX_08_3a: ; 20192 (8:4192) + db ( $80 | CH4 ) + dw SFX_08_3a_Ch1 + db CH5 + dw SFX_08_3a_Ch2 + db CH6 + dw SFX_08_3a_Ch3 + +SFX_08_3b: ; 2019b (8:419b) + db ( $80 | CH4 ) + dw SFX_08_3b_Ch1 + db CH5 + dw SFX_08_3b_Ch2 + db CH6 + dw SFX_08_3b_Ch3 + +SFX_08_3c: ; 201a4 (8:41a4) + db CH4 + dw SFX_08_3c_Ch1 + +SFX_08_3d: ; 201a7 (8:41a7) + db CH4 + dw SFX_08_3d_Ch1 + +SFX_08_3e: ; 201aa (8:41aa) + db CH4 + dw SFX_08_3e_Ch1 + +SFX_08_3f: ; 201ad (8:41ad) + db CH7 + dw SFX_08_3f_Ch1 + +SFX_08_40: ; 201b0 (8:41b0) + db CH4 + dw SFX_08_40_Ch1 + +SFX_08_41: ; 201b3 (8:41b3) + db ( $40 | CH4 ) + dw SFX_08_41_Ch1 + db CH5 + dw SFX_08_41_Ch2 + +SFX_08_42: ; 201b9 (8:41b9) + db ( $40 | CH4 ) + dw SFX_08_42_Ch1 + db CH7 + dw SFX_08_42_Ch2 + +SFX_08_43: ; 201bf (8:41bf) + db ( $40 | CH4 ) + dw SFX_08_43_Ch1 + db CH7 + dw SFX_08_43_Ch2 + +SFX_08_44: ; 201c5 (8:41c5) + db CH7 + dw SFX_08_44_Ch1 + +SFX_08_45: ; 201c8 (8:41c8) + db ( $40 | CH4 ) + dw SFX_08_45_Ch1 + db CH5 + dw SFX_08_45_Ch2 + +SFX_08_46: ; 201ce (8:41ce) + db ( $80 | CH4 ) + dw SFX_08_46_Ch1 + db CH5 + dw SFX_08_46_Ch2 + db CH6 + dw SFX_08_46_Ch3 + +SFX_08_47: ; 201d7 (8:41d7) + db CH7 + dw SFX_08_47_Ch1 + +SFX_08_48: ; 201da (8:41da) + db CH4 + dw SFX_08_48_Ch1 + +SFX_08_49: ; 201dd (8:41dd) + db CH4 + dw SFX_08_49_Ch1 + +SFX_08_4a: ; 201e0 (8:41e0) + db CH7 + dw SFX_08_4a_Ch1 + +SFX_08_4b: ; 201e3 (8:41e3) + db CH7 + dw SFX_08_4b_Ch1 + +SFX_08_4c: ; 201e6 (8:41e6) + db CH7 + dw SFX_08_4c_Ch1 + +SFX_08_4d: ; 201e9 (8:41e9) + db CH7 + dw SFX_08_4d_Ch1 + +SFX_08_4e: ; 201ec (8:41ec) + db CH7 + dw SFX_08_4e_Ch1 + +SFX_08_4f: ; 201ef (8:41ef) + db CH7 + dw SFX_08_4f_Ch1 + +SFX_08_50: ; 201f2 (8:41f2) + db CH7 + dw SFX_08_50_Ch1 + +SFX_08_51: ; 201f5 (8:41f5) + db CH7 + dw SFX_08_51_Ch1 + +SFX_08_52: ; 201f8 (8:41f8) + db CH7 + dw SFX_08_52_Ch1 + +SFX_08_53: ; 201fb (8:41fb) + db CH7 + dw SFX_08_53_Ch1 + +SFX_08_54: ; 201fe (8:41fe) + db CH7 + dw SFX_08_54_Ch1 + +SFX_08_55: ; 20201 (8:4201) + db CH7 + dw SFX_08_55_Ch1 + +SFX_08_56: ; 20204 (8:4204) + db CH7 + dw SFX_08_56_Ch1 + +SFX_08_57: ; 20207 (8:4207) + db CH7 + dw SFX_08_57_Ch1 + +SFX_08_58: ; 2020a (8:420a) + db CH7 + dw SFX_08_58_Ch1 + +SFX_08_59: ; 2020d (8:420d) + db CH7 + dw SFX_08_59_Ch1 + +SFX_08_5a: ; 20210 (8:4210) + db CH7 + dw SFX_08_5a_Ch1 + +SFX_08_5b: ; 20213 (8:4213) + db CH7 + dw SFX_08_5b_Ch1 + +SFX_08_5c: ; 20216 (8:4216) + db CH7 + dw SFX_08_5c_Ch1 + +SFX_08_5d: ; 20219 (8:4219) + db CH7 + dw SFX_08_5d_Ch1 + +SFX_08_5e: ; 2021c (8:421c) + db ( $40 | CH4 ) + dw SFX_08_5e_Ch1 + db CH7 + dw SFX_08_5e_Ch2 + +SFX_08_5f: ; 20222 (8:4222) + db CH7 + dw SFX_08_5f_Ch1 + +SFX_08_60: ; 20225 (8:4225) + db CH7 + dw SFX_08_60_Ch1 + +SFX_08_61: ; 20228 (8:4228) + db CH7 + dw SFX_08_61_Ch1 + +SFX_08_62: ; 2022b (8:422b) + db CH7 + dw SFX_08_62_Ch1 + +SFX_08_63: ; 2022e (8:422e) + db CH7 + dw SFX_08_63_Ch1 + +SFX_08_64: ; 20231 (8:4231) + db ( $40 | CH4 ) + dw SFX_08_64_Ch1 + db CH7 + dw SFX_08_64_Ch2 + +SFX_08_65: ; 20237 (8:4237) + db CH7 + dw SFX_08_65_Ch1 + +SFX_08_66: ; 2023a (8:423a) + db CH7 + dw SFX_08_66_Ch1 + +SFX_08_67: ; 2023d (8:423d) + db ( $80 | CH4 ) + dw SFX_08_67_Ch1 + db CH5 + dw SFX_08_67_Ch2 + db CH7 + dw SFX_08_67_Ch3 + +SFX_08_68: ; 20246 (8:4246) + db ( $80 | CH4 ) + dw SFX_08_68_Ch1 + db CH5 + dw SFX_08_68_Ch2 + db CH7 + dw SFX_08_68_Ch3 + +SFX_08_69: ; 2024f (8:424f) + db ( $40 | CH4 ) + dw SFX_08_69_Ch1 + db CH7 + dw SFX_08_69_Ch2 + +SFX_08_6a: ; 20255 (8:4255) + db ( $80 | CH4 ) + dw SFX_08_6a_Ch1 + db CH5 + dw SFX_08_6a_Ch2 + db CH7 + dw SFX_08_6a_Ch3 + +SFX_08_6b: ; 2025e (8:425e) + db ( $40 | CH4 ) + dw SFX_08_6b_Ch1 + db CH7 + dw SFX_08_6b_Ch2 + +SFX_08_6c: ; 20264 (8:4264) + db ( $80 | CH4 ) + dw SFX_08_6c_Ch1 + db CH5 + dw SFX_08_6c_Ch2 + db CH7 + dw SFX_08_6c_Ch3 + +SFX_08_6d: ; 2026d (8:426d) + db ( $80 | CH4 ) + dw SFX_08_6d_Ch1 + db CH5 + dw SFX_08_6d_Ch2 + db CH7 + dw SFX_08_6d_Ch3 + +SFX_08_6e: ; 20276 (8:4276) + db ( $80 | CH4 ) + dw SFX_08_6e_Ch1 + db CH5 + dw SFX_08_6e_Ch2 + db CH7 + dw SFX_08_6e_Ch3 + +SFX_08_6f: ; 2027f (8:427f) + db ( $80 | CH4 ) + dw SFX_08_6f_Ch1 + db CH5 + dw SFX_08_6f_Ch2 + db CH7 + dw SFX_08_6f_Ch3 + +SFX_08_70: ; 20288 (8:4288) + db ( $80 | CH4 ) + dw SFX_08_70_Ch1 + db CH5 + dw SFX_08_70_Ch2 + db CH7 + dw SFX_08_70_Ch3 + +SFX_08_71: ; 20291 (8:4291) + db ( $40 | CH4 ) + dw SFX_08_71_Ch1 + db CH5 + dw SFX_08_71_Ch2 + +SFX_08_72: ; 20297 (8:4297) + db ( $40 | CH4 ) + dw SFX_08_72_Ch1 + db CH5 + dw SFX_08_72_Ch2 + +SFX_08_73: ; 2029d (8:429d) + db ( $40 | CH4 ) + dw SFX_08_73_Ch1 + db CH5 + dw SFX_08_73_Ch2 + +SFX_08_74: ; 202a3 (8:42a3) + db ( $80 | CH4 ) + dw SFX_08_74_Ch1 + db CH5 + dw SFX_08_74_Ch2 + db CH7 + dw SFX_08_74_Ch3 + +SFX_08_75: ; 202ac (8:42ac) + db ( $40 | CH4 ) + dw SFX_08_75_Ch1 + db CH5 + dw SFX_08_75_Ch2 + +SFX_08_76: ; 202b2 (8:42b2) + db ( $80 | CH4 ) + dw SFX_08_76_Ch1 + db CH5 + dw SFX_08_76_Ch2 + db CH7 + dw SFX_08_76_Ch3 + +SFX_08_77: ; 202bb (8:42bb) + db CH4 + dw SFX_08_77_Ch1 + +; 0x202be \ No newline at end of file diff --git a/music/headers/sfxheaders1f.asm b/music/headers/sfxheaders1f.asm new file mode 100644 index 00000000..e302e3c1 --- /dev/null +++ b/music/headers/sfxheaders1f.asm @@ -0,0 +1,598 @@ +SFX_Headers_1f: + db $ff, $ff, $ff ; padding + +SFX_1f_01: ; 7c003 (1f:4003) + db CH7 + dw SFX_1f_01_Ch1 + +SFX_1f_02: ; 7c006 (1f:4006) + db CH7 + dw SFX_1f_02_Ch1 + +SFX_1f_03: ; 7c009 (1f:4009) + db CH7 + dw SFX_1f_03_Ch1 + +SFX_1f_04: ; 7c00c (1f:400c) + db CH7 + dw SFX_1f_04_Ch1 + +SFX_1f_05: ; 7c00f (1f:400f) + db CH7 + dw SFX_1f_05_Ch1 + +SFX_1f_06: ; 7c012 (1f:4012) + db CH7 + dw SFX_1f_06_Ch1 + +SFX_1f_07: ; 7c015 (1f:4015) + db CH7 + dw SFX_1f_07_Ch1 + +SFX_1f_08: ; 7c018 (1f:4018) + db CH7 + dw SFX_1f_08_Ch1 + +SFX_1f_09: ; 7c01b (1f:401b) + db CH7 + dw SFX_1f_09_Ch1 + +SFX_1f_0a: ; 7c01e (1f:401e) + db CH7 + dw SFX_1f_0a_Ch1 + +SFX_1f_0b: ; 7c021 (1f:4021) + db CH7 + dw SFX_1f_0b_Ch1 + +SFX_1f_0c: ; 7c024 (1f:4024) + db CH7 + dw SFX_1f_0c_Ch1 + +SFX_1f_0d: ; 7c027 (1f:4027) + db CH7 + dw SFX_1f_0d_Ch1 + +SFX_1f_0e: ; 7c02a (1f:402a) + db CH7 + dw SFX_1f_0e_Ch1 + +SFX_1f_0f: ; 7c02d (1f:402d) + db CH7 + dw SFX_1f_0f_Ch1 + +SFX_1f_10: ; 7c030 (1f:4030) + db CH7 + dw SFX_1f_10_Ch1 + +SFX_1f_11: ; 7c033 (1f:4033) + db CH7 + dw SFX_1f_11_Ch1 + +SFX_1f_12: ; 7c036 (1f:4036) + db CH7 + dw SFX_1f_12_Ch1 + +SFX_1f_13: ; 7c039 (1f:4039) + db CH7 + dw SFX_1f_13_Ch1 + +SFX_1f_14: ; 7c03c (1f:403c) + db ( $80 | CH4 ) + dw SFX_1f_14_Ch1 + db CH5 + dw SFX_1f_14_Ch2 + db CH7 + dw SFX_1f_14_Ch3 + +SFX_1f_15: ; 7c045 (1f:4045) + db ( $80 | CH4 ) + dw SFX_1f_15_Ch1 + db CH5 + dw SFX_1f_15_Ch2 + db CH7 + dw SFX_1f_15_Ch3 + +SFX_1f_16: ; 7c04e (1f:404e) + db ( $80 | CH4 ) + dw SFX_1f_16_Ch1 + db CH5 + dw SFX_1f_16_Ch2 + db CH7 + dw SFX_1f_16_Ch3 + +SFX_1f_17: ; 7c057 (1f:4057) + db ( $80 | CH4 ) + dw SFX_1f_17_Ch1 + db CH5 + dw SFX_1f_17_Ch2 + db CH7 + dw SFX_1f_17_Ch3 + +SFX_1f_18: ; 7c060 (1f:4060) + db ( $80 | CH4 ) + dw SFX_1f_18_Ch1 + db CH5 + dw SFX_1f_18_Ch2 + db CH7 + dw SFX_1f_18_Ch3 + +SFX_1f_19: ; 7c069 (1f:4069) + db ( $80 | CH4 ) + dw SFX_1f_19_Ch1 + db CH5 + dw SFX_1f_19_Ch2 + db CH7 + dw SFX_1f_19_Ch3 + +SFX_1f_1a: ; 7c072 (1f:4072) + db ( $80 | CH4 ) + dw SFX_1f_1a_Ch1 + db CH5 + dw SFX_1f_1a_Ch2 + db CH7 + dw SFX_1f_1a_Ch3 + +SFX_1f_1b: ; 7c07b (1f:407b) + db ( $80 | CH4 ) + dw SFX_1f_1b_Ch1 + db CH5 + dw SFX_1f_1b_Ch2 + db CH7 + dw SFX_1f_1b_Ch3 + +SFX_1f_1c: ; 7c084 (1f:4084) + db ( $80 | CH4 ) + dw SFX_1f_1c_Ch1 + db CH5 + dw SFX_1f_1c_Ch2 + db CH7 + dw SFX_1f_1c_Ch3 + +SFX_1f_1d: ; 7c08d (1f:408d) + db ( $80 | CH4 ) + dw SFX_1f_1d_Ch1 + db CH5 + dw SFX_1f_1d_Ch2 + db CH7 + dw SFX_1f_1d_Ch3 + +SFX_1f_1e: ; 7c096 (1f:4096) + db ( $80 | CH4 ) + dw SFX_1f_1e_Ch1 + db CH5 + dw SFX_1f_1e_Ch2 + db CH7 + dw SFX_1f_1e_Ch3 + +SFX_1f_1f: ; 7c09f (1f:409f) + db ( $80 | CH4 ) + dw SFX_1f_1f_Ch1 + db CH5 + dw SFX_1f_1f_Ch2 + db CH7 + dw SFX_1f_1f_Ch3 + +SFX_1f_20: ; 7c0a8 (1f:40a8) + db ( $80 | CH4 ) + dw SFX_1f_20_Ch1 + db CH5 + dw SFX_1f_20_Ch2 + db CH7 + dw SFX_1f_20_Ch3 + +SFX_1f_21: ; 7c0b1 (1f:40b1) + db ( $80 | CH4 ) + dw SFX_1f_21_Ch1 + db CH5 + dw SFX_1f_21_Ch2 + db CH7 + dw SFX_1f_21_Ch3 + +SFX_1f_22: ; 7c0ba (1f:40ba) + db ( $80 | CH4 ) + dw SFX_1f_22_Ch1 + db CH5 + dw SFX_1f_22_Ch2 + db CH7 + dw SFX_1f_22_Ch3 + +SFX_1f_23: ; 7c0c3 (1f:40c3) + db ( $80 | CH4 ) + dw SFX_1f_23_Ch1 + db CH5 + dw SFX_1f_23_Ch2 + db CH7 + dw SFX_1f_23_Ch3 + +SFX_1f_24: ; 7c0cc (1f:40cc) + db ( $80 | CH4 ) + dw SFX_1f_24_Ch1 + db CH5 + dw SFX_1f_24_Ch2 + db CH7 + dw SFX_1f_24_Ch3 + +SFX_1f_25: ; 7c0d5 (1f:40d5) + db ( $80 | CH4 ) + dw SFX_1f_25_Ch1 + db CH5 + dw SFX_1f_25_Ch2 + db CH7 + dw SFX_1f_25_Ch3 + +SFX_1f_26: ; 7c0de (1f:40de) + db ( $80 | CH4 ) + dw SFX_1f_26_Ch1 + db CH5 + dw SFX_1f_26_Ch2 + db CH7 + dw SFX_1f_26_Ch3 + +SFX_1f_27: ; 7c0e7 (1f:40e7) + db ( $80 | CH4 ) + dw SFX_1f_27_Ch1 + db CH5 + dw SFX_1f_27_Ch2 + db CH7 + dw SFX_1f_27_Ch3 + +SFX_1f_28: ; 7c0f0 (1f:40f0) + db ( $80 | CH4 ) + dw SFX_1f_28_Ch1 + db CH5 + dw SFX_1f_28_Ch2 + db CH7 + dw SFX_1f_28_Ch3 + +SFX_1f_29: ; 7c0f9 (1f:40f9) + db ( $80 | CH4 ) + dw SFX_1f_29_Ch1 + db CH5 + dw SFX_1f_29_Ch2 + db CH7 + dw SFX_1f_29_Ch3 + +SFX_1f_2a: ; 7c102 (1f:4102) + db ( $80 | CH4 ) + dw SFX_1f_2a_Ch1 + db CH5 + dw SFX_1f_2a_Ch2 + db CH7 + dw SFX_1f_2a_Ch3 + +SFX_1f_2b: ; 7c10b (1f:410b) + db ( $80 | CH4 ) + dw SFX_1f_2b_Ch1 + db CH5 + dw SFX_1f_2b_Ch2 + db CH7 + dw SFX_1f_2b_Ch3 + +SFX_1f_2c: ; 7c114 (1f:4114) + db ( $80 | CH4 ) + dw SFX_1f_2c_Ch1 + db CH5 + dw SFX_1f_2c_Ch2 + db CH7 + dw SFX_1f_2c_Ch3 + +SFX_1f_2d: ; 7c11d (1f:411d) + db ( $80 | CH4 ) + dw SFX_1f_2d_Ch1 + db CH5 + dw SFX_1f_2d_Ch2 + db CH7 + dw SFX_1f_2d_Ch3 + +SFX_1f_2e: ; 7c126 (1f:4126) + db ( $80 | CH4 ) + dw SFX_1f_2e_Ch1 + db CH5 + dw SFX_1f_2e_Ch2 + db CH7 + dw SFX_1f_2e_Ch3 + +SFX_1f_2f: ; 7c12f (1f:412f) + db ( $80 | CH4 ) + dw SFX_1f_2f_Ch1 + db CH5 + dw SFX_1f_2f_Ch2 + db CH7 + dw SFX_1f_2f_Ch3 + +SFX_1f_30: ; 7c138 (1f:4138) + db ( $80 | CH4 ) + dw SFX_1f_30_Ch1 + db CH5 + dw SFX_1f_30_Ch2 + db CH7 + dw SFX_1f_30_Ch3 + +SFX_1f_31: ; 7c141 (1f:4141) + db ( $80 | CH4 ) + dw SFX_1f_31_Ch1 + db CH5 + dw SFX_1f_31_Ch2 + db CH7 + dw SFX_1f_31_Ch3 + +SFX_1f_32: ; 7c14a (1f:414a) + db ( $80 | CH4 ) + dw SFX_1f_32_Ch1 + db CH5 + dw SFX_1f_32_Ch2 + db CH7 + dw SFX_1f_32_Ch3 + +SFX_1f_33: ; 7c153 (1f:4153) + db ( $80 | CH4 ) + dw SFX_1f_33_Ch1 + db CH5 + dw SFX_1f_33_Ch2 + db CH7 + dw SFX_1f_33_Ch3 + +SFX_1f_34: ; 7c15c (1f:415c) + db ( $80 | CH4 ) + dw SFX_1f_34_Ch1 + db CH5 + dw SFX_1f_34_Ch2 + db CH7 + dw SFX_1f_34_Ch3 + +SFX_1f_35: ; 7c165 (1f:4165) + db ( $80 | CH4 ) + dw SFX_1f_35_Ch1 + db CH5 + dw SFX_1f_35_Ch2 + db CH7 + dw SFX_1f_35_Ch3 + +SFX_1f_36: ; 7c16e (1f:416e) + db ( $80 | CH4 ) + dw SFX_1f_36_Ch1 + db CH5 + dw SFX_1f_36_Ch2 + db CH7 + dw SFX_1f_36_Ch3 + +SFX_1f_37: ; 7c177 (1f:4177) + db ( $80 | CH4 ) + dw SFX_1f_37_Ch1 + db CH5 + dw SFX_1f_37_Ch2 + db CH7 + dw SFX_1f_37_Ch3 + +SFX_1f_38: ; 7c180 (1f:4180) + db ( $80 | CH4 ) + dw SFX_1f_38_Ch1 + db CH5 + dw SFX_1f_38_Ch2 + db CH7 + dw SFX_1f_38_Ch3 + +SFX_1f_39: ; 7c189 (1f:4189) + db ( $80 | CH4 ) + dw SFX_1f_39_Ch1 + db CH5 + dw SFX_1f_39_Ch2 + db CH7 + dw SFX_1f_39_Ch3 + +SFX_1f_3a: ; 7c192 (1f:4192) + db ( $80 | CH4 ) + dw SFX_1f_3a_Ch1 + db CH5 + dw SFX_1f_3a_Ch2 + db CH6 + dw SFX_1f_3a_Ch3 + +SFX_1f_3b: ; 7c19b (1f:419b) + db ( $80 | CH4 ) + dw SFX_1f_3b_Ch1 + db CH5 + dw SFX_1f_3b_Ch2 + db CH6 + dw SFX_1f_3b_Ch3 + +SFX_1f_3c: ; 7c1a4 (1f:41a4) + db CH4 + dw SFX_1f_3c_Ch1 + +SFX_1f_3d: ; 7c1a7 (1f:41a7) + db CH4 + dw SFX_1f_3d_Ch1 + +SFX_1f_3e: ; 7c1aa (1f:41aa) + db CH4 + dw SFX_1f_3e_Ch1 + +SFX_1f_3f: ; 7c1ad (1f:41ad) + db CH7 + dw SFX_1f_3f_Ch1 + +SFX_1f_40: ; 7c1b0 (1f:41b0) + db CH4 + dw SFX_1f_40_Ch1 + +SFX_1f_41: ; 7c1b3 (1f:41b3) + db ( $80 | CH4 ) + dw SFX_1f_41_Ch1 + db CH5 + dw SFX_1f_41_Ch2 + db CH6 + dw SFX_1f_41_Ch3 + +SFX_1f_42: ; 7c1bc (1f:41bc) + db ( $80 | CH4 ) + dw SFX_1f_42_Ch1 + db CH5 + dw SFX_1f_42_Ch2 + db CH6 + dw SFX_1f_42_Ch3 + +SFX_1f_43: ; 7c1c5 (1f:41c5) + db CH4 + dw SFX_1f_43_Ch1 + +SFX_1f_44: ; 7c1c8 (1f:41c8) + db CH4 + dw SFX_1f_44_Ch1 + +SFX_1f_45: ; 7c1cb (1f:41cb) + db CH4 + dw SFX_1f_45_Ch1 + +SFX_1f_46: ; 7c1ce (1f:41ce) + db CH4 + dw SFX_1f_46_Ch1 + +SFX_1f_47: ; 7c1d1 (1f:41d1) + db CH4 + dw SFX_1f_47_Ch1 + +SFX_1f_48: ; 7c1d4 (1f:41d4) + db CH4 + dw SFX_1f_48_Ch1 + +SFX_1f_49: ; 7c1d7 (1f:41d7) + db CH4 + dw SFX_1f_49_Ch1 + +SFX_1f_4a: ; 7c1da (1f:41da) + db CH4 + dw SFX_1f_4a_Ch1 + +SFX_1f_4b: ; 7c1dd (1f:41dd) + db CH4 + dw SFX_1f_4b_Ch1 + +SFX_1f_4c: ; 7c1e0 (1f:41e0) + db CH4 + dw SFX_1f_4c_Ch1 + +SFX_1f_4d: ; 7c1e3 (1f:41e3) + db CH4 + dw SFX_1f_4d_Ch1 + +SFX_1f_4e: ; 7c1e6 (1f:41e6) + db CH4 + dw SFX_1f_4e_Ch1 + +SFX_1f_4f: ; 7c1e9 (1f:41e9) + db CH7 + dw SFX_1f_4f_Ch1 + +SFX_1f_50: ; 7c1ec (1f:41ec) + db CH7 + dw SFX_1f_50_Ch1 + +SFX_1f_51: ; 7c1ef (1f:41ef) + db ( $40 | CH4 ) + dw SFX_1f_51_Ch1 + db CH5 + dw SFX_1f_51_Ch2 + +SFX_1f_52: ; 7c1f5 (1f:41f5) + db CH4 + dw SFX_1f_52_Ch1 + +SFX_1f_53: ; 7c1f8 (1f:41f8) + db CH7 + dw SFX_1f_53_Ch1 + +SFX_1f_54: ; 7c1fb (1f:41fb) + db ( $40 | CH4 ) + dw SFX_1f_54_Ch1 + db CH5 + dw SFX_1f_54_Ch2 + +SFX_1f_55: ; 7c201 (1f:4201) + db CH4 + dw SFX_1f_55_Ch1 + +SFX_1f_56: ; 7c204 (1f:4204) + db CH7 + dw SFX_1f_56_Ch1 + +SFX_1f_57: ; 7c207 (1f:4207) + db CH7 + dw SFX_1f_57_Ch1 + +SFX_1f_58: ; 7c20a (1f:420a) + db ( $40 | CH4 ) + dw SFX_1f_58_Ch1 + db CH5 + dw SFX_1f_58_Ch2 + +SFX_1f_59: ; 7c210 (1f:4210) + db ( $40 | CH4 ) + dw SFX_1f_59_Ch1 + db CH5 + dw SFX_1f_59_Ch2 + +SFX_1f_5a: ; 7c216 (1f:4216) + db ( $40 | CH4 ) + dw SFX_1f_5a_Ch1 + db CH5 + dw SFX_1f_5a_Ch2 + +SFX_1f_5b: ; 7c21c (1f:421c) + db CH4 + dw SFX_1f_5b_Ch1 + +SFX_1f_5c: ; 7c21f (1f:421f) + db CH7 + dw SFX_1f_5c_Ch1 + +SFX_1f_5d: ; 7c222 (1f:4222) + db ( $40 | CH4 ) + dw SFX_1f_5d_Ch1 + db CH5 + dw SFX_1f_5d_Ch2 + +SFX_1f_5e: ; 7c228 (1f:4228) + db CH7 + dw SFX_1f_5e_Ch1 + +SFX_1f_5f: ; 7c22b (1f:422b) + db CH4 + dw SFX_1f_5f_Ch1 + +SFX_1f_60: ; 7c22e (1f:422e) + db CH4 + dw SFX_1f_60_Ch1 + +SFX_1f_61: ; 7c231 (1f:4231) + db CH7 + dw SFX_1f_61_Ch1 + +SFX_1f_62: ; 7c234 (1f:4234) + db CH7 + dw SFX_1f_62_Ch1 + +SFX_1f_63: ; 7c237 (1f:4237) + db CH7 + dw SFX_1f_63_Ch1 + +SFX_1f_64: ; 7c23a (1f:423a) + db CH4 + dw SFX_1f_64_Ch1 + +SFX_1f_65: ; 7c23d (1f:423d) + db CH4 + dw SFX_1f_65_Ch1 + +SFX_1f_66: ; 7c240 (1f:4240) + db ( $40 | CH4 ) + dw SFX_1f_66_Ch1 + db CH5 + dw SFX_1f_66_Ch2 + +SFX_1f_67: ; 7c246 (1f:4246) + db CH4 + dw SFX_1f_67_Ch1 + +; 0x7c249 \ No newline at end of file diff --git a/music/indigoplateau.asm b/music/indigoplateau.asm new file mode 100644 index 00000000..46f9d4b1 --- /dev/null +++ b/music/indigoplateau.asm @@ -0,0 +1,322 @@ +Music_IndigoPlateau_Ch1: ; a5f0 (2:65f0) + tempo 0, 132 + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 2 + octave 2 + note A_, 8 + note A_, 8 + note A_, 8 + note A_, 4 + notetype 12, 10, 4 + note A#, 4 + +Music_IndigoPlateau_branch_a605: + callchannel Music_IndigoPlateau_branch_a659 + notetype 12, 11, 4 + octave 3 + note D_, 4 + callchannel Music_IndigoPlateau_branch_a659 + notetype 12, 11, 4 + octave 3 + note D#, 4 + callchannel Music_IndigoPlateau_branch_a659 + notetype 12, 11, 4 + octave 3 + note D_, 4 + callchannel Music_IndigoPlateau_branch_a659 + notetype 12, 10, 0 + octave 2 + note A#, 4 + callchannel Music_IndigoPlateau_branch_a659 + notetype 12, 11, 4 + octave 3 + note D_, 4 + notetype 12, 13, 4 + octave 3 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + notetype 12, 11, 4 + octave 3 + note D#, 4 + notetype 12, 13, 4 + octave 3 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + notetype 12, 11, 4 + octave 3 + note F_, 2 + notetype 12, 11, 4 + octave 3 + note G_, 2 + notetype 12, 11, 0 + note A_, 8 + octave 2 + note A_, 8 + notetype 12, 11, 7 + octave 3 + note F_, 8 + notetype 12, 4, 14 + octave 2 + note A#, 8 + loopchannel 0, Music_IndigoPlateau_branch_a605 + +Music_IndigoPlateau_branch_a659: + notetype 12, 11, 2 + octave 2 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + endchannel + + +Music_IndigoPlateau_Ch2: ; a664 (2:6664) + duty 3 + vibrato 8, 2, 5 + notetype 12, 12, 2 + octave 3 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 4 + notetype 12, 5, 10 + note D#, 4 + +Music_IndigoPlateau_branch_a673: + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 5 + note A_, 4 + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 5 + note A#, 4 + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 5 + note A_, 4 + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 7 + note C#, 4 + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 5 + note A_, 4 + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 5 + note A#, 4 + callchannel Music_IndigoPlateau_branch_a6af + notetype 12, 12, 5 + octave 4 + note C_, 2 + notetype 12, 12, 7 + octave 4 + note C#, 2 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + notetype 12, 4, 13 + octave 4 + note D#, 8 + loopchannel 0, Music_IndigoPlateau_branch_a673 + +Music_IndigoPlateau_branch_a6af: + notetype 12, 12, 2 + octave 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + endchannel + + +Music_IndigoPlateau_Ch3: ; a6ba (2:66ba) + notetype 12, 1, 0 + octave 4 + note D_, 2 + rest 6 + note D_, 2 + rest 6 + note D_, 2 + rest 6 + note D_, 2 + rest 2 + note D#, 4 + +Music_IndigoPlateau_branch_a6c6: + callchannel Music_IndigoPlateau_branch_a6fe + callchannel Music_IndigoPlateau_branch_a6fe + callchannel Music_IndigoPlateau_branch_a6fe + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note F#, 4 + callchannel Music_IndigoPlateau_branch_a6fe + callchannel Music_IndigoPlateau_branch_a6fe + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note A#, 1 + rest 1 + note A#, 1 + rest 1 + note A_, 8 + note D_, 8 + note A#, 8 + note D#, 8 + loopchannel 0, Music_IndigoPlateau_branch_a6c6 + +Music_IndigoPlateau_branch_a6fe: + octave 4 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note D_, 2 + rest 2 + note A_, 4 + endchannel + + +Music_IndigoPlateau_Ch4: ; a70f (2:670f) + dspeed 6 + dnote 16, mutedsnare2 + dnote 16, mutedsnare2 + dnote 16, mutedsnare2 + dnote 8, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + +Music_IndigoPlateau_branch_a728: + callchannel Music_IndigoPlateau_branch_a791 + callchannel Music_IndigoPlateau_branch_a77e + callchannel Music_IndigoPlateau_branch_a791 + callchannel Music_IndigoPlateau_branch_a7a8 + callchannel Music_IndigoPlateau_branch_a791 + callchannel Music_IndigoPlateau_branch_a77e + callchannel Music_IndigoPlateau_branch_a791 + callchannel Music_IndigoPlateau_branch_a7a8 + callchannel Music_IndigoPlateau_branch_a791 + callchannel Music_IndigoPlateau_branch_a77e + callchannel Music_IndigoPlateau_branch_a791 + callchannel Music_IndigoPlateau_branch_a7a8 + callchannel Music_IndigoPlateau_branch_a77e + callchannel Music_IndigoPlateau_branch_a7a8 + dnote 16, mutedsnare2 + dnote 8, mutedsnare2 + dnote 8, mutedsnare3 + dnote 16, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + loopchannel 0, Music_IndigoPlateau_branch_a728 + +Music_IndigoPlateau_branch_a77e: + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare4 + dnote 4, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare4 + dnote 2, mutedsnare4 + dnote 2, mutedsnare3 + endchannel + +Music_IndigoPlateau_branch_a791: + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare4 + dnote 4, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + endchannel + +Music_IndigoPlateau_branch_a7a8: + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + endchannel +; 0xa7c5 \ No newline at end of file diff --git a/music/introbattle.asm b/music/introbattle.asm new file mode 100644 index 00000000..f3956fe7 --- /dev/null +++ b/music/introbattle.asm @@ -0,0 +1,330 @@ +Music_IntroBattle_Ch1: ; 7f844 (1f:7844) + tempo 0, 98 + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 1 + rest 8 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note D_, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note D#, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note D_, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 10, 0 + note A#, 4 + notetype 12, 11, 1 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note D_, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 2, 9 + octave 3 + note G_, 4 + notetype 12, 11, 0 + note A_, 8 + octave 2 + note A_, 8 + notetype 12, 11, 7 + octave 3 + note F_, 8 + notetype 12, 4, 15 + octave 2 + note F_, 8 + notetype 12, 11, 1 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note D_, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note D#, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note F_, 4 + notetype 12, 11, 1 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 11, 4 + octave 3 + note G_, 4 + notetype 12, 11, 0 + note F#, 16 + notetype 12, 11, 1 + octave 4 + note D_, 16 + endchannel + + +Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) + duty 3 + vibrato 8, 2, 5 + notetype 12, 12, 2 + rest 8 + octave 3 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + note A_, 4 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + note A#, 4 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + note A_, 4 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 11, 7 + note C#, 4 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + note A_, 4 + notetype 12, 12, 2 + octave 3 + note D_, 2 + note D_, 2 + notetype 12, 12, 7 + octave 4 + note C#, 4 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + octave 3 + note C_, 8 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + note A_, 4 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + note A#, 4 + notetype 12, 12, 2 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + octave 4 + note C_, 4 + notetype 12, 12, 2 + octave 3 + note D_, 2 + note D_, 2 + notetype 12, 12, 5 + octave 4 + note C#, 4 + notetype 12, 2, 15 + note D_, 16 + notetype 12, 12, 1 + octave 5 + note D_, 16 + endchannel + + +Music_IntroBattle_Ch3: ; 7f91d (1f:791d) + notetype 12, 1, 0 + rest 8 + octave 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 4 + note A_, 8 + note D_, 8 + note A#, 8 + note D_, 8 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 4 + note D_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 4 + note A_, 16 + note D_, 1 + rest 15 + endchannel + + +Music_IntroBattle_Ch4: ; 7f95b (1f:795b) + dspeed 6 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 16, mutedsnare2 + dnote 16, mutedsnare2 + dnote 16, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + dnote 1, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 4, mutedsnare2 + dnote 16, mutedsnare2 + dnote 16, mutedsnare2 + dnote 2, mutedsnare2 + rest 16 + rest 14 + endchannel +; 0x7fa19 \ No newline at end of file diff --git a/music/jigglypuffsong.asm b/music/jigglypuffsong.asm new file mode 100644 index 00000000..0db6fe94 --- /dev/null +++ b/music/jigglypuffsong.asm @@ -0,0 +1,41 @@ +Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) + tempo 0, 144 + stereopanning 119 + vibrato 8, 2, 4 + duty 2 + dutycycle 165 + unknownmusic0xe8 + notetype 13, 6, 7 + octave 4 + note E_, 8 + notetype 12, 6, 7 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + endchannel + + +Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) + vibrato 5, 1, 5 + duty 2 + dutycycle 10 + notetype 12, 10, 7 + octave 4 + note E_, 8 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + endchannel +; 0x7fbaf \ No newline at end of file diff --git a/music/lavender.asm b/music/lavender.asm new file mode 100644 index 00000000..5ec494e5 --- /dev/null +++ b/music/lavender.asm @@ -0,0 +1,200 @@ +Music_Lavender_Ch1: ; bb58 (2:7b58) + tempo 0, 152 + stereopanning 119 + duty 1 + unknownmusic0xe8 + vibrato 0, 8, 8 + notetype 12, 8, 7 + rest 16 + rest 16 + rest 16 + rest 16 + notetype 12, 10, 7 + +Music_Lavender_branch_bb6b: + octave 3 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note C_, 8 + note C_, 8 + octave 3 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note C_, 8 + note C_, 8 + rest 16 + rest 16 + rest 16 + rest 16 + loopchannel 0, Music_Lavender_branch_bb6b + + +Music_Lavender_Ch2: ; bb9e (2:7b9e) + vibrato 0, 3, 4 + duty 3 + notetype 12, 9, 1 + +Music_Lavender_branch_bba5: + octave 5 + note C_, 4 + note G_, 4 + note B_, 4 + note F#, 4 + loopchannel 0, Music_Lavender_branch_bba5 + + +Music_Lavender_Ch3: ; bbae (2:7bae) + vibrato 4, 1, 1 + notetype 12, 3, 5 + rest 16 + rest 16 + rest 16 + rest 16 + notetype 12, 2, 5 + +Music_Lavender_branch_bbb9: + octave 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + notetype 12, 3, 5 + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + notetype 12, 2, 5 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + notetype 12, 2, 5 + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + loopchannel 0, Music_Lavender_branch_bbb9 + + +Music_Lavender_Ch4: ; bc21 (2:7c21) + dspeed 12 + rest 16 + rest 16 + rest 16 + rest 16 + +Music_Lavender_branch_bc26: + dnote 8, triangle2 + dnote 8, triangle2 + loopchannel 0, Music_Lavender_branch_bc26 +; 0xbc2e \ No newline at end of file diff --git a/music/meeteviltrainer.asm b/music/meeteviltrainer.asm new file mode 100644 index 00000000..a81673f7 --- /dev/null +++ b/music/meeteviltrainer.asm @@ -0,0 +1,81 @@ +Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) + tempo 0, 124 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 12, 11, 1 + rest 4 + octave 3 + note D_, 2 + note C#, 2 + notetype 12, 4, 15 + note D_, 4 + +Music_MeetEvilTrainer_branch_7f6ae: + notetype 12, 10, 1 + note D_, 4 + note D_, 4 + note D_, 4 + notetype 12, 7, 0 + note D_, 4 + loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae + + +Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba) + duty 1 + notetype 12, 11, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 8 + +Music_MeetEvilTrainer_branch_7f6c2: + notetype 12, 12, 2 + octave 4 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + octave 3 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + notetype 12, 4, 15 + note A#, 4 + notetype 12, 12, 2 + note G_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + notetype 12, 3, 15 + note A#, 4 + notetype 12, 12, 2 + loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + + +Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) + notetype 12, 1, 0 + rest 8 + octave 4 + note F#, 1 + rest 1 + note F_, 1 + rest 1 + +Music_MeetEvilTrainer_branch_7f6ee: + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note A#, 4 + loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee +; 0x7f6f9 \ No newline at end of file diff --git a/music/meetfemaletrainer.asm b/music/meetfemaletrainer.asm new file mode 100644 index 00000000..32db8bf4 --- /dev/null +++ b/music/meetfemaletrainer.asm @@ -0,0 +1,119 @@ +Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) + tempo 0, 124 + stereopanning 119 + duty 1 + unknownmusic0xe8 + notetype 12, 11, 2 + octave 3 + note G#, 6 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + notetype 12, 8, 1 + +Music_MeetFemaleTrainer_branch_7f70c: + octave 3 + note E_, 4 + loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 + octave 2 + note B_, 4 + note B_, 4 + octave 3 + note E_, 4 + loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c + + +Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c) + duty 2 + notetype 12, 12, 2 + octave 3 + note B_, 2 + notetype 12, 12, 7 + octave 4 + note B_, 12 + +Music_MeetFemaleTrainer_branch_7f726: + notetype 12, 12, 2 + octave 3 + note B_, 4 + octave 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 + + +Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) + notetype 12, 1, 0 + rest 8 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + +Music_MeetFemaleTrainer_branch_7f756: + callchannel Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 + rest 3 + note E_, 1 + rest 3 + note G#, 1 + rest 3 + note E_, 1 + rest 3 + callchannel Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 + rest 3 + note E_, 1 + rest 3 + note G#, 1 + rest 3 + note B_, 1 + rest 3 + loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + +Music_MeetFemaleTrainer_branch_7f770: + note G#, 1 + rest 3 + note E_, 1 + rest 3 + note G#, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + endchannel +; 0x7f77b \ No newline at end of file diff --git a/music/meetmaletrainer.asm b/music/meetmaletrainer.asm new file mode 100644 index 00000000..ae52ddae --- /dev/null +++ b/music/meetmaletrainer.asm @@ -0,0 +1,191 @@ +Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) + tempo 0, 112 + stereopanning 119 + duty 3 + vibrato 20, 3, 3 + unknownmusic0xe8 + notetype 12, 11, 4 + octave 3 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 + rest 16 + +Music_MeetMaleTrainer_branch_7f78f: + octave 3 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 4 + note E_, 6 + note F_, 2 + note F#, 4 + note G_, 8 + octave 4 + note D_, 8 + note E_, 16 + loopchannel 0, Music_MeetMaleTrainer_branch_7f78f + + +Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) + duty 3 + vibrato 24, 2, 2 + notetype 12, 12, 4 + octave 4 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 12 + rest 2 + note E_, 1 + rest 3 + note E_, 1 + rest 9 + +Music_MeetMaleTrainer_branch_7f7b5: + notetype 12, 12, 4 + octave 4 + note E_, 6 + note D#, 6 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + notetype 12, 12, 7 + note F_, 16 + notetype 12, 12, 5 + octave 3 + note F#, 8 + octave 4 + note C#, 8 + loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + + +Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) + notetype 12, 1, 0 + rest 6 + octave 4 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 3 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note F#, 1 + rest 1 + +Music_MeetMaleTrainer_branch_7f7ea: + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + octave 4 + note G_, 1 + rest 1 + octave 5 + note D_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea +; 0x7f844 \ No newline at end of file diff --git a/music/meetprofoak.asm b/music/meetprofoak.asm new file mode 100644 index 00000000..3a097b0b --- /dev/null +++ b/music/meetprofoak.asm @@ -0,0 +1,424 @@ +Music_MeetProfOak_Ch1: ; af59 (2:6f59) + tempo 0, 112 + stereopanning 119 + duty 3 + unknownmusic0xe8 + notetype 12, 11, 4 + octave 3 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 1 + note F#, 12 + notetype 12, 10, 2 + octave 3 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + +Music_MeetProfOak_branch_af85: + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + loopchannel 0, Music_MeetProfOak_branch_af85 + + +Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) + vibrato 8, 1, 1 + duty 2 + notetype 12, 12, 4 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 12 + notetype 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 6, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 11, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 8, 1 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 6, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 11, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 8, 1 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 11, 5 + +Music_MeetProfOak_branch_b005: + octave 4 + note C#, 6 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 6 + note C#, 1 + note E_, 1 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 8 + notetype 12, 6, 5 + octave 4 + note B_, 6 + note G#, 1 + note B_, 1 + octave 5 + note E_, 8 + notetype 12, 11, 5 + octave 3 + note A_, 6 + note F#, 1 + note A_, 1 + octave 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + notetype 12, 11, 7 + note G#, 16 + loopchannel 0, Music_MeetProfOak_branch_b005 + + +Music_MeetProfOak_Ch3: ; b03d (2:703d) + notetype 12, 1, 2 + rest 10 + octave 4 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 5 + octave 5 + note E_, 4 + rest 6 + octave 4 + note B_, 1 + rest 5 + octave 5 + note E_, 4 + octave 4 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note G_, 1 + rest 1 + note G#, 1 + rest 1 + +Music_MeetProfOak_branch_b0bc: + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + loopchannel 2, Music_MeetProfOak_branch_b0bc + +Music_MeetProfOak_branch_b0d8: + octave 4 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + loopchannel 2, Music_MeetProfOak_branch_b0d8 + +Music_MeetProfOak_branch_b0ed: + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + loopchannel 2, Music_MeetProfOak_branch_b0ed + +Music_MeetProfOak_branch_b101: + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + loopchannel 2, Music_MeetProfOak_branch_b101 + loopchannel 0, Music_MeetProfOak_branch_b0bc +; 0xb119 \ No newline at end of file diff --git a/music/meetrival.asm b/music/meetrival.asm new file mode 100644 index 00000000..75d38a29 --- /dev/null +++ b/music/meetrival.asm @@ -0,0 +1,395 @@ +Music_MeetRival_branch_b119: + tempo 0, 100 + loopchannel 0, Music_MeetRival_branch_b123 + +Music_MeetRival_Ch1: ; b120 (2:7120) + tempo 0, 112 + +Music_MeetRival_branch_b123: + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 3 + octave 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 + rest 3 + note D_, 1 + rest 5 + note A_, 2 + note G_, 2 + note A_, 2 + +Music_MeetRival_branch_b140: + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 + octave 4 + note C_, 4 + note D_, 2 + rest 4 + note D_, 4 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 + octave 3 + note B_, 4 + octave 4 + note C_, 2 + rest 4 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + rest 2 + octave 3 + note D_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 2 + note F_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + rest 4 + note A#, 4 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + notetype 12, 11, 7 + octave 3 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 + rest 4 + note D_, 4 + notetype 12, 11, 3 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_MeetRival_branch_b140 + +Music_MeetRival_branch_b19b: + tempo 0, 100 + loopchannel 0, Music_MeetRival_branch_b1a5 + tempo 0, 112 + +Music_MeetRival_branch_b1a5: + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 3 + octave 3 + note D_, 1 + rest 3 + note D_, 1 + rest 5 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_MeetRival_branch_b140 + + +Music_MeetRival_Ch2: ; b1bb (2:71bb) + duty 3 + vibrato 10, 2, 6 + notetype 12, 12, 7 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 6 + octave 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note D_, 1 + rest 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + +Music_MeetRival_branch_b1d8: + notetype 12, 12, 7 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 + rest 4 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 + octave 5 + note C_, 4 + octave 4 + note G_, 2 + note A#, 6 + note B_, 4 + octave 5 + note C_, 2 + rest 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + notetype 12, 11, 0 + note D_, 16 + notetype 12, 11, 5 + note D_, 6 + notetype 12, 12, 7 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + notetype 12, 11, 0 + note C_, 8 + notetype 12, 12, 7 + note C_, 8 + octave 4 + note C_, 2 + rest 4 + note A#, 4 + note G_, 2 + note F_, 2 + notetype 12, 11, 0 + note G_, 16 + notetype 12, 11, 3 + note G_, 2 + octave 3 + note G_, 2 + rest 4 + note G_, 4 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + loopchannel 0, Music_MeetRival_branch_b1d8 + +Music_MeetRival_branch_b21d: + duty 3 + vibrato 10, 2, 6 + notetype 12, 12, 7 + octave 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note D_, 1 + rest 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + loopchannel 0, Music_MeetRival_branch_b1d8 + + +Music_MeetRival_Ch3: ; b233 (2:7233) + notetype 12, 1, 4 + octave 5 + note D_, 2 + rest 2 + note C#, 2 + rest 2 + note C_, 2 + rest 2 + octave 4 + note B_, 2 + rest 2 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + +Music_MeetRival_branch_b24b: + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 4 + octave 5 + note D_, 4 + octave 4 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + rest 2 + note B_, 2 + octave 5 + note C_, 2 + rest 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + rest 2 + note F#, 2 + note A_, 2 + note F#, 2 + rest 2 + note A_, 2 + note F#, 2 + note A_, 2 + rest 2 + note F#, 2 + note A_, 2 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note A_, 2 + note E_, 2 + octave 5 + note C_, 2 + rest 2 + octave 4 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 + rest 4 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 + rest 2 + note G_, 2 + note A#, 2 + note G_, 2 + rest 2 + note A#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + rest 2 + octave 5 + note D_, 2 + loopchannel 0, Music_MeetRival_branch_b24b + +Music_MeetRival_branch_b2b5: + notetype 12, 1, 4 + octave 4 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + loopchannel 0, Music_MeetRival_branch_b24b +; 0xb2c8 \ No newline at end of file diff --git a/music/museumguy.asm b/music/museumguy.asm new file mode 100644 index 00000000..9da69804 --- /dev/null +++ b/music/museumguy.asm @@ -0,0 +1,338 @@ +Music_MuseumGuy_Ch1: ; adae (2:6dae) + tempo 0, 128 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 12, 11, 1 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + octave 2 + note B_, 4 + note B_, 1 + octave 3 + note D#, 1 + note E_, 1 + note G#, 1 + note B_, 10 + callchannel Music_MuseumGuy_branch_ade7 + callchannel Music_MuseumGuy_branch_adec + callchannel Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + +Music_MuseumGuy_branch_add6: + callchannel Music_MuseumGuy_branch_ade7 + callchannel Music_MuseumGuy_branch_adec + callchannel Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + loopchannel 0, Music_MuseumGuy_branch_add6 + +Music_MuseumGuy_branch_ade7: + note E_, 2 + note E_, 6 + note F#, 2 + note F#, 6 + endchannel + +Music_MuseumGuy_branch_adec: + note E_, 2 + note E_, 6 + note D_, 2 + note D_, 6 + endchannel + + +Music_MuseumGuy_Ch2: ; adf1 (2:6df1) + duty 2 + notetype 12, 12, 1 + octave 4 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 8 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A_, 4 + +Music_MuseumGuy_branch_ae26: + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 3 + notetype 12, 8, 1 + note E_, 1 + notetype 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + notetype 12, 9, 1 + note A_, 1 + notetype 12, 12, 1 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note B_, 3 + notetype 12, 10, 1 + note G#, 1 + notetype 12, 12, 1 + note A_, 2 + octave 4 + note C#, 2 + note E_, 3 + notetype 12, 9, 1 + note E_, 1 + notetype 12, 12, 1 + note D_, 2 + note F#, 2 + note A_, 3 + notetype 12, 8, 1 + note A_, 1 + notetype 12, 12, 1 + note G#, 2 + note E_, 1 + notetype 12, 8, 1 + note E_, 1 + notetype 12, 12, 1 + note F#, 2 + notetype 12, 8, 1 + note F#, 1 + notetype 12, 12, 1 + note G#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + loopchannel 0, Music_MuseumGuy_branch_ae26 + + +Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) + notetype 12, 1, 0 + rest 16 + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 9 + callchannel Music_MuseumGuy_branch_aeb8 + note A_, 1 + rest 1 + note A_, 1 + rest 5 + note G#, 1 + rest 1 + note G#, 1 + rest 5 + callchannel Music_MuseumGuy_branch_aeb8 + note B_, 1 + rest 3 + note G#, 1 + rest 3 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + +Music_MuseumGuy_branch_ae8e: + callchannel Music_MuseumGuy_branch_aec1 + rest 3 + octave 6 + note E_, 1 + rest 1 + octave 5 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + callchannel Music_MuseumGuy_branch_aec1 + rest 1 + octave 6 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 3 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + loopchannel 0, Music_MuseumGuy_branch_ae8e + +Music_MuseumGuy_branch_aeb8: + note A_, 1 + rest 1 + note A_, 1 + rest 5 + note A_, 1 + rest 1 + note A_, 1 + rest 5 + endchannel + +Music_MuseumGuy_branch_aec1: + octave 6 + note C#, 1 + rest 1 + octave 5 + note A_, 1 + rest 1 + note A_, 1 + rest 3 + octave 6 + note F#, 1 + rest 1 + octave 5 + note A_, 1 + rest 1 + note A_, 1 + endchannel + + +Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) + dspeed 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 14 + dspeed 6 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + +Music_MuseumGuy_branch_aee1: + dnote 4, mutedsnare2 + dnote 6, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 6, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 4, mutedsnare2 + dnote 6, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 6, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 2, mutedsnare2 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 6, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + loopchannel 0, Music_MuseumGuy_branch_aee1 +; 0xaf59 \ No newline at end of file diff --git a/music/oakslab.asm b/music/oakslab.asm new file mode 100644 index 00000000..4040603a --- /dev/null +++ b/music/oakslab.asm @@ -0,0 +1,394 @@ +Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) + tempo 0, 140 + stereopanning 119 + duty 3 + vibrato 16, 1, 2 + unknownmusic0xe8 + notetype 12, 11, 3 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note B_, 1 + +Music_OaksLab_branch_7eed0: + octave 4 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 4 + note G#, 2 + note A_, 2 + note B_, 1 + rest 3 + note A_, 6 + note G#, 1 + note B_, 1 + octave 4 + note C#, 4 + octave 3 + note A_, 4 + note G#, 2 + note A_, 2 + note F#, 4 + note E_, 2 + note F#, 2 + note G#, 1 + rest 3 + note F#, 8 + note E_, 4 + note A_, 6 + note E_, 1 + note A_, 1 + octave 4 + note D_, 8 + note C#, 6 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 8 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 1 + rest 3 + note E_, 4 + note F#, 4 + note G#, 4 + loopchannel 0, Music_OaksLab_branch_7eed0 + + +Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) + duty 3 + vibrato 10, 2, 5 + notetype 12, 12, 4 + octave 3 + note G#, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + +Music_OaksLab_branch_7ef16: + note A_, 6 + note G#, 1 + note F#, 1 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 1 + rest 3 + note E_, 8 + note E_, 4 + note F#, 6 + note E_, 1 + note D_, 1 + note C#, 6 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + rest 3 + note C#, 8 + note C#, 4 + note D_, 6 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note F#, 8 + note E_, 6 + note C#, 1 + note E_, 1 + note A_, 8 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 4 + note G#, 2 + note F#, 2 + note E_, 1 + rest 1 + octave 3 + note G#, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + loopchannel 0, Music_OaksLab_branch_7ef16 + + +Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) + notetype 12, 1, 1 + rest 2 + octave 4 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + +Music_OaksLab_branch_7ef5c: + note C#, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + rest 3 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + rest 3 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note C#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note C#, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 3 + note A_, 1 + rest 3 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note E_, 1 + rest 5 + note G#, 1 + rest 3 + note F#, 1 + rest 3 + note E_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note C#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 3 + note A_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note C#, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 3 + note G#, 1 + rest 3 + note F#, 1 + rest 3 + note E_, 1 + rest 3 + loopchannel 0, Music_OaksLab_branch_7ef5c +; 0x7f04a \ No newline at end of file diff --git a/music/pallettown.asm b/music/pallettown.asm new file mode 100644 index 00000000..a1d4dd50 --- /dev/null +++ b/music/pallettown.asm @@ -0,0 +1,315 @@ +Music_PalletTown_Ch1: ; a7c5 (2:67c5) + tempo 0, 160 + stereopanning 119 + duty 2 + notetype 12, 12, 3 + +Music_PalletTown_branch_a7ce: + octave 3 + note B_, 4 + octave 4 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 4 + note G_, 2 + octave 4 + note D_, 4 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + rest 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 8 + rest 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F#, 2 + note B_, 4 + octave 4 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 4 + note G_, 2 + octave 4 + note D_, 4 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note C_, 4 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 4 + note F#, 4 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + notetype 12, 11, 3 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + loopchannel 0, Music_PalletTown_branch_a7ce + endchannel + + +Music_PalletTown_Ch2: ; a85f (2:685f) + duty 2 + +Music_PalletTown_branch_a861: + notetype 12, 13, 3 + octave 5 + note D_, 2 + notetype 12, 10, 3 + note C_, 2 + notetype 12, 13, 3 + octave 4 + note B_, 2 + notetype 12, 11, 3 + note A_, 2 + notetype 12, 13, 3 + octave 5 + note G_, 2 + notetype 12, 11, 3 + note E_, 2 + notetype 12, 13, 3 + note F#, 2 + note E_, 2 + note D_, 6 + octave 4 + note B_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 10 + octave 4 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note A_, 8 + octave 5 + note D_, 2 + notetype 12, 10, 3 + note C_, 2 + notetype 12, 13, 3 + octave 4 + note B_, 2 + notetype 12, 11, 3 + octave 5 + note D_, 2 + notetype 12, 13, 3 + note G_, 2 + notetype 12, 10, 3 + note F#, 2 + notetype 12, 11, 3 + note F#, 2 + notetype 12, 13, 3 + note G_, 2 + note E_, 6 + note D_, 2 + note D_, 8 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 10 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 8 + note D_, 6 + note C_, 2 + octave 4 + note B_, 8 + rest 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 4 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 + octave 4 + note B_, 8 + rest 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 8 + note E_, 4 + note B_, 4 + note A_, 8 + note G_, 4 + note E_, 4 + note F#, 8 + note G_, 4 + note B_, 4 + note B_, 8 + note A_, 8 + loopchannel 0, Music_PalletTown_branch_a861 + endchannel + + +Music_PalletTown_Ch3: ; a8de (2:68de) + vibrato 24, 2, 8 + notetype 12, 1, 2 + +Music_PalletTown_branch_a8e3: + octave 4 + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note A_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note E_, 4 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note A_, 4 + note G_, 4 + note E_, 8 + note A_, 8 + note E_, 8 + note G_, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + loopchannel 0, Music_PalletTown_branch_a8e3 + endchannel +; 0xa913 \ No newline at end of file diff --git a/music/pkmnhealed.asm b/music/pkmnhealed.asm new file mode 100644 index 00000000..26ac7944 --- /dev/null +++ b/music/pkmnhealed.asm @@ -0,0 +1,48 @@ +Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) + tempo 0, 144 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 12, 8, 1 + rest 2 + pitchbend 0, 75 + note B_, 2 + pitchbend 0, 84 + note B_, 2 + pitchbend 0, 68 + note E_, 2 + rest 4 + pitchbend 0, 59 + note E_, 4 + pitchbend 0, 75 + note B_, 4 + endchannel + + +Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) + duty 2 + notetype 12, 12, 3 + octave 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + notetype 12, 12, 4 + octave 5 + note E_, 8 + endchannel + + +Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) + notetype 12, 1, 0 + octave 4 + note E_, 2 + rest 2 + note E_, 2 + rest 2 + note E_, 2 + note G#, 2 + note E_, 6 + rest 2 + endchannel +; 0x9bde \ No newline at end of file diff --git a/music/pokecenter.asm b/music/pokecenter.asm new file mode 100644 index 00000000..fc3e0e7a --- /dev/null +++ b/music/pokecenter.asm @@ -0,0 +1,376 @@ +Music_Pokecenter_Ch1: ; be56 (2:7e56) + tempo 0, 144 + stereopanning 119 + duty 3 + vibrato 10, 2, 2 + unknownmusic0xe8 + +Music_Pokecenter_branch_be61: + notetype 12, 10, 3 + octave 3 + note F#, 2 + note F_, 2 + note F#, 2 + notetype 12, 11, 5 + octave 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + notetype 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + notetype 12, 11, 5 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + notetype 12, 10, 3 + note F#, 2 + note F_, 2 + note F#, 2 + notetype 12, 11, 5 + octave 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + notetype 12, 10, 3 + note A_, 2 + note E_, 2 + note A_, 2 + notetype 12, 11, 5 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note F#, 2 + note E_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 8 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note G_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + loopchannel 0, Music_Pokecenter_branch_be61 + + +Music_Pokecenter_Ch2: ; bef9 (2:7ef9) + vibrato 8, 2, 5 + +Music_Pokecenter_branch_befc: + callchannel Music_Pokecenter_branch_bf4e + duty 3 + notetype 12, 10, 5 + octave 3 + note A_, 4 + note E_, 4 + callchannel Music_Pokecenter_branch_bf60 + note D_, 2 + note F#, 6 + duty 3 + notetype 12, 10, 5 + octave 3 + note A_, 4 + note E_, 4 + callchannel Music_Pokecenter_branch_bf4e + duty 3 + notetype 12, 10, 5 + octave 3 + note A_, 4 + note E_, 4 + callchannel Music_Pokecenter_branch_bf60 + note D_, 8 + duty 3 + notetype 12, 10, 5 + octave 3 + note D_, 4 + note E_, 4 + duty 2 + notetype 12, 12, 6 + octave 4 + note F#, 8 + note A_, 8 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 8 + note C#, 8 + note E_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + note F#, 8 + note A_, 8 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 8 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + loopchannel 0, Music_Pokecenter_branch_befc + +Music_Pokecenter_branch_bf4e: + duty 2 + notetype 12, 12, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + notetype 12, 12, 3 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + endchannel + +Music_Pokecenter_branch_bf60: + duty 2 + notetype 12, 12, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + notetype 12, 12, 3 + note F#, 4 + note E_, 4 + note C#, 2 + endchannel + + +Music_Pokecenter_Ch3: ; bf70 (2:7f70) + notetype 12, 1, 0 + +Music_Pokecenter_branch_bf72: + octave 4 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + callchannel Music_Pokecenter_branch_bfd9 + callchannel Music_Pokecenter_branch_bfe2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + callchannel Music_Pokecenter_branch_bfd9 + callchannel Music_Pokecenter_branch_bfe2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + callchannel Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + callchannel Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + loopchannel 0, Music_Pokecenter_branch_bf72 + +Music_Pokecenter_branch_bfd9: + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + endchannel + +Music_Pokecenter_branch_bfe2: + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + endchannel + +Music_Pokecenter_branch_bfeb: + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + endchannel +; 0xbff4 \ No newline at end of file diff --git a/music/pokemontower.asm b/music/pokemontower.asm new file mode 100644 index 00000000..51232d93 --- /dev/null +++ b/music/pokemontower.asm @@ -0,0 +1,459 @@ +Music_PokemonTower_Ch1: ; 7f04a (1f:704a) + tempo 0, 152 + stereopanning 119 + duty 3 + unknownmusic0xe8 + vibrato 12, 2, 3 + notetype 12, 8, 0 + rest 4 + octave 4 + note B_, 12 + +Music_PokemonTower_branch_7f05a: + notetype 12, 11, 4 + octave 4 + note G_, 1 + rest 7 + note G_, 1 + rest 7 + octave 3 + note B_, 1 + rest 7 + note B_, 1 + rest 3 + note B_, 1 + rest 3 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + octave 4 + note F#, 1 + rest 7 + note C_, 1 + octave 3 + note B_, 1 + note G_, 1 + rest 5 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note F#, 1 + rest 7 + note E_, 1 + rest 7 + note G_, 1 + rest 7 + note G_, 1 + rest 7 + note F#, 1 + rest 7 + note F#, 1 + rest 7 + note G_, 1 + rest 7 + note E_, 1 + rest 7 + note D_, 1 + rest 7 + note E_, 1 + rest 7 + note G_, 1 + rest 7 + note G_, 1 + rest 7 + note F#, 1 + rest 7 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + octave 4 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + note C#, 1 + rest 7 + note C#, 1 + rest 7 + note C_, 1 + rest 7 + note C_, 1 + rest 3 + notetype 12, 8, 4 + note C_, 1 + rest 3 + notetype 12, 11, 4 + note D_, 1 + rest 7 + note D_, 1 + rest 7 + octave 3 + note A_, 1 + rest 7 + note A_, 1 + rest 7 + notetype 12, 10, 7 + note B_, 8 + note B_, 8 + octave 4 + note C_, 8 + note C_, 8 + note C#, 8 + note C#, 8 + notetype 12, 10, 6 + note D_, 16 + rest 16 + rest 16 + rest 16 + rest 16 + notetype 12, 9, 2 + note B_, 4 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + octave 4 + note B_, 4 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + octave 4 + note B_, 4 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + octave 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + octave 5 + note C_, 16 + note C_, 16 + loopchannel 0, Music_PokemonTower_branch_7f05a + + +Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3) + vibrato 20, 3, 4 + duty 3 + notetype 12, 10, 0 + octave 5 + note C_, 12 + octave 4 + note E_, 4 + +Music_PokemonTower_branch_7f0ee: + notetype 12, 12, 1 + octave 5 + note C_, 8 + octave 4 + note B_, 4 + notetype 12, 12, 4 + note G_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + notetype 12, 11, 0 + note G_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + octave 5 + note C_, 8 + notetype 12, 11, 7 + note C_, 8 + notetype 12, 12, 2 + octave 4 + note G_, 1 + note F#, 1 + note E_, 1 + rest 1 + notetype 12, 9, 6 + octave 3 + note G_, 4 + notetype 12, 12, 7 + note G_, 4 + note B_, 4 + note G_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + notetype 12, 11, 0 + octave 4 + note C_, 16 + note E_, 8 + notetype 12, 11, 7 + note E_, 12 + notetype 12, 12, 5 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note G_, 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + notetype 12, 11, 0 + note F#, 12 + note G_, 4 + notetype 12, 11, 0 + note F#, 8 + notetype 12, 11, 7 + note F#, 8 + notetype 12, 11, 0 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 16 + notetype 12, 11, 0 + octave 5 + note C_, 4 + octave 4 + note G_, 4 + note F#, 4 + note E_, 4 + notetype 12, 9, 0 + octave 5 + note C_, 16 + notetype 12, 11, 0 + note D_, 4 + octave 4 + note A_, 4 + note G#, 4 + note F#, 4 + notetype 12, 2, 15 + octave 5 + note D_, 16 + notetype 12, 12, 0 + note E_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G_, 4 + octave 5 + note F_, 4 + note C_, 4 + octave 4 + note A#, 4 + note G#, 4 + octave 5 + note F#, 4 + note D_, 4 + note C_, 4 + octave 4 + note A#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + notetype 12, 11, 0 + note C_, 8 + notetype 12, 9, 0 + note C_, 8 + notetype 12, 8, 0 + note C_, 8 + notetype 12, 7, 0 + note C_, 8 + notetype 12, 6, 0 + note C_, 8 + notetype 12, 6, 7 + note C_, 8 + rest 16 + notetype 12, 10, 0 + octave 5 + note G_, 16 + octave 6 + note C_, 16 + octave 5 + note B_, 8 + note G_, 8 + note E_, 8 + note G_, 8 + octave 6 + note C_, 16 + vibrato 0, 3, 4 + notetype 12, 10, 7 + note C_, 16 + loopchannel 0, Music_PokemonTower_branch_7f0ee + + +Music_PokemonTower_Ch3: ; 7f19a (1f:719a) + vibrato 4, 1, 1 + notetype 12, 1, 3 + rest 8 + octave 5 + note G_, 8 + +Music_PokemonTower_branch_7f1a2: + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 3 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note E_, 1 + rest 7 + note G_, 1 + rest 7 + note E_, 1 + rest 7 + note B_, 1 + rest 7 + note E_, 1 + note D#, 1 + octave 4 + note B_, 1 + rest 5 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + octave 5 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + octave 4 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + note B_, 1 + rest 7 + octave 5 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + note C_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note E_, 1 + rest 3 + note G_, 1 + rest 3 + note F#, 1 + rest 7 + note F#, 1 + rest 7 + note D_, 1 + rest 7 + note D_, 1 + rest 3 + note D_, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 7 + note E_, 1 + rest 7 + note F_, 1 + rest 7 + note F_, 1 + rest 7 + note F#, 1 + rest 7 + note F#, 1 + rest 7 + note G_, 1 + rest 15 + notetype 12, 1, 5 + octave 4 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note G_, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 15 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note G_, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 7 + notetype 12, 1, 3 + octave 6 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 15 + note E_, 1 + rest 15 + note E_, 1 + rest 15 + note E_, 1 + rest 15 + note E_, 1 + rest 15 + note E_, 1 + rest 7 + octave 5 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + loopchannel 0, Music_PokemonTower_branch_7f1a2 +; 0x7f243 \ No newline at end of file diff --git a/music/pokeredmusicdisasm/AbstractData.cpp b/music/pokeredmusicdisasm/AbstractData.cpp deleted file mode 100644 index 542922fe..00000000 --- a/music/pokeredmusicdisasm/AbstractData.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "AbstractData.h" -using namespace std; - -AbstractData::AbstractData() -{ - error = false; -} - -// This method must always return "" if true but can return -// any other value for false -string AbstractData::GenAsm() -{ - if(error) return ";#Error"; - else return ""; -} - -bool AbstractData::IsValid(unsigned char* byte) -{ - return true; -} - -bool AbstractData::Parse(unsigned char* byte) -{ - // If it's not valid, don't even bother parsing - if(!IsValid(byte)) return false; - return true; -} - -unsigned int AbstractData::Arguments() -{ - return 0; -} - -bool AbstractData::GetError() -{ - return error; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/AbstractData.h b/music/pokeredmusicdisasm/AbstractData.h deleted file mode 100644 index 0b49255d..00000000 --- a/music/pokeredmusicdisasm/AbstractData.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef ABSTRACTDATA_H -#define ABSTRACTDATA_H - -#include - -// All information types inherit from here -class AbstractData -{ -public: - AbstractData(); - - virtual std::string GenAsm(); // Generate Assembly Output - virtual bool Parse(unsigned char* byte); // Parse Given Data - virtual bool GetError(); // Get Error (No Write, Error is read only) - - virtual bool IsValid(unsigned char* byte); // Check for byte validity - virtual unsigned int Arguments(); // Number of arguments taken - -protected: - bool error; // Whether there's an error in parsing or not -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Call.cpp b/music/pokeredmusicdisasm/Call.cpp deleted file mode 100644 index bbc2c21e..00000000 --- a/music/pokeredmusicdisasm/Call.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include -#include "Call.h" -using namespace std; - -Call::Call() -{ - error = false; - address = 0; -} - -Call::Call(unsigned char* byte) -{ - Parse(byte); -} - -Call::Call(unsigned short value, bool) -{ - SetAddress(value); -} - -unsigned short Call::GetAddress() -{ - return address; -} - -void Call::SetAddress(unsigned short value) -{ - address = value; -} - -string Call::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_call" << " $" << hex << uppercase << address; - return tmpAsmOut.str(); -} - -bool Call::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xFD) - { - error = false; - return true; - } - else - { - error = true; - return false; - } -} - -bool Call::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - // Get Address - address = byte[2]; - address <<= 8; - address |= byte[1]; - - return true; -} - -unsigned int Call::Arguments() -{ - // 1 2-byte argument = 2 bytes - return 2; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Call.h b/music/pokeredmusicdisasm/Call.h deleted file mode 100644 index d6fd9c97..00000000 --- a/music/pokeredmusicdisasm/Call.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef CALL_H -#define CALL_H - -#include "AbstractData.h" - -// Represents 1 call -class Call : public AbstractData -{ -public: - // Constructors - Call(); // Default - Call(unsigned char* byte); // Parse Immidiately - Call(unsigned short value, bool); // Set value - - // Direct Getter/Setter Functions - unsigned short GetAddress(); - void SetAddress(unsigned short value); - - // The standard re-implementations from AbstractData - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned short address; -}; - -#endif - -// Rqandom Notes -//ED Speed of song -//EC Instrument -//DC Volume \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Console.cpp b/music/pokeredmusicdisasm/Console.cpp deleted file mode 100644 index 35033bb6..00000000 --- a/music/pokeredmusicdisasm/Console.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "Console.h" - -using namespace std; - -// Basic -void Console::Get(char* value) -{ - cin >> value; -} -void Console::Get(string& value) -{ - cin >> value; -} -void Console::Print(const char* value) -{ - cout << value; -} -void Console::Error(const char* value) -{ - cerr << value; -} - -// Upper-Basic -void Console::PrintLn(const char* value) -{ - Print(value); - cout << endl; -} -void Console::ErrorLn(const char* value) -{ - Error(value); - cerr << endl; -} - -// Higher -/*void Console::Ask(const char* question, char* answer) -{ - Print(question); - Get(answer); -} -void Console::Ask(const char* question, string& answer) -{ - Print(question); - Get(answer); -}*/ \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Console.h b/music/pokeredmusicdisasm/Console.h deleted file mode 100644 index 1de9ee55..00000000 --- a/music/pokeredmusicdisasm/Console.h +++ /dev/null @@ -1,41 +0,0 @@ -#ifndef CONSOLE_H -#define CONSOLE_H - -#include -#include -#include - -// Just a Console Utility Library -class Console -{ -public: - // Basic - static void Get(char* value); - static void Get(std::string& value); - static void Print(const char* value); - static void Error(const char* value); - - // Upper-Basic - static void PrintLn(const char* value); - static void ErrorLn(const char* value); - - // Higher - //static void Ask(const char* question, char* answer); - //static void Ask(const char* question, std::string& answer); - - template - static void Ask(const char* question, T& answer, std::ios_base::fmtflags flags = std::ios_base::dec) - { - std::stringstream _tmpstr; - std::string _tmp; - - Print(question); - Get(_tmp); - - _tmpstr << _tmp; - _tmpstr.flags(flags); - _tmpstr >> answer; - } -}; - -#endif // CONSOLE_H diff --git a/music/pokeredmusicdisasm/Duty.cpp b/music/pokeredmusicdisasm/Duty.cpp deleted file mode 100644 index 0723074b..00000000 --- a/music/pokeredmusicdisasm/Duty.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include -#include "Duty.h" -using namespace std; - -Duty::Duty() -{ - duty = 0; -} - -Duty::Duty(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Duty::Duty(unsigned char value, bool) // Set value -{ - SetDuty(value); -} - -unsigned char Duty::GetDuty() -{ - return duty; -} - -void Duty::SetDuty(unsigned char value) -{ - // Clamp duty to 3 since that's the highest possible - duty = value; - if(duty >= 3) duty = 3; -} - -// Byte 0 - The Command Code -// Byte 1 - The Value -bool Duty::IsValid(unsigned char* byte) -{ - if((byte[0] == 0xEC) && - (byte[1] >= 0x0) && - (byte[1] <= 0x3)) - { - error = false; // Unblock assembling - return true; - } - else - { - error = true; // Block assembling - return false; - } -} - -string Duty::GenAsm() -{ - string ret = AbstractData::GenAsm(); - if(ret != "") return ret; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_duty " << LookupDutyString(); - return tmpAsmOut.str(); -} - -bool Duty::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - duty = byte[1]; - return true; -} - -string Duty::LookupDutyString() -{ - // In case some error happens and the values doesn't match the list below - stringstream defTmp; - - switch(duty) - { - case duty12_5: - return "duty12_5"; - case duty25: - return "duty25"; - case duty50: - return "duty50"; - case duty75: - return "duty75"; - default: - defTmp << "$" << uppercase << hex << (short)duty; - return defTmp.str(); - } -} - -unsigned int Duty::Arguments() -{ - //1 1-byte argument = 1 - return 1; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Duty.h b/music/pokeredmusicdisasm/Duty.h deleted file mode 100644 index aa3f0d0d..00000000 --- a/music/pokeredmusicdisasm/Duty.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef DUTY_H -#define DUTY_H - -#include "AbstractData.h" - -//Represents 1 Duty data -class Duty : public AbstractData -{ -public: - // Constructors - Duty(); - Duty(unsigned char* byte); // Parse Immidiately - Duty(unsigned char value, bool); // Set value - - // Re-Implementations from Parent - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - - // Direct Getters and Setters - unsigned char GetDuty(); - void SetDuty(unsigned char value); - - // Custom Functions - std::string LookupDutyString(); - - enum dutyList : unsigned char - { - duty12_5 = 0x0, - duty25 = 0x1, - duty50 = 0x2, - duty75 = 0x3 - }; - -private: - unsigned char duty; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/File.h b/music/pokeredmusicdisasm/File.h deleted file mode 100644 index de1e6998..00000000 --- a/music/pokeredmusicdisasm/File.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef FILE_H -#define FILE_H - -#include -#include -#include - -class File -{ -public: - File(); - File(std::string filename, unsigned int offset = 0, unsigned int length = 0); - - string GetFileName(); - void SetFilename(string value); - -private: - std::string filename; - std::vector fileBuffer; - std::fstream fileHandle; - - std::vector::iterator start; - std::vector::iterator cur; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Jump.cpp b/music/pokeredmusicdisasm/Jump.cpp deleted file mode 100644 index 8b094996..00000000 --- a/music/pokeredmusicdisasm/Jump.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include -#include "Jump.h" -using namespace std; - -Jump::Jump() -{ - address = 0x0000; - loop = 0; -} - -Jump::Jump(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Jump::Jump(unsigned short value, unsigned char loop, bool) // Set value -{ - SetAddress(value); - SetLoop(loop); -} - -unsigned short Jump::GetAddress() -{ - return address; -} - -void Jump::SetAddress(unsigned short value) -{ - address = value; -} - -unsigned char Jump::GetLoop() -{ - return loop; -} - -void Jump::SetLoop(unsigned char value) -{ - loop = value; -} - -string Jump::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_jump" << " " << (short)loop << ", $" << hex << uppercase << address; - return tmpAsmOut.str(); -} - -bool Jump::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xFE) - { - error = false; - return true; - } - else - { - error = true; - return false; - } -} - -bool Jump::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - loop = byte[1]; - - address = byte[3]; - address <<= 8; - address |= byte[2]; - - return true; -} - -unsigned int Jump::Arguments() -{ - // 1 1-byte command, 1 1-byte loop, 1 2-byte pointer = 4 bytes - return 3; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Jump.h b/music/pokeredmusicdisasm/Jump.h deleted file mode 100644 index 64273fb7..00000000 --- a/music/pokeredmusicdisasm/Jump.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef JUMP_H -#define JUMP_H - -#include "AbstractData.h" - -// Represents 1 Jump Class -class Jump : public AbstractData -{ -public: - // Constructors - Jump(); // Default - Jump(unsigned char* byte); // Parse Immidiately - Jump(unsigned short value, unsigned char loop, bool); // Set value - - // Direct Getter/Setter Functions - unsigned short GetAddress(); - void SetAddress(unsigned short value); - - unsigned char GetLoop(); - void SetLoop(unsigned char value); - - // The standard re-implementations from AbstractData - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned short address; - unsigned char loop; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Makefile b/music/pokeredmusicdisasm/Makefile deleted file mode 100644 index 352f87a7..00000000 --- a/music/pokeredmusicdisasm/Makefile +++ /dev/null @@ -1,68 +0,0 @@ - -OBJECTS = main.o Jump.o Modulation.o Note.o Octave.o Parser.o Stop.o \ -Tempo.o UnkCode.o UnkEB.o Velocity.o Volume.o Console.o AbstractData.o Call.o \ -Duty.o args.o - -CC = g++ -CFLAGS = -std=c++0x - -pokeredmusicdisasm: $(OBJECTS) - $(CC) $(CFLAGS) $(OBJECTS) -o "../../extras/pokeredmusicdisasm.exe" - -Parser.o: Jump.h Modulation.h Note.h Octave.h Parser.h Stop.h \ -Tempo.h UnkCode.h UnkEB.h Velocity.h Volume.h - $(CC) $(CFLAGS) -c main.cpp Jump.cpp Modulation.cpp \ -Note.cpp Octave.cpp Parser.cpp Stop.cpp Tempo.cpp UnkCode.cpp UnkEB.cpp \ -Velocity.cpp Volume.cpp - -Duty.o: Duty.h AbstractData.h - $(CC) $(CFLAGS) -c Duty.cpp AbstractData.cpp - -Console.o: Console.h - $(CC) $(CFLAGS) -c Console.cpp - -AbstractData.o: AbstractData.h - $(CC) $(CFLAGS) -c AbstractData.cpp - -Call.o: Call.h Call.cpp AbstractData.h - $(CC) $(CFLAGS) -c Call.cpp AbstractData.cpp - -main.o: main.cpp Console.h Parser.h args.h - $(CC) $(CFLAGS) -c main.cpp Console.cpp Parser.cpp args.cpp - -Jump.o: Jump.h AbstractData.h - $(CC) $(CFLAGS) -c Jump.cpp AbstractData.cpp - -Modulation.o: Modulation.h AbstractData.h - $(CC) $(CFLAGS) -c Modulation.cpp AbstractData.cpp - -Note.o: Note.h AbstractData.h - $(CC) $(CFLAGS) -c Note.cpp AbstractData.cpp - -Octave.o: Octave.h AbstractData.h - $(CC) $(CFLAGS) -c Octave.cpp AbstractData.cpp - -Stop.o: Stop.h AbstractData.h - $(CC) $(CFLAGS) -c Stop.cpp AbstractData.cpp - -Tempo.o: Tempo.h AbstractData.h - $(CC) $(CFLAGS) -c Tempo.cpp AbstractData.cpp - -UnkCode.o: UnkCode.h AbstractData.h - $(CC) $(CFLAGS) -c UnkCode.cpp AbstractData.cpp - -UnkEB.o: UnkEB.h AbstractData.h - $(CC) $(CFLAGS) -c UnkEB.cpp AbstractData.cpp - -Velocity.o: Velocity.h AbstractData.h - $(CC) $(CFLAGS) -c Velocity.cpp AbstractData.cpp - -Volume.o: Volume.h AbstractData.h - $(CC) $(CFLAGS) -c Volume.cpp AbstractData.cpp - -args.o: args.h - $(CC) $(CFLAGS) -c args.cpp - -clean: - rm *.o - rm ../../extras/pokeredmusicdisasm.exe diff --git a/music/pokeredmusicdisasm/Modulation.cpp b/music/pokeredmusicdisasm/Modulation.cpp deleted file mode 100644 index eed78183..00000000 --- a/music/pokeredmusicdisasm/Modulation.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include -#include "Modulation.h" -using namespace std; - -Modulation::Modulation() -{ - delay = 0; - depth = 0; - rate = 0; -} - -Modulation::Modulation(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Modulation::Modulation(unsigned char delay, unsigned char depth, unsigned char rate, bool) // Set value -{ - SetDelay(delay); - SetDepth(depth); - SetRate(rate); -} - -// Direct Getter/Setter Functions -unsigned char Modulation::GetDelay() -{ - return delay; -} - -void Modulation::SetDelay(unsigned char value) -{ - delay = value; -} - -unsigned char Modulation::GetDepth() -{ - return depth; -} - -void Modulation::SetDepth(unsigned char value) -{ - depth = value; -} - -unsigned char Modulation::GetRate() -{ - return rate; -} - -void Modulation::SetRate(unsigned char value) -{ - rate = value; -} - -bool Modulation::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xEA) - { - error = false; // Unblock assembling - return true; - } - else - { - error = true; // Block assembling - return false; - } -} - -string Modulation::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_mod " << (short)delay << ", " << (short)depth << ", " << (short)rate; - return tmpAsmOut.str(); -} - -bool Modulation::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - delay = byte[1]; - - depth = byte[2] & 0xF0; - depth >>= 4; - - rate = byte[2] & 0x0F; - return true; -} - -unsigned int Modulation::Arguments() -{ - // 2 1-byte arguments = 2 - return 2; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Modulation.h b/music/pokeredmusicdisasm/Modulation.h deleted file mode 100644 index 38c84791..00000000 --- a/music/pokeredmusicdisasm/Modulation.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef MODULATION_H -#define MODULATION_H - -#include "AbstractData.h" - -//Represents 1 modulation value -class Modulation : public AbstractData -{ -public: - // Constructors - Modulation(); - Modulation(unsigned char* byte); // Parse Immidiately - Modulation(unsigned char delay, unsigned char depth, unsigned char rate, bool); // Set value - - // Direct Getter/Setter Functions - unsigned char GetDelay(); - void SetDelay(unsigned char value); - - unsigned char GetDepth(); - void SetDepth(unsigned char value); - - unsigned char GetRate(); - void SetRate(unsigned char value); - - // Re-implemented - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned char delay; - unsigned char depth; - unsigned char rate; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Note.cpp b/music/pokeredmusicdisasm/Note.cpp deleted file mode 100644 index 0b62f1f9..00000000 --- a/music/pokeredmusicdisasm/Note.cpp +++ /dev/null @@ -1,174 +0,0 @@ -#include -#include "Note.h" - -using namespace std; - -Note::Note() -{ - pitch = 0x0; - delay = 0x0; -} - -Note::Note(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Note::Note(unsigned char pitch, unsigned char delay,bool) // Set value -{ - SetPitch(pitch); - SetDelay(delay); -} - -unsigned char Note::GetPitch() -{ - return pitch; -} - -void Note::SetPitch(unsigned char value) -{ - pitch = value; -} - -unsigned char Note::GetDelay() -{ - return delay; -} - -void Note::SetDelay(unsigned char value) -{ - delay = value; -} - -bool Note::IsValid(unsigned char* byte) -{ - // A Note is a byte that is between 0x00 and 0xCF - if((byte[0] >= 0x00) && - (byte[0] <= 0xCF)) - { - error = false; // Unblock assembling - return true; - } - else - { - error = true; // Block assembling - return false; - } -} - -// Generates the assembly for this note -string Note::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_note" << " " << LookupPitchStr() << ", " << LookupDelayStr(); - return tmpAsmOut.str(); -} - -// Takes the raw byte and parses it's data, storing it -bool Note::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - pitch = byte[0] & 0xF0; - pitch >>= 4; - - delay = byte[0] & 0x0F; - return true; -} - -// Fetches the asm string name for the pitch -string Note::LookupPitchStr() -{ - // In case some error happens and the values doesn't match the list below - stringstream defTmp; - - switch(pitch) - { - case noteC: - return "noteC"; - case noteCS: - return "noteC#"; - case noteD: - return "noteD"; - case noteDS: - return "noteD#"; - case noteE: - return "noteE"; - case noteF: - return "noteF"; - case noteFS: - return "noteF#"; - case noteG: - return "noteG"; - case noteGS: - return "noteG#"; - case noteA: - return "noteA"; - case noteAS: - return "noteA#"; - case noteB: - return "noteB"; - case noteRst: - return "noteRst"; - default: - defTmp.setf(ios_base::uppercase | ios_base::hex); - defTmp << "$" << pitch; - return defTmp.str(); - } -} - -// Fetches the asm string name for the delay -string Note::LookupDelayStr() -{ - // In case some error happens and the values doesn't match the list below - stringstream defTmp; - - switch(delay) - { - case note16: - return "note16"; - case note8: - return "note8"; - case note8_16: - return "note8_16"; - case note4: - return "note4"; - case note4_16: - return "note4_16"; - case note4_8: - return "note4_8"; - case note4_8_16: - return "note4_8_16"; - case note2: - return "note2"; - case note2_16: - return "note2_16"; - case note2_8: - return "note2_8"; - case note2_8_16: - return "note2_8_16"; - case note2_4: - return "note2_4"; - case note2_4_16: - return "note2_4_16"; - case note2_4_8: - return "note2_4_8"; - case note2_4_8_16: - return "note2_4_8_16"; - case note1: - return "note1"; - default: - defTmp.setf(ios_base::uppercase | ios_base::hex); - defTmp << "$" << (short)pitch; - return defTmp.str(); - } -} - -unsigned int Note::Arguments() -{ - // No Arguments - return 0; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Note.h b/music/pokeredmusicdisasm/Note.h deleted file mode 100644 index 599d66f7..00000000 --- a/music/pokeredmusicdisasm/Note.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef NOTE_H -#define NOTE_H - -#include "AbstractData.h" - -// Holds a single note -class Note : public AbstractData -{ -public: - // Constructors - Note(); - Note(unsigned char* byte); // Parse Immidiately - Note(unsigned char pitch, unsigned char delay,bool); // Set value - - // Reimplementations - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - - // Getters and Setters - unsigned char GetPitch(); - void SetPitch(unsigned char value); - - unsigned char GetDelay(); - void SetDelay(unsigned char value); - - // Specific Methods - std::string LookupPitchStr(); - std::string LookupDelayStr(); - - enum pitch_code : unsigned char - { - noteC = 0x0, - noteCS = 0x1, - noteD = 0x2, - noteDS = 0x3, - noteE = 0x4, - noteF = 0x5, - noteFS = 0x6, - noteG = 0x7, - noteGS = 0x8, - noteA = 0x9, - noteAS = 0xA, - noteB = 0xB, - noteRst = 0xC - }; - - enum delay_code : unsigned char - { - note16 = 0x0, - note8 = 0x1, - note8_16 = 0x2, - note4 = 0x3, - note4_16 = 0x4, - note4_8 = 0x5, - note4_8_16 = 0x6, - note2 = 0x7, - note2_16 = 0x8, - note2_8 = 0x9, - note2_8_16 = 0xA, - note2_4 = 0xB, - note2_4_16 = 0xC, - note2_4_8 = 0xD, - note2_4_8_16 = 0xE, - note1 = 0xF - }; -private: - unsigned char pitch; - unsigned char delay; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Octave.cpp b/music/pokeredmusicdisasm/Octave.cpp deleted file mode 100644 index 3da6609b..00000000 --- a/music/pokeredmusicdisasm/Octave.cpp +++ /dev/null @@ -1,97 +0,0 @@ -#include -#include "Octave.h" -using namespace std; - -Octave::Octave() -{ - octave = 0; -} - -Octave::Octave(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Octave::Octave(unsigned char octave, bool) // Set value -{ - SetOctave(octave); -} - -unsigned char Octave::GetOctave() -{ - return octave; -} - -void Octave::SetOctave(unsigned char value) -{ - octave = value; -} - -bool Octave::IsValid(unsigned char* byte) -{ - if((byte[0] >= 0xE0) && - (byte[0] <= 0xE7)) - { - error = false; // Unblock assembling - return true; - } - else - { - error = true; // Block assembling - return false; - } -} - -string Octave::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_octave" << " " << LookupOctString(); - return tmpAsmOut.str(); -} - -bool Octave::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - octave = byte[0]; - return true; -} - -string Octave::LookupOctString() -{ - // In case some error happens and the values doesn't match the list below - stringstream defTmp; - - switch(octave) - { - case oct0: - return "oct0"; - case oct1: - return "oct1"; - case oct2: - return "oct2"; - case oct3: - return "oct3"; - case oct4: - return "oct4"; - case oct5: - return "oct5"; - case oct6: - return "oct6"; - case oct7: - return "oct7"; - default: - defTmp.setf(ios_base::uppercase | ios_base::hex); - defTmp << "$" << (short)octave; - return defTmp.str(); - } -} - -unsigned int Octave::Arguments() -{ - // No Arguments - return 0; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Octave.h b/music/pokeredmusicdisasm/Octave.h deleted file mode 100644 index c51ea7b1..00000000 --- a/music/pokeredmusicdisasm/Octave.h +++ /dev/null @@ -1,43 +0,0 @@ -#ifndef OCTAVE_H -#define OCTAVE_H - -#include "AbstractData.h" - -//Represents 1 octave value -class Octave : public AbstractData -{ -public: - // Constructors - Octave(); - Octave(unsigned char* byte); // Parse Immidiately - Octave(unsigned char octave, bool); // Set value - - // Direct Getters / Setters - unsigned char GetOctave(); - void SetOctave(unsigned char value); - - // Overides - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - - std::string LookupOctString(); - - enum OctaveCode : unsigned char - { - oct0 = 0xE7, - oct1 = 0xE6, - oct2 = 0xE5, - oct3 = 0xE4, - oct4 = 0xE3, - oct5 = 0xE2, - oct6 = 0xE1, - oct7 = 0xE0 - }; - -private: - unsigned char octave; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Parser.cpp b/music/pokeredmusicdisasm/Parser.cpp deleted file mode 100644 index 765766ec..00000000 --- a/music/pokeredmusicdisasm/Parser.cpp +++ /dev/null @@ -1,300 +0,0 @@ -#include -#include "Parser.h" -using namespace std; - -// Constructors -Parser::Parser() -{ - rawBytes = 0; - fileLength = 0; - filePos = 0; - stop = false; - stopAddress = 0; - force = false; -} - -Parser::Parser(std::string filename) -{ - rawBytes = 0; - fileLength = 0; - filePos = 0; - stop = false; - stopAddress = 0; - force = false; - - SetFilename(filename); -} - -// Deconstructors -Parser::~Parser() -{ - // Clear out temporary buffer - delete[] rawBytes; - - // Clear out parsed buffer - for(unsigned int i = 0; i < parsedBytes.size(); i++) - { - delete parsedBytes[i]; - } -} - -// Getters / Setters -string Parser::GetFilename() -{ - return filename; -} - -void Parser::SetFilename(std::string value) -{ - filename = value; - Read(); -} - -unsigned int Parser::GetStopAddress() -{ - return stopAddress; -} - -void Parser::SetStopAddress(unsigned int value) -{ - stopAddress = value; -} - -bool Parser::GetForce() -{ - return force; -} - -void Parser::SetForce(bool value) -{ - force = value; -} - -string Parser::GetParsedAsm() -{ - string tmpStr; - - for(unsigned int i = 0; i < parsedString.size(); i++) - { - // Ensure each line isn't already a new-line, this prevents double or tripple empty lines from piling up - if(parsedString[i] != "\n") tmpStr += parsedString[i] + "\n"; - else tmpStr += parsedString[i]; - } - - return tmpStr; -} - -// File Operations -// Absolutely no error checking at all - likely needs to be done at somepoint -void Parser::Read() -{ - // open File - fstream tmpFile(filename, ios_base::in | ios_base::binary); - - // Get Length - tmpFile.seekg(0, ios::end); - fileLength = tmpFile.tellg(); - tmpFile.seekg(0, ios::beg); - - // Allocate proper memory - rawBytes = new char[fileLength]; - - // Read filedata - tmpFile.read(rawBytes, fileLength); - tmpFile.close(); - - rawBytesFixed = (unsigned char*)rawBytes; -} - -// Code Operations -void Parser::Parse(unsigned int offset) -{ - filePos = offset; - ParseNext(); -} - -template -bool Parser::ParseData(unsigned int& pos, bool reado) -{ - // Create the class to use if correct and a dummy class for validating - T* tmpC = 0; - T dummy; - - // If the bytes are this data type then create and save it - if(dummy.IsValid(&rawBytesFixed[pos])) - { - // Ensure this whole opperation isn't read-only (just peeking) - if(!reado) - { - // Initialize the class - tmpC = new T(&rawBytesFixed[pos]); - - // Push it onto the stack and it's assembly generation onto the output class - parsedBytes.push_back(tmpC); // - parsedString.push_back(tmpC->GenAsm()); - - // If the class had any arguments, increment the counter that much forward - pos += tmpC->Arguments(); - } - return true; // Let the code know this class was valid - } - - return false; // Let the code know this class wasn't valid -} - -void Parser::ParseNext() // Parses the block immidiately following -{ - stringstream tmpStr; - stop = false; - - // Smart generation - bool firstNonNote = false; // (unused so far)First byte wasn't a note or octacve switch, add ";Setup" comment - bool firstNote = false; // (unused so far) First note or octave - unsigned char lDataType = DATA_NA; - bool newBranch = false; // Create a new branch - - stringstream pos; - pos << "; " << hex << uppercase << (unsigned int)filePos; - parsedString.push_back(pos.str()); - - unsigned int count = 1; // Counter for processed instructions - newBranch = true; - for(unsigned int i = filePos; (i <= fileLength) && (stop == false); i++) - { - if(newBranch) - { - stringstream _tmpBr; - _tmpBr << "\n"; - _tmpBr << "UnknSong_md_" << hex << i << ":"; - parsedString.push_back(_tmpBr.str()); - - _tmpBr.str(""); - newBranch = false; - } - - // First peek to see what kind of data it is, then perform any pre and post setup - if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_CALL; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_DUTY; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_JUMP; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_MODULATION; - } - else if(ParseData(i, true)) - { - // Insert a newline after certain types - if((lDataType == DATA_UNKCODE) || - (lDataType == DATA_UNKEB)) parsedString.push_back("\n"); - - // If the previous item was a rest note then insert a new line - else if(lDataType == DATA_NOTE) - { - Note* _tmpNote = (Note*)parsedBytes[parsedBytes.size() - 1]; - if(_tmpNote->GetPitch() == _tmpNote->noteRst) parsedString.push_back("\n"); - } - - ParseData(i); - - // Further indent each note - parsedString[parsedString.size() - 1] = "\t" + parsedString[parsedString.size() - 1]; - lDataType = DATA_NOTE; - } - else if(ParseData(i, true)) - { - // Insert new-line if previous line isn't a newline - if(parsedString[parsedString.size() - 1] != "\n") parsedString.push_back("\n"); - - ParseData(i); - lDataType = DATA_OCTAVE; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_TEMPO; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_VELOCITY; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_VOLUME; - } - else if(ParseData(i, true)) // The opcode is 0xEB which is unknown and takes a 1-byte argument - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - lDataType = DATA_UNKEB; - } - else if(ParseData(i, true)) - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); - if(!force) stop = true; // Raise the stop flag informing the parser to stop - newBranch = true; - lDataType = DATA_STOP; - } - else - { - if(lDataType == DATA_NOTE) parsedString.push_back("\n"); // Insert a newline after notes - - ParseData(i); // The opcode is unknown - process the raw byte and move on - lDataType = DATA_UNKCODE; - } - - // Put everything tabbed over at least 1 time to fix some weird RGBDS bug by pre-pending a tab character - parsedString[parsedString.size() - 1] = "\t" + parsedString[parsedString.size() - 1]; - - // Append File Position in hexidecimal at end of line every 5 instructions - if((count % 5) == 0) - { - stringstream _tmpCount; - _tmpCount << hex << uppercase << i; - parsedString[parsedString.size() - 1] = parsedString[parsedString.size() - 1] + "; " + _tmpCount.str(); - } - - filePos = i; - count++; - - // If the stop address parameter is set, break when we get there - if( (stopAddress != 0) && (i >= stopAddress) ) break; - } - - // Now record the postion we left off - pos.str(""); - pos << "; " << hex << uppercase << (unsigned int)filePos; - parsedString.push_back(pos.str()); - - filePos += 1; // increment 1 for the start of the next possible song -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Parser.h b/music/pokeredmusicdisasm/Parser.h deleted file mode 100644 index 385195ec..00000000 --- a/music/pokeredmusicdisasm/Parser.h +++ /dev/null @@ -1,93 +0,0 @@ -#ifndef PARSER_H -#define PARSER_H - -#include -#include -#include - -#include "AbstractData.h" -#include "Call.h" -#include "Console.h" -#include "Duty.h" -#include "Jump.h" -#include "Modulation.h" -#include "Note.h" -#include "Octave.h" -#include "Stop.h" -#include "Tempo.h" -#include "Velocity.h" -#include "Volume.h" -#include "UnkCode.h" -#include "UnkEB.h" - -// This is the final class, it takes all of the data types, abstract class, and helper functions and uses them -// for parsing - -// the final decided plan was to read the whole file into memory (a rom isn't exactly a big memory breaker) -class Parser -{ -public: - // Constructors - Parser(); - Parser(std::string filename); - - // Deconstructors - ~Parser(); - - // Getters / Setters - std::string GetFilename(); - void SetFilename(std::string value); - - unsigned int GetStopAddress(); - void SetStopAddress(unsigned int value); - - bool GetForce(); - void SetForce(bool value); - - std::string GetParsedAsm(); - - // File Operations - void Read(); - - // Code Operations - void Parse(unsigned int offset); - void ParseNext(); // Parses the block immidiately following - - // Templates - template - bool ParseData(unsigned int& pos, bool reado = false); - - enum dataType : unsigned char - { - DATA_NA, - DATA_CALL, - DATA_DUTY, - DATA_JUMP, - DATA_MODULATION, - DATA_NOTE, - DATA_OCTAVE, - DATA_STOP, - DATA_TEMPO, - DATA_UNKCODE, - DATA_UNKEB, - DATA_VELOCITY, - DATA_VOLUME - }; - -private: - std::string filename; - std::vector parsedBytes; - std::vector parsedString; - - char* rawBytes; - unsigned char* rawBytesFixed; - unsigned int fileLength; - unsigned int filePos; - bool stop; - bool force; - - // Optional Settings - unsigned int stopAddress; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/README.txt b/music/pokeredmusicdisasm/README.txt deleted file mode 100644 index c1c659eb..00000000 --- a/music/pokeredmusicdisasm/README.txt +++ /dev/null @@ -1,26 +0,0 @@ -Usage: [ [ | --]] -Usage: [--offset= | -o ] [--file=[ | --] | -f [ | --]] [--stop= | -s ] -Usage: [-h | --help] - -Used without parameters will start in limited interactive mode where the program will ask you the file and offset -An offset is a requirement but the file may be blank or explicitly set, whenever the file is set you may use '--' to substitute for the default file '../baserom.gbc' -If parameter options are not used the ordering is important: -There is an intentional glitch in the program, since long paramaters must be specified with --xxx= with or without a value, you may use the short option instead -xxx even though it's suppose to be -xxx= - * -If parameter options are used the ordering does not matter, ensure the parameter option or parameter is present -You may mix and match parameters and parameter options, keep in mind that bare parameters must be in a certain order -If the offset parameter is missing in any way the program will prompt you for it -The program will stop parsing when it encounters mus_end regardlessly -Parameter types - * - Bare parameter, they must be in a certain order - * -xxx=xxx - Long parameter option, it can be in any order but is case sensitive, can contain no spaces, must contain the equal sign, and is read literally - * -xxx xxx - Short parameter option, it can be in any order but is case sensitive, must contain 1 space and is read literally ----- -Breakdown of parameters: - - A bare parameter, it must be in hexidecimal eith alone or prefixed with 0x and be the first parameter. It tells the parser where to start parsing - - A bare parameter, it must be the second parameter and tells the parser which rom file to parse --- - A special file path value meaning use the default file '../baserom.gbc' ---offset, -o - the parameterized offset in hexidecimal, It tells the parser where to start parsing ---file, -f - the parameterized file path, It tells the parser which rom file to parse ---stop, -s - tells the parser to stop at that hexidecimal address or until it reaches mus_end. -help, --help, -h - prints this info and exits, if the bare parameter is used it must be the first parameter diff --git a/music/pokeredmusicdisasm/Stop.cpp b/music/pokeredmusicdisasm/Stop.cpp deleted file mode 100644 index de6aa062..00000000 --- a/music/pokeredmusicdisasm/Stop.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include -#include "Stop.h" -using namespace std; - -Stop::Stop() -{} - -Stop::Stop(unsigned char* byte) -{ - Parse(byte); -} - -bool Stop::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xFF) - { - error = false; // Unblock assembling - return true; - } - else - { - error = true; // Block assembling - return false; - } -} - -string Stop::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_end"; - return tmpAsmOut.str(); -} - -bool Stop::Parse(unsigned char* byte) -{ - if(AbstractData::Parse(byte)) return false; - return true; -} - -unsigned int Stop::Arguments() -{ - // No Arguments - return 0; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Stop.h b/music/pokeredmusicdisasm/Stop.h deleted file mode 100644 index f97a888b..00000000 --- a/music/pokeredmusicdisasm/Stop.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef STOP_H -#define STOP_H - -#include "AbstractData.h" - -//Represents 1 end music data -class Stop : public AbstractData -{ -public: - // Constructors - Stop(); - Stop(unsigned char* byte); // Parse Immidiately - - // Re-Implementations - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Tempo.cpp b/music/pokeredmusicdisasm/Tempo.cpp deleted file mode 100644 index a41de4a8..00000000 --- a/music/pokeredmusicdisasm/Tempo.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include -#include "Tempo.h" -using namespace std; - -Tempo::Tempo() -{ - divider = 0; - modifier = 0; -} - -Tempo::Tempo(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Tempo::Tempo(unsigned char divider, unsigned char modifier, bool) // Set value -{ - SetDivider(divider); - SetModifier(modifier); -} - -unsigned char Tempo::GetDivider() -{ - return divider; -} - -void Tempo::SetDivider(unsigned char value) -{ - divider = value; -} - -unsigned char Tempo::Getmodifier() -{ - return modifier; -} - -void Tempo::SetModifier(unsigned char value) -{ - modifier = value; -} - -bool Tempo::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xED) - { - error = false; - return true; - } - else - { - error = true; - return false; - } -} - -string Tempo::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_tempo" << " " << (short)divider << ", " << (short)modifier; - return tmpAsmOut.str(); -} - -bool Tempo::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - divider = byte[1]; - modifier = byte[2]; - - return true; -} - -unsigned int Tempo::Arguments() -{ - // 2 1-byte arguments = 2 - return 2; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Tempo.h b/music/pokeredmusicdisasm/Tempo.h deleted file mode 100644 index 185c3a94..00000000 --- a/music/pokeredmusicdisasm/Tempo.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef TEMPO_H -#define TEMPO_H - -#include "AbstractData.h" - -class Tempo : public AbstractData -{ -public: - // Constructors - Tempo(); - Tempo(unsigned char* byte); // Parse Immidiately - Tempo(unsigned char divider, unsigned char modifier, bool); // Set value - - // Direct Getters and Setters - unsigned char GetDivider(); - void SetDivider(unsigned char value); - - unsigned char Getmodifier(); - void SetModifier(unsigned char value); - - // Overides - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned char divider; - unsigned char modifier; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/UnkCode.cpp b/music/pokeredmusicdisasm/UnkCode.cpp deleted file mode 100644 index da3cd02f..00000000 --- a/music/pokeredmusicdisasm/UnkCode.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include -#include "UnkCode.h" - -using namespace std; - -UnkCode::UnkCode() -{ - code = 0; -} - -UnkCode::UnkCode(unsigned char* byte) -{ - code = 0; - Parse(byte); -} - -UnkCode::UnkCode(unsigned char code, bool) -{ - SetCode(code); -} - -// Getters / Setters -unsigned char UnkCode::GetCode() -{ - return code; -} - -void UnkCode::SetCode(unsigned char value) -{ - code = value; -} - -// Re-implemented -string UnkCode::GenAsm() -{ - stringstream tmpAsmOut; - tmpAsmOut << "db $" << hex << (short)code; - return tmpAsmOut.str(); -} - -bool UnkCode::Parse(unsigned char* byte) -{ - code = byte[0]; - return true; -} - -bool UnkCode::IsValid(unsigned char* byte) -{ - return true; -} - -unsigned int UnkCode::Arguments() -{ - return 0; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/UnkCode.h b/music/pokeredmusicdisasm/UnkCode.h deleted file mode 100644 index 28204448..00000000 --- a/music/pokeredmusicdisasm/UnkCode.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef UNKCODE_H -#define UNKCODE_H - -#include "AbstractData.h" - -// Represents an unknown opcode -class UnkCode : public AbstractData -{ -public: - // Constructors - UnkCode(); - UnkCode(unsigned char* byte); // Parse Immidiately - UnkCode(unsigned char code, bool); // Set Value - - // Getters / Setters - unsigned char GetCode(); - void SetCode(unsigned char value); - - // Re-implemented - virtual std::string GenAsm(); - virtual bool Parse(unsigned char* byte); - virtual bool IsValid(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned char code; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/UnkEB.cpp b/music/pokeredmusicdisasm/UnkEB.cpp deleted file mode 100644 index 39007f30..00000000 --- a/music/pokeredmusicdisasm/UnkEB.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include -#include "UnkEB.h" - -using namespace std; - -UnkEB::UnkEB() -{ - param = 0; -} - -UnkEB::UnkEB(unsigned char* byte) -{ - param = 0; - Parse(byte); -} - -UnkEB::UnkEB(unsigned char code, bool) -{ - SetParam(code); -} - -// Getters / Setters -unsigned char UnkEB::GetParam() -{ - return param; -} - -void UnkEB::SetParam(unsigned char value) -{ - param = value; -} - -// Re-implemented -string UnkEB::GenAsm() -{ - stringstream tmpAsmOut; - tmpAsmOut << hex << "db $" << (short)0xEB << ", $" << (short)param; - return tmpAsmOut.str(); -} - -bool UnkEB::Parse(unsigned char* byte) -{ - param = byte[1]; - return true; -} - -bool UnkEB::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xEB) return true; - else return false; -} - -unsigned int UnkEB::Arguments() -{ - // 1 1-Byte param - return 1; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/UnkEB.h b/music/pokeredmusicdisasm/UnkEB.h deleted file mode 100644 index ab11a655..00000000 --- a/music/pokeredmusicdisasm/UnkEB.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef UNKEB_H -#define UNKEB_H - -#include "AbstractData.h" - -// Represents an unknown opcode -class UnkEB : public AbstractData -{ -public: - // Constructors - UnkEB(); - UnkEB(unsigned char* byte); // Parse Immidiately - UnkEB(unsigned char code, bool); // Set Value - - // Getters / Setters - unsigned char GetParam(); - void SetParam(unsigned char value); - - // Re-implemented - virtual std::string GenAsm(); - virtual bool Parse(unsigned char* byte); - virtual bool IsValid(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned char param; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Velocity.cpp b/music/pokeredmusicdisasm/Velocity.cpp deleted file mode 100644 index 0000d4ba..00000000 --- a/music/pokeredmusicdisasm/Velocity.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include -#include "Velocity.h" -using namespace std; - -Velocity::Velocity() -{ - velocity = 0; - length = 0; -} - -Velocity::Velocity(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Velocity::Velocity(unsigned char velocity, unsigned char length, bool) // Set value -{ - SetVelocity(velocity); - SetLength(length); -} - -// Direct Getters/Setters -unsigned char Velocity::GetVelocity() -{ - return velocity; -} - -void Velocity::SetVelocity(unsigned char value) -{ - velocity = value; -} - -unsigned char Velocity::GetLength() -{ - return length; -} - -void Velocity::SetLength(unsigned char value) -{ - length = value; -} - -bool Velocity::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xDC) - { - error = false; - return true; - } - else - { - error = true; - return false; - } -} - -string Velocity::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_vel" << " " << (short)velocity << ", " << (short)length; - return tmpAsmOut.str(); -} - -bool Velocity::Parse(unsigned char* byte) -{ - if(!AbstractData::Parse(byte)) return false; - - velocity = byte[1] & 0xF0; - velocity >>= 4; - - length = byte[1] & 0x0F; - return true; -} - -unsigned int Velocity::Arguments() -{ - // 1 1-byte argument - return 1; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Velocity.h b/music/pokeredmusicdisasm/Velocity.h deleted file mode 100644 index 5f541b96..00000000 --- a/music/pokeredmusicdisasm/Velocity.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef VELOCITY_H -#define VELOCITY_H - -#include "AbstractData.h" - -class Velocity : public AbstractData -{ -public: - // Constructors - Velocity(); - Velocity(unsigned char* byte); // Parse Immidiately - Velocity(unsigned char velocity, unsigned char length, bool); // Set value - - // Direct Getters/Setters - unsigned char GetVelocity(); - void SetVelocity(unsigned char value); - - unsigned char GetLength(); - void SetLength(unsigned char value); - - // Overides - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned char velocity; - unsigned char length; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Volume.cpp b/music/pokeredmusicdisasm/Volume.cpp deleted file mode 100644 index a0c2d192..00000000 --- a/music/pokeredmusicdisasm/Volume.cpp +++ /dev/null @@ -1,67 +0,0 @@ -#include -#include "Volume.h" -using namespace std; - -Volume::Volume() -{ - volume = 0; -} - -Volume::Volume(unsigned char* byte) // Parse Immidiately -{ - Parse(byte); -} - -Volume::Volume(unsigned char volume, bool) // Set value -{ - SetVolume(volume); -} - -unsigned char Volume::GetVolume() -{ - return volume; -} - -void Volume::SetVolume(unsigned char value) -{ - volume = value; -} - -bool Volume::IsValid(unsigned char* byte) -{ - if(byte[0] == 0xF0) - { - error = false; - return true; - } - else - { - error = true; - return false; - } -} - -string Volume::GenAsm() -{ - string tmpRet = AbstractData::GenAsm(); - if(tmpRet != "") return tmpRet; - - stringstream tmpAsmOut; - tmpAsmOut << "mus_volume" << " " << (short)volume; - return tmpAsmOut.str(); -} - -bool Volume::Parse(unsigned char* byte) -{ - // If it's not a Note, don't even bother parsing - if(!AbstractData::Parse(byte)) return false; - - volume = byte[1]; - return true; -} - -unsigned int Volume::Arguments() -{ - // 1 1-byte argument = 1 - return 1; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/Volume.h b/music/pokeredmusicdisasm/Volume.h deleted file mode 100644 index e716e910..00000000 --- a/music/pokeredmusicdisasm/Volume.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef VOLUME_H -#define VOLUME_H - -#include "AbstractData.h" - -class Volume : public AbstractData -{ -public: - // Constructors - Volume(); - Volume(unsigned char* byte); // Parse Immidiately - Volume(unsigned char volume, bool); // Set value - - // Direct Getters / Setters - unsigned char GetVolume(); - void SetVolume(unsigned char value); - - // Re-implementations - virtual std::string GenAsm(); - virtual bool IsValid(unsigned char* byte); - virtual bool Parse(unsigned char* byte); - virtual unsigned int Arguments(); - -private: - unsigned char volume; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/args.cpp b/music/pokeredmusicdisasm/args.cpp deleted file mode 100644 index f57c9557..00000000 --- a/music/pokeredmusicdisasm/args.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include -#include "args.h" -using namespace std; - -Args::Args(int _argc, char**& _argv) -{ - argc = _argc; - for(int i = 0; i < _argc; i++) - { - argv.push_back(string(_argv[i])); - } -} - -//template -/*export void Args::GetArg(unsigned int ind, T& var, ios_base::fmtflags flags) -{ - string stream _tmpstr; - - _tmpstr << flags; - _tmpstr << GetArgv(ind); - _tmpstr >> var; -}*/ - -int Args::GetArgs() -{ - return argv.size(); -} - -string Args::GetArgv(int ind) -{ - return argv[ind]; -} - -bool Args::IsLongOption(int ind) // Is that argument a --long-key=value -{ - if(GetArgv(ind).substr(0, 2) == "--") return true; - else return false; -} - -bool Args::IsShortOption(int ind, bool param2) // Is that argument a --long-key=value -{ - if(param2) - { - if(GetArgv(ind).substr(0, 1) == "-" && // The argument must start with - - GetArgv(ind).substr(0, 2) != "--" && // The argument can't start with "--" - ind + 1 < GetArgs()) return true; // The second argument must exist - } - else - { - if(GetArgv(ind).substr(0, 1) == "-" && // The argument must start with - - GetArgv(ind).substr(0, 2) != "--") return true; // The argument can't start with "--" - } - - return false; -} - -string Args::GetKey(int ind) // Get the key, if not a key/value then returns the arg -{ - if(IsLongOption(ind) && GetArgv(ind).find("=") != string::npos) return GetArgv(ind).substr(2, GetArgv(ind).find("=") - 2); - else if(IsShortOption(ind)) return GetArgv(ind).substr(1); - else return GetArgv(ind); -} - -string Args::GetValue(int ind, bool param2) // Get the value , if not a key/value then returns the arg -{ - if(IsLongOption(ind) && GetArgv(ind).find("=") != string::npos) return GetArgv(ind).substr(GetArgv(ind).find("=") + 1); - else if(IsShortOption(ind, param2)) - { - if(param2) return GetArgv(ind + 1); - else return GetArgv(ind); - } - - return GetArgv(ind); -} - -int Args::SearchKeys(const char* str) -{ - string needle = str; - string scr = ""; - unsigned int pos = -1; - - for(int i = 0; i < GetArgs(); i++) - { - scr = GetKey(i); - if(scr == needle) - { - pos = i; - break; - } - } - - return pos; -} \ No newline at end of file diff --git a/music/pokeredmusicdisasm/args.h b/music/pokeredmusicdisasm/args.h deleted file mode 100644 index c8e931f2..00000000 --- a/music/pokeredmusicdisasm/args.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef ARGS_H -#define ARGS_H - -#include -#include -#include - -class Args -{ -public: - Args(int _argc, char**& _argv); - - template // Get the argument automatically in any format that stringstream can output to - void GetValueC(int ind, T& var, std::ios_base::fmtflags flags = std::ios_base::dec, bool param2 = false) - { - std::stringstream _tmpstr; - - _tmpstr << GetValue(ind, param2); - _tmpstr.flags(flags); - _tmpstr >> var; - } - - int GetArgs(); // Get number of args - std::string GetArgv(int ind); // Get the arg based on true index - bool IsLongOption(int ind); // Is that argument a --long-key=value - bool IsShortOption(int ind, bool param2 = false); // Is that argument a --long-key=value - - std::string GetKey(int ind); // Get the key, if not a key/value then returns the arg - std::string GetValue(int ind, bool param2 = false); // Get the value, if not a key/value then returns the arg - - int SearchKeys(const char* str); // Return the index number of found key or -1 if not found - -private: - int argc; - std::vector argv; -}; - -#endif \ No newline at end of file diff --git a/music/pokeredmusicdisasm/main.cpp b/music/pokeredmusicdisasm/main.cpp deleted file mode 100644 index 19d302b4..00000000 --- a/music/pokeredmusicdisasm/main.cpp +++ /dev/null @@ -1,122 +0,0 @@ -#include "Console.h" -#include "Parser.h" -#include "args.h" -#include -#include - -using namespace std; - -void PrintUsage() -{ - Console::PrintLn("Usage: [ [ | --]]"); - Console::PrintLn("Usage: [--offset= | -o ] [--file=[ | --] | -f [ | --]] [--stop= | -s ]"); - Console::PrintLn("Usage: [-h | --help]"); - Console::PrintLn(""); - Console::PrintLn("Used without parameters will start in limited interactive mode where the program will ask you the file and offset"); - Console::PrintLn("An offset is a requirement but the file may be blank or explicitly set, whenever the file is set you may use '--' to substitute for the default file '../baserom.gbc'"); - Console::PrintLn("If parameter options are not used the ordering is important:"); - Console::PrintLn("There is an intentional glitch in the program, since long paramaters must be specified with --xxx= with or without a value, you may use the short option instead -xxx even though it's suppose to be -xxx="); - Console::PrintLn("\t* "); - Console::PrintLn("If parameter options are used the ordering does not matter, ensure the parameter option or parameter is present"); - Console::PrintLn("You may mix and match parameters and parameter options, keep in mind that bare parameters must be in a certain order"); - Console::PrintLn("If the offset parameter is missing in any way the program will prompt you for it"); - Console::PrintLn("The program will stop parsing when it encounters mus_end regardlessly"); - Console::PrintLn("Parameter types"); - Console::PrintLn("\t* - Bare parameter, they must be in a certain order"); - Console::PrintLn("\t* -xxx=xxx - Long parameter option, it can be in any order but is case sensitive, can contain no spaces, must contain the equal sign, and is read literally"); - Console::PrintLn("\t* -xxx xxx - Short parameter option, it can be in any order but is case sensitive, must contain 1 space and is read literally"); - Console::PrintLn("----"); - Console::PrintLn("Breakdown of parameters:"); - Console::PrintLn(" - A bare parameter, it must be in hexidecimal eith alone or prefixed with 0x and be the first parameter. It tells the parser where to start parsing"); - Console::PrintLn(" - A bare parameter, it must be the second parameter and tells the parser which rom file to parse"); - Console::PrintLn("-- - A special file path value meaning use the default file '../baserom.gbc'"); - Console::PrintLn("--offset, -o - the parameterized offset in hexidecimal, It tells the parser where to start parsing"); - Console::PrintLn("--file, -f - the parameterized file path, It tells the parser which rom file to parse"); - Console::PrintLn("--stop, -s - tells the parser to stop at that hexidecimal address or until it reaches mus_end."); - Console::PrintLn("-fo - must be used with --stop, forces the program to proceed on despite discovering any mus_end"); - Console::PrintLn("help, --help, -h - prints this info and exits, if the bare parameter is used it must be the first parameter"); -} - -/* - Usage: - pokeredmusicdisasm [ [ | --]] - pokeredmusicdisasm [--offset= | -o ] [--file=[ | --] | -f [ | --]] [--stop= | -s ] -*/ -int main(int argc, char** argv) -{ - Args a(argc, argv); - - const unsigned char parameters = 2; - const string defFileLoc = "../baserom.gbc"; - - string filePath = ""; - unsigned int offset = 0; - unsigned int stop = 0; - bool force = false; - - // Get the file path, this can be set with -f filename, --file=filename, arg #2, or missing (missing means default) - // the filepath can contain the actual filename or -- to use the built-in path, if the path is not missing then it must be set (can't be blank) - - // Is the user asking for help with -h, --help=, or help - if((a.SearchKeys("h") != -1) || (a.SearchKeys("help") != -1) || (a.GetArgv(1) == "help")) - { - PrintUsage(); - return 0; - } - - // Does a -f or --file key exist - if(a.SearchKeys("f") != -1) filePath = a.GetValue(a.SearchKeys("f"), true); - else if(a.SearchKeys("file") != -1) filePath = a.GetValue(a.SearchKeys("file")); - - // BUG FIX: a short parameter can be either 1 or 2 parts so this causes the if statement below to load incorrect info if - // -f or --file isn't specified and the first argument is a short parameter "-x x" - else if((a.GetArgs() == (2 + 1)) && (a.IsShortOption(1, true))) filePath = defFileLoc; - - // Does arg #2 exist - else if(a.GetArgs() >= 2 + 1) a.GetValueC(2, filePath); - - // Is there at least 1 arg (In that case it's missing and the default can be assumed) - else if(a.GetArgs() >= 1 + 1) filePath = defFileLoc; - - // Ask the user - else Console::Ask("Filepath: ", filePath); - - if(filePath == "--") filePath = defFileLoc; - else if(filePath == "") - { - Console::PrintLn("Filename can't be blank"); - return 1; - } - - // Get the offset, this can be set with -o , --offset=, or as arg #1 - if(a.SearchKeys("o") != -1) a.GetValueC(a.SearchKeys("o"), offset, ios_base::hex | ios_base::uppercase, true); - else if(a.SearchKeys("offset") != -1) a.GetValueC(a.SearchKeys("offset"), offset, ios_base::hex | ios_base::uppercase); - - // Does arg #1 exist - else if(a.GetArgs() >= 1 + 1) a.GetValueC(1, offset, ios_base::hex | ios_base::uppercase); - - // Ask the user - else Console::Ask("Offset: ", offset, ios_base::hex | ios_base::uppercase); - - // Get the stop parameter, this can be set with -s , --stop= (it must be set via args) - if(a.SearchKeys("s") != -1) a.GetValueC(a.SearchKeys("s"), stop, ios_base::hex | ios_base::uppercase, true); - else if(a.SearchKeys("stop") != -1) filePath = a.GetValue(a.SearchKeys("stop")); - - // Get the force parameter, this can be set with -f (it must be set via args) - if(a.SearchKeys("fo") != -1) force = true; - - if((stop == 0) && (force == true)) - { - Console::ErrorLn("Error! You set the force command but did not set the stop command, this means it will parse every line until the end of the rom."); - return 1; - } - - Parser p(filePath); - if(stop != 0) p.SetStopAddress(stop); - if(force) p.SetForce(true); - p.Parse(offset); - - Console::PrintLn(p.GetParsedAsm().c_str()); - - return 0; -} \ No newline at end of file diff --git a/music/pokeredwavptnvis/Console.cpp b/music/pokeredwavptnvis/Console.cpp deleted file mode 100644 index 9bac7b1f..00000000 --- a/music/pokeredwavptnvis/Console.cpp +++ /dev/null @@ -1,54 +0,0 @@ -#include "Console.h" - -using namespace std; - -// Basic -void Console::Get(char* value) -{ - cin >> value; -} -void Console::Get(string& value) -{ - cin >> value; -} -void Console::Print(const char* value) -{ - cout << value; -} -void Console::Error(const char* value) -{ - cerr << value; -} - -// Upper-Basic -void Console::PrintLn(const char* value) -{ - Print(value); - cout << endl; -} -void Console::ErrorLn(const char* value) -{ - Error(value); - cerr << endl; -} - -// Higher -void Console::Ask(const char* question, char* answer) -{ - Print(question); - Get(answer); -} -void Console::Ask(const char* question, string& answer) -{ - Print(question); - Get(answer); -} - -// Better Error Handling -int Console::atoi_ex(const char* input, bool supress) -{ - //int convInp = atoi(input); - //if((supress == false) && (convInp == 0)) - // PrintLn("Warning: the converted integer input is 0, this may not be what you intended"); - // return convInp; -} diff --git a/music/pokeredwavptnvis/Console.h b/music/pokeredwavptnvis/Console.h deleted file mode 100644 index c6fe1833..00000000 --- a/music/pokeredwavptnvis/Console.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef CONSOLE_H -#define CONSOLE_H - -#include -#include - -// Just a Console Utility Library -class Console -{ -public: - // Basic - static void Get(char* value); - static void Get(std::string& value); - static void Print(const char* value); - static void Error(const char* value); - - // Upper-Basic - static void PrintLn(const char* value); - static void ErrorLn(const char* value); - - // Higher - static void Ask(const char* question, char* answer); - static void Ask(const char* question, std::string& answer); - - // Better Error Handling - static int atoi_ex(const char* input, bool supress = false); -}; - -#endif // CONSOLE_H diff --git a/music/pokeredwavptnvis/Makefile b/music/pokeredwavptnvis/Makefile deleted file mode 100644 index 2b211675..00000000 --- a/music/pokeredwavptnvis/Makefile +++ /dev/null @@ -1,18 +0,0 @@ - -OBJECTS = Console.o main.o - -CC = g++ -CFLAGS = -std=c++0x - -pokeredwavptnvis: $(OBJECTS) - $(CC) $(CFLAGS) $(OBJECTS) -o "../../extras/pokeredwavptnvis.exe" - -Console.o: Console.h - $(CC) $(CFLAGS) -c Console.cpp - -main.o: main.cpp Console.h - $(CC) $(CFLAGS) -c main.cpp Console.cpp - -clean: - rm *.o - rm ../../extras/pokeredwavptnvis.exe diff --git a/music/pokeredwavptnvis/README.txt b/music/pokeredwavptnvis/README.txt deleted file mode 100644 index dff29542..00000000 --- a/music/pokeredwavptnvis/README.txt +++ /dev/null @@ -1,17 +0,0 @@ -to compile you must have g++ installed -type: make -and it will install to the extras folder - -if you want to unmake -type: make clean -and it will remove make objects and the executable - -the program usage is: pokeredwavptnvis [ [ | --] -offset is the rom offset in hexidecimal (FFFF or 0xFFFF) -file is the rom file, you can use -- for "../baserom.gbc" - -to make things quick and easy you can just enter the hexidecimal offset -pokeredwavptnvis - -you may enter limited interactive mode by not supplying any arguments -pokeredwavptnvis \ No newline at end of file diff --git a/music/pokeredwavptnvis/main.cpp b/music/pokeredwavptnvis/main.cpp deleted file mode 100644 index 035daef5..00000000 --- a/music/pokeredwavptnvis/main.cpp +++ /dev/null @@ -1,156 +0,0 @@ -#include -#include -#include -#include - -#include "Console.h" - -using namespace std; - -char* rawBytes = 0; -unsigned int fileLength = 0; - -void Read(const char* filename) -{ - // open File - fstream tmpFile(filename, ios_base::in | ios_base::binary); - - // Get Length - tmpFile.seekg(0, ios::end); - fileLength = tmpFile.tellg(); - tmpFile.seekg(0, ios::beg); - - // Allocate proper memory - rawBytes = new char[fileLength]; - - // Read filedata - tmpFile.read(rawBytes, fileLength); - tmpFile.close(); -} - -unsigned char GetNibble(unsigned char byte, bool high) -{ - if(high) - { - unsigned char tmp = byte & 0xF0; - tmp >>= 4; - return tmp; - } - else - { - unsigned char tmp = byte & 0x0F; - return tmp; - } -} - -// Usage: pokeredwavptnvis [ [ | --]] -// If no parameters or a parameter is missing the program enters limited interactive mode -int main(int argc, char** argv) -{ - const unsigned char parameters = 2; - const unsigned char self = 1; - const unsigned char _max_argc = parameters + self; - const string defFileLoc = "../baserom.gbc"; - - string arg1; // Offset - string arg2; // File or "--" (if "--" then the file is assumed) - - string paramStopAddr; - - if(argc >= _max_argc) - { - arg1 = argv[1]; - arg2 = argv[2]; - } - else if(argc == (_max_argc - 1)) - { - arg1 = argv[1]; - arg2 = defFileLoc; - } - - if(arg1 == "") Console::Ask("What offset in the file in hex: ", arg1); - if(arg2 == "") Console::Ask("What file: ", arg2); - if(arg2 == "--") arg2 = defFileLoc; // You can also put "--" for the default file location - - stringstream arg1Conv; - unsigned int arg1ConvNum; - arg1Conv << arg1; - arg1Conv << hex; - arg1Conv >> arg1ConvNum; - - Read(arg2.c_str()); - unsigned char* rawBytesFixed = (unsigned char*)rawBytes; - - // All the loading is done, create a 32x16 vector - vector> image; - vector lines; // This is the array of output lines - - // Initialize the vector image[x][y] and lines - for(unsigned char i = 0; i < 32; i++) - { - image.push_back(vector()); - - for(unsigned char j = 0; j < 16; j++) - { - image[i].push_back(false); - lines.push_back(""); - } - } - - unsigned char n1 = 0; - unsigned char n2 = 0; - - vector expBytes; - for(unsigned char i = 0; i < 16; i++) - { - n1 = GetNibble(rawBytesFixed[arg1ConvNum + i], true); - n2 = GetNibble(rawBytesFixed[arg1ConvNum + i], false); - - expBytes.push_back(n1); - expBytes.push_back(n2); - } - - // Go through each column in the vector and add a 1 on the appropiate line - for(unsigned char i = 0; i < 32; i++) - { - unsigned char _tmpVal = expBytes[i]; // Here for debugging reasons - image[i][_tmpVal] = true; - } - - // Now draw the image - for(unsigned char i = 0; i < 32; i++) - { - for(unsigned char j = 0; j < 16; j++) - { - if(i == 0) - { - if(image[i][j]) lines[j].append("|*"); - else lines[j].append("| "); - } - else if((i > 0) && (i < 31)) - { - if(image[i][j]) lines[j].append(".*"); - else lines[j].append(". "); - } - else - { - if(image[i][j]) lines[j].append(".*|"); - else lines[j].append(". |"); - } - } - } - - // Now output the drawn lines (mirrored) - stringstream tmpCtr; - Console::PrintLn(" 0 1 2 3 4 5 6 7 8 9 A B C D E F 0 1 2 3 4 5 6 7 8 9 A B C D E F"); - Console::PrintLn(" ---------------------------------------------------------------"); - for(unsigned char i = 0xF; (i >= 0x0) && (i < 0x10); i--) - { - tmpCtr << hex << uppercase << (short)i; - Console::Print(tmpCtr.str().c_str()); - Console::PrintLn(lines[i].c_str()); - tmpCtr.str(""); - } - - return 0; -} \ No newline at end of file diff --git a/music/routes1.asm b/music/routes1.asm new file mode 100644 index 00000000..7f12b56f --- /dev/null +++ b/music/routes1.asm @@ -0,0 +1,405 @@ +Music_Routes1_Ch1: ; 9bde (2:5bde) + tempo 0, 152 + stereopanning 119 + vibrato 4, 2, 3 + duty 2 + unknownmusic0xe8 + +Music_Routes1_branch_9be9: + notetype 12, 10, 1 + rest 4 + octave 4 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note A_, 2 + note A_, 2 + note A_, 6 + octave 4 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 4 + octave 3 + note A_, 2 + note A_, 6 + octave 4 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 2 + note A_, 2 + note A_, 6 + octave 4 + note C#, 2 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + notetype 12, 10, 2 + octave 4 + note G_, 4 + note E_, 4 + note F#, 2 + notetype 12, 10, 1 + octave 3 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + note F#, 2 + note A_, 4 + note G_, 2 + note E_, 2 + note C#, 4 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 4 + note B_, 2 + note G_, 2 + note B_, 4 + octave 4 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 + octave 3 + note A_, 2 + note A_, 2 + loopchannel 0, Music_Routes1_branch_9be9 + endchannel + + +Music_Routes1_Ch2: ; 9c51 (2:5c51) + duty 2 + +Music_Routes1_branch_9c53: + notetype 12, 13, 1 + callchannel Music_Routes1_branch_9c65 + callchannel Music_Routes1_branch_9c78 + callchannel Music_Routes1_branch_9c65 + callchannel Music_Routes1_branch_9c8d + loopchannel 0, Music_Routes1_branch_9c53 + +Music_Routes1_branch_9c65: + octave 4 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note G_, 3 + note F#, 1 + note E_, 6 + endchannel + +Music_Routes1_branch_9c78: + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note D_, 4 + note F#, 2 + endchannel + +Music_Routes1_branch_9c8d: + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + notetype 12, 13, 2 + note B_, 4 + notetype 6, 13, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + notetype 12, 13, 1 + octave 3 + note B_, 1 + note A_, 1 + octave 4 + note C#, 1 + note D_, 6 + notetype 12, 13, 2 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 3 + note F#, 1 + note E_, 6 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 3 + note G_, 1 + note A_, 2 + octave 5 + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + notetype 12, 13, 1 + octave 4 + note D_, 2 + note D_, 2 + endchannel + endchannel + + +Music_Routes1_Ch3: ; 9cd8 (2:5cd8) + vibrato 8, 2, 5 + notetype 12, 1, 3 + +Music_Routes1_branch_9cdd: + rest 2 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + note A_, 8 + octave 4 + note C#, 8 + note D_, 8 + octave 3 + note G_, 8 + note A_, 8 + octave 4 + note D_, 6 + loopchannel 0, Music_Routes1_branch_9cdd + endchannel + + +Music_Routes1_Ch4: ; 9d24 (2:5d24) + dspeed 12 + rest 4 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 4 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 4 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 4 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 4 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 4 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 4 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + rest 2 + dnote 2, mutedsnare1 + dnote 2, mutedsnare1 + loopchannel 0, Music_Routes1_Ch4 + endchannel +; 0x9db9 \ No newline at end of file diff --git a/music/routes2.asm b/music/routes2.asm new file mode 100644 index 00000000..f3f19c72 --- /dev/null +++ b/music/routes2.asm @@ -0,0 +1,426 @@ +Music_Routes2_Ch1: ; 9db9 (2:5db9) + tempo 0, 152 + stereopanning 119 + vibrato 9, 2, 5 + duty 1 + +Music_Routes2_branch_9dc3: + notetype 12, 11, 2 + octave 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note A_, 2 + note G#, 4 + note F#, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note B_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note A_, 2 + note G#, 4 + note B_, 4 + notetype 8, 11, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + loopchannel 0, Music_Routes2_branch_9dc3 + endchannel + + +Music_Routes2_Ch2: ; 9e4f (2:5e4f) + vibrato 8, 2, 6 + duty 3 + +Music_Routes2_branch_9e54: + notetype 12, 13, 4 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 + octave 3 + note D#, 4 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 + octave 3 + note G#, 4 + octave 5 + note C#, 6 + octave 4 + note B_, 1 + note A_, 1 + note B_, 6 + note A_, 1 + note G#, 1 + note A_, 6 + note G#, 1 + note F#, 1 + note G#, 4 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 8 + note A_, 4 + note G#, 3 + note F#, 1 + note E_, 8 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 + octave 5 + note C#, 4 + octave 4 + note B_, 3 + note A_, 1 + note G#, 8 + rest 4 + loopchannel 0, Music_Routes2_branch_9e54 + endchannel + + +Music_Routes2_Ch3: ; 9e9b (2:5e9b) + vibrato 9, 2, 8 + +Music_Routes2_branch_9e9e: + notetype 12, 1, 1 + octave 3 + note E_, 2 + rest 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 + rest 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + rest 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 + rest 2 + octave 2 + note B_, 4 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 2 + note E_, 2 + rest 2 + octave 2 + note A_, 2 + rest 2 + octave 3 + note D#, 2 + rest 2 + octave 2 + note G#, 2 + rest 2 + octave 3 + note C#, 2 + rest 2 + octave 2 + note F#, 2 + rest 2 + note B_, 2 + rest 2 + note E_, 2 + note G#, 2 + note F#, 2 + rest 2 + note A_, 2 + rest 2 + note F#, 2 + rest 2 + note A_, 2 + rest 2 + note G#, 2 + rest 2 + note B_, 2 + rest 2 + note G#, 2 + rest 2 + note B_, 2 + rest 2 + note F#, 2 + rest 2 + note A_, 2 + rest 2 + octave 3 + note C#, 2 + rest 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + rest 2 + octave 3 + note E_, 2 + rest 2 + note G#, 2 + rest 2 + note E_, 2 + rest 2 + loopchannel 0, Music_Routes2_branch_9e9e + endchannel + + +Music_Routes2_Ch4: ; 9f08 (2:5f08) + dspeed 12 + dnote 2, snare3 + rest 2 + dnote 1, snare3 + rest 5 + dnote 1, snare3 + dnote 1, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + rest 2 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 3, snare3 + dnote 3, snare3 + dspeed 12 + dnote 1, snare3 + rest 3 + dnote 2, snare3 + rest 2 + dnote 2, snare3 + rest 4 + dnote 1, snare3 + dnote 1, snare3 + dnote 2, snare3 + rest 2 + dnote 2, snare3 + rest 2 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 3, snare3 + dnote 3, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 3, snare3 + rest 3 + dspeed 12 + dnote 1, snare3 + rest 5 + dnote 1, snare3 + dnote 1, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + rest 2 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 3, snare3 + rest 3 + dspeed 12 + dnote 1, snare3 + rest 3 + dnote 2, snare3 + rest 2 + dnote 2, snare3 + rest 4 + dnote 1, snare3 + dnote 1, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + rest 2 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 3, snare3 + rest 3 + dnote 3, snare3 + dnote 3, snare3 + dnote 3, snare3 + rest 3 + dspeed 12 + dnote 1, snare3 + rest 5 + dnote 1, snare3 + dnote 1, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + rest 2 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 3, snare3 + rest 3 + dnote 3, snare3 + rest 3 + loopchannel 0, Music_Routes2_Ch4 + endchannel +; 0x9fad \ No newline at end of file diff --git a/music/routes3.asm b/music/routes3.asm new file mode 100644 index 00000000..46c9528f --- /dev/null +++ b/music/routes3.asm @@ -0,0 +1,516 @@ +Music_Routes3_Ch1: ; 9fad (2:5fad) + tempo 0, 148 + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 5 + octave 3 + note E_, 1 + note F#, 1 + note G_, 6 + note F_, 1 + note G_, 1 + note E_, 1 + rest 16 + rest 15 + +Music_Routes3_branch_9fc3: + notetype 12, 11, 5 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + notetype 12, 10, 7 + note A#, 8 + note F_, 8 + note D_, 8 + note F_, 8 + notetype 12, 11, 5 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + notetype 12, 10, 7 + note A#, 8 + note A#, 8 + note D_, 8 + note F_, 8 + notetype 12, 11, 5 + note E_, 4 + note E_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note B_, 2 + octave 2 + note G_, 4 + octave 3 + note B_, 8 + note A_, 2 + notetype 8, 12, 3 + note A_, 4 + note F_, 4 + note A_, 4 + notetype 8, 4, 15 + note A_, 12 + notetype 8, 9, 0 + note F_, 12 + note G_, 12 + loopchannel 0, Music_Routes3_branch_9fc3 + + +Music_Routes3_Ch2: ; a009 (2:6009) + vibrato 8, 2, 3 + duty 2 + notetype 12, 12, 7 + octave 3 + note G_, 1 + note A#, 1 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + rest 15 + rest 16 + +Music_Routes3_branch_a01a: + notetype 12, 12, 7 + duty 2 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 10 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + notetype 12, 12, 5 + duty 3 + octave 3 + note A#, 8 + note A_, 8 + notetype 12, 12, 7 + duty 2 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 10 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + notetype 12, 12, 5 + duty 3 + octave 3 + note A#, 8 + octave 4 + note D_, 6 + notetype 12, 12, 7 + duty 2 + note C_, 1 + note D_, 1 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 8 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + octave 3 + note G_, 4 + octave 4 + note G_, 8 + note F_, 1 + note E_, 1 + notetype 8, 13, 3 + note F_, 4 + note E_, 4 + notetype 8, 12, 4 + note C_, 4 + notetype 8, 12, 5 + note C_, 12 + notetype 12, 10, 0 + duty 3 + octave 3 + note A_, 8 + note B_, 8 + loopchannel 0, Music_Routes3_branch_a01a + + +Music_Routes3_Ch3: ; a07f (2:607f) + vibrato 4, 1, 0 + notetype 6, 1, 2 + octave 4 + note G_, 2 + note A#, 2 + note B_, 8 + note A_, 8 + note G_, 2 + rest 2 + note G_, 7 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 2 + rest 2 + note G_, 2 + rest 2 + note G_, 8 + note G_, 2 + rest 2 + note G_, 7 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 2 + rest 2 + note G_, 2 + rest 2 + note G_, 8 + +Music_Routes3_branch_a0a3: + notetype 12, 1, 2 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 2 + note A_, 2 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 2 + note F_, 2 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + rest 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 2 + note A_, 2 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + rest 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A#, 2 + note A_, 2 + note G_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note G_, 1 + note G_, 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note G_, 1 + rest 1 + octave 5 + note D_, 4 + octave 4 + note G_, 1 + note G_, 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + octave 5 + note D_, 4 + octave 4 + note F_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + octave 5 + note C_, 4 + octave 4 + note F_, 1 + rest 1 + note A_, 4 + note F_, 1 + note F_, 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note A_, 4 + loopchannel 0, Music_Routes3_branch_a0a3 + + +Music_Routes3_Ch4: ; a131 (2:6131) + dspeed 6 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 8, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + +Music_Routes3_branch_a17a: + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare3 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare3 + dnote 4, mutedsnare2 + dnote 10, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare4 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 10, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 10, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 8, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 12, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + loopchannel 0, Music_Routes3_branch_a17a +; 0xa26a \ No newline at end of file diff --git a/music/routes4.asm b/music/routes4.asm new file mode 100644 index 00000000..ee53bf8b --- /dev/null +++ b/music/routes4.asm @@ -0,0 +1,682 @@ +Music_Routes4_Ch1: ; a26a (2:626a) + tempo 0, 148 + stereopanning 119 + duty 3 + vibrato 10, 3, 4 + unknownmusic0xe8 + notetype 12, 10, 2 + octave 2 + note G#, 4 + note G#, 4 + note G#, 4 + notetype 12, 7, 15 + note G#, 4 + notetype 12, 10, 2 + note G#, 4 + note G#, 4 + note G#, 4 + notetype 12, 11, 7 + note B_, 1 + octave 3 + note E_, 1 + note F#, 1 + note B_, 1 + +Music_Routes4_branch_a28a: + notetype 12, 11, 7 + note B_, 6 + note E_, 2 + note E_, 4 + octave 4 + note E_, 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + notetype 12, 11, 1 + note G#, 3 + notetype 12, 11, 7 + note E_, 1 + note F#, 12 + note E_, 8 + note D#, 4 + note F#, 4 + note B_, 6 + note E_, 2 + note E_, 4 + octave 4 + note E_, 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + notetype 12, 11, 1 + note E_, 3 + notetype 12, 11, 7 + note D#, 1 + note E_, 12 + octave 3 + note B_, 3 + note A_, 1 + note G#, 8 + octave 4 + note E_, 4 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note D#, 2 + note E_, 2 + octave 3 + note B_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + notetype 8, 11, 5 + note A_, 4 + note G#, 4 + note F#, 4 + octave 4 + note E_, 4 + note D#, 4 + note C#, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D#, 4 + octave 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 4 + octave 4 + note C#, 4 + note D#, 4 + note E_, 3 + octave 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + loopchannel 0, Music_Routes4_branch_a28a + + +Music_Routes4_Ch2: ; a304 (2:6304) + vibrato 12, 2, 4 + duty 1 + notetype 12, 9, 2 + octave 3 + note E_, 3 + note F#, 1 + notetype 12, 9, 0 + note E_, 12 + notetype 12, 9, 2 + octave 2 + note B_, 3 + octave 3 + note C_, 1 + notetype 12, 9, 0 + octave 2 + note B_, 8 + duty 3 + notetype 12, 12, 7 + octave 3 + note E_, 1 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + +Music_Routes4_branch_a325: + notetype 12, 12, 7 + note E_, 6 + octave 3 + note B_, 2 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + notetype 12, 12, 2 + note G#, 3 + note E_, 1 + notetype 12, 10, 0 + octave 3 + note B_, 12 + duty 0 + notetype 12, 12, 2 + octave 2 + note B_, 3 + notetype 12, 12, 7 + octave 3 + note C_, 1 + octave 2 + note B_, 8 + octave 3 + note D#, 4 + duty 3 + octave 4 + note E_, 6 + octave 3 + note B_, 2 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 1 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + note A_, 1 + notetype 12, 12, 2 + note B_, 3 + notetype 12, 12, 7 + note A_, 1 + notetype 12, 11, 0 + note G#, 6 + notetype 12, 9, 0 + note G#, 6 + notetype 12, 7, 0 + note G#, 6 + notetype 12, 6, 15 + note G#, 6 + notetype 12, 12, 7 + note G#, 4 + notetype 8, 12, 3 + note A_, 4 + note G#, 4 + note F#, 4 + notetype 8, 9, 0 + note F#, 6 + notetype 8, 7, 15 + note F#, 6 + duty 0 + notetype 8, 9, 0 + octave 3 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 6 + duty 3 + notetype 8, 12, 7 + octave 4 + note F#, 6 + note G#, 4 + note F#, 4 + notetype 8, 12, 4 + note E_, 4 + notetype 8, 10, 0 + note E_, 12 + duty 0 + notetype 8, 9, 0 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note G#, 6 + duty 3 + notetype 8, 12, 7 + octave 4 + note E_, 6 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + notetype 8, 10, 0 + octave 4 + note B_, 16 + notetype 8, 10, 7 + note B_, 8 + notetype 8, 11, 0 + note A_, 6 + notetype 8, 11, 7 + note A_, 6 + notetype 12, 10, 7 + note G#, 1 + note F#, 1 + notetype 12, 11, 0 + note E_, 12 + notetype 12, 10, 0 + note E_, 8 + notetype 12, 10, 7 + note E_, 10 + loopchannel 0, Music_Routes4_branch_a325 + + +Music_Routes4_Ch3: ; a3c4 (2:63c4) + notetype 12, 1, 0 + octave 4 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note E_, 1 + rest 3 + note D#, 1 + rest 3 + +Music_Routes4_branch_a3d7: + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note A_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note A_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note D_, 1 + rest 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + rest 3 + note D_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + rest 1 + note B_, 1 + rest 3 + note B_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + rest 1 + note E_, 1 + rest 3 + note D#, 1 + rest 1 + loopchannel 0, Music_Routes4_branch_a3d7 + + +Music_Routes4_Ch4: ; a49d (2:649d) + dspeed 12 + rest 16 + rest 12 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + +Music_Routes4_branch_a4a8: + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 2, mutedsnare2 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 4, mutedsnare2 + dnote 1, mutedsnare4 + dnote 1, mutedsnare4 + dnote 1, mutedsnare3 + dnote 1, mutedsnare3 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + dnote 2, mutedsnare2 + loopchannel 0, Music_Routes4_branch_a4a8 +; 0xa5f0 \ No newline at end of file diff --git a/music/safarizone.asm b/music/safarizone.asm new file mode 100644 index 00000000..a772fa2a --- /dev/null +++ b/music/safarizone.asm @@ -0,0 +1,112 @@ +Music_SafariZone_Ch1: ; bc2e (2:7c2e) + tempo 0, 132 + stereopanning 119 + vibrato 6, 3, 4 + unknownmusic0xe8 + duty 2 + notetype 12, 9, 2 + octave 3 + pitchbend 0, 73 + note C_, 1 + pitchbend 0, 73 + note G_, 1 + pitchbend 0, 73 + note C_, 1 + pitchbend 0, 73 + note G_, 1 + rest 4 + duty 3 + +Music_SafariZone_branch_bc4f: + callchannel Music_SafariZone_branch_bc5f + notetype 12, 10, 4 + note F#, 4 + callchannel Music_SafariZone_branch_bc5f + notetype 12, 10, 4 + note F#, 4 + loopchannel 0, Music_SafariZone_branch_bc4f + +Music_SafariZone_branch_bc5f: + notetype 12, 10, 2 + octave 3 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + endchannel + + +Music_SafariZone_Ch2: ; bc6a (2:7c6a) + duty 2 + vibrato 8, 2, 5 + notetype 12, 10, 2 + octave 4 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + rest 4 + duty 3 + +Music_SafariZone_branch_bc79: + callchannel Music_SafariZone_branch_bc89 + notetype 12, 11, 5 + note A_, 4 + callchannel Music_SafariZone_branch_bc89 + notetype 12, 11, 5 + note B_, 4 + loopchannel 0, Music_SafariZone_branch_bc79 + +Music_SafariZone_branch_bc89: + notetype 12, 11, 2 + octave 3 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + endchannel + + +Music_SafariZone_Ch3: ; bc94 (2:7c94) + notetype 12, 1, 0 + rest 8 + +Music_SafariZone_branch_bc97: + callchannel Music_SafariZone_branch_bca5 + octave 4 + note A_, 4 + callchannel Music_SafariZone_branch_bca5 + octave 4 + note B_, 4 + loopchannel 0, Music_SafariZone_branch_bc97 + +Music_SafariZone_branch_bca5: + octave 3 + note A_, 2 + rest 2 + octave 4 + note D_, 2 + rest 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note D_, 2 + rest 2 + octave 3 + note A_, 2 + rest 2 + octave 4 + note D_, 2 + rest 2 + octave 3 + note A_, 2 + rest 2 + endchannel +; 0xbcbb \ No newline at end of file diff --git a/music/sfx/sfx_02_01.asm b/music/sfx/sfx_02_01.asm new file mode 100644 index 00000000..c9c00bd6 --- /dev/null +++ b/music/sfx/sfx_02_01.asm @@ -0,0 +1,6 @@ +SFX_02_01_Ch1: ; 82fd (2:42fd) + note D_, 1 + rest 2 + note D#, 4 + endchannel +; 0x8301 \ No newline at end of file diff --git a/music/sfx/sfx_02_02.asm b/music/sfx/sfx_02_02.asm new file mode 100644 index 00000000..057f3617 --- /dev/null +++ b/music/sfx/sfx_02_02.asm @@ -0,0 +1,6 @@ +SFX_02_02_Ch1: ; 8301 (2:4301) + note D_, 1 + note B_, 2 + note D#, 4 + endchannel +; 0x8305 \ No newline at end of file diff --git a/music/sfx/sfx_02_03.asm b/music/sfx/sfx_02_03.asm new file mode 100644 index 00000000..b4732da1 --- /dev/null +++ b/music/sfx/sfx_02_03.asm @@ -0,0 +1,6 @@ +SFX_02_03_Ch1: ; 8305 (2:4305) + note D_, 1 + note A#, 2 + note D#, 4 + endchannel +; 0x8309 \ No newline at end of file diff --git a/music/sfx/sfx_02_04.asm b/music/sfx/sfx_02_04.asm new file mode 100644 index 00000000..df4cc87c --- /dev/null +++ b/music/sfx/sfx_02_04.asm @@ -0,0 +1,6 @@ +SFX_02_04_Ch1: ; 8309 (2:4309) + note D_, 1 + note G#, 2 + note D#, 4 + endchannel +; 0x830d \ No newline at end of file diff --git a/music/sfx/sfx_02_05.asm b/music/sfx/sfx_02_05.asm new file mode 100644 index 00000000..155877ff --- /dev/null +++ b/music/sfx/sfx_02_05.asm @@ -0,0 +1,21 @@ +SFX_02_05_Ch1: ; 830d (2:430d) + note D_, 8 + note G#, 5 + note D#, 8 + note D_, 7 + note G#, 5 + note D#, 7 + note D_, 6 + note G#, 4 + note D#, 6 + note D_, 5 + note G#, 4 + note D#, 5 + note D_, 4 + note G#, 3 + note D#, 4 + note D_, 3 + note G#, 2 + note D#, 3 + endchannel +; 0x8320 \ No newline at end of file diff --git a/music/sfx/sfx_02_06.asm b/music/sfx/sfx_02_06.asm new file mode 100644 index 00000000..fee6d5dc --- /dev/null +++ b/music/sfx/sfx_02_06.asm @@ -0,0 +1,6 @@ +SFX_02_06_Ch1: ; 8320 (2:4320) + note D_, 1 + note F_, 2 + note D_, 11 + endchannel +; 0x8324 \ No newline at end of file diff --git a/music/sfx/sfx_02_07.asm b/music/sfx/sfx_02_07.asm new file mode 100644 index 00000000..9e0bd50c --- /dev/null +++ b/music/sfx/sfx_02_07.asm @@ -0,0 +1,9 @@ +SFX_02_07_Ch1: ; 8324 (2:4324) + note D_, 2 + note E_, 2 + note D_, 12 + note D_, 1 + note F#, 2 + note D_, 11 + endchannel +; 0x832b \ No newline at end of file diff --git a/music/sfx/sfx_02_08.asm b/music/sfx/sfx_02_08.asm new file mode 100644 index 00000000..209b3d99 --- /dev/null +++ b/music/sfx/sfx_02_08.asm @@ -0,0 +1,6 @@ +SFX_02_08_Ch1: ; 832b (2:432b) + note D_, 1 + note G#, 2 + note C#, 1 + endchannel +; 0x832f \ No newline at end of file diff --git a/music/sfx/sfx_02_09.asm b/music/sfx/sfx_02_09.asm new file mode 100644 index 00000000..43e61cdf --- /dev/null +++ b/music/sfx/sfx_02_09.asm @@ -0,0 +1,6 @@ +SFX_02_09_Ch1: ; 832f (2:432f) + note D_, 1 + note G#, 3 + note D_, 4 + endchannel +; 0x8333 \ No newline at end of file diff --git a/music/sfx/sfx_02_0a.asm b/music/sfx/sfx_02_0a.asm new file mode 100644 index 00000000..473dd427 --- /dev/null +++ b/music/sfx/sfx_02_0a.asm @@ -0,0 +1,6 @@ +SFX_02_0a_Ch1: ; 8333 (2:4333) + note D_, 1 + note G#, 3 + note D_, 6 + endchannel +; 0x8337 \ No newline at end of file diff --git a/music/sfx/sfx_02_0b.asm b/music/sfx/sfx_02_0b.asm new file mode 100644 index 00000000..a79a0530 --- /dev/null +++ b/music/sfx/sfx_02_0b.asm @@ -0,0 +1,6 @@ +SFX_02_0b_Ch1: ; 8337 (2:4337) + note D_, 1 + note G#, 3 + note D_, 7 + endchannel +; 0x833b \ No newline at end of file diff --git a/music/sfx/sfx_02_0c.asm b/music/sfx/sfx_02_0c.asm new file mode 100644 index 00000000..5546584d --- /dev/null +++ b/music/sfx/sfx_02_0c.asm @@ -0,0 +1,6 @@ +SFX_02_0c_Ch1: ; 833b (2:433b) + note D_, 1 + note A#, 2 + note C#, 1 + endchannel +; 0x833f \ No newline at end of file diff --git a/music/sfx/sfx_02_0d.asm b/music/sfx/sfx_02_0d.asm new file mode 100644 index 00000000..9205e59b --- /dev/null +++ b/music/sfx/sfx_02_0d.asm @@ -0,0 +1,6 @@ +SFX_02_0d_Ch1: ; 833f (2:433f) + note D_, 1 + note A#, 3 + note C#, 2 + endchannel +; 0x8343 \ No newline at end of file diff --git a/music/sfx/sfx_02_0e.asm b/music/sfx/sfx_02_0e.asm new file mode 100644 index 00000000..89af0d6c --- /dev/null +++ b/music/sfx/sfx_02_0e.asm @@ -0,0 +1,6 @@ +SFX_02_0e_Ch1: ; 8343 (2:4343) + note D_, 1 + note A#, 3 + note F_, 1 + endchannel +; 0x8347 \ No newline at end of file diff --git a/music/sfx/sfx_02_0f.asm b/music/sfx/sfx_02_0f.asm new file mode 100644 index 00000000..82b2f294 --- /dev/null +++ b/music/sfx/sfx_02_0f.asm @@ -0,0 +1,9 @@ +SFX_02_0f_Ch1: ; 8347 (2:4347) + note D_, 1 + note A#, 2 + note C#, 9 + note D_, 1 + note D#, 2 + note D#, 4 + endchannel +; 0x834e \ No newline at end of file diff --git a/music/sfx/sfx_02_10.asm b/music/sfx/sfx_02_10.asm new file mode 100644 index 00000000..cfed7de3 --- /dev/null +++ b/music/sfx/sfx_02_10.asm @@ -0,0 +1,9 @@ +SFX_02_10_Ch1: ; 834e (2:434e) + note D_, 3 + note A_, 2 + note D_, 9 + note D_, 1 + note G_, 2 + note C#, 9 + endchannel +; 0x8355 \ No newline at end of file diff --git a/music/sfx/sfx_02_11.asm b/music/sfx/sfx_02_11.asm new file mode 100644 index 00000000..d55a5f56 --- /dev/null +++ b/music/sfx/sfx_02_11.asm @@ -0,0 +1,6 @@ +SFX_02_11_Ch1: ; 8355 (2:4355) + note D_, 1 + note A_, 2 + note D_, 3 + endchannel +; 0x8359 \ No newline at end of file diff --git a/music/sfx/sfx_02_12.asm b/music/sfx/sfx_02_12.asm new file mode 100644 index 00000000..4b93a742 --- /dev/null +++ b/music/sfx/sfx_02_12.asm @@ -0,0 +1,6 @@ +SFX_02_12_Ch1: ; 8359 (2:4359) + note D_, 1 + note G_, 2 + note D_, 3 + endchannel +; 0x835d \ No newline at end of file diff --git a/music/sfx/sfx_02_13.asm b/music/sfx/sfx_02_13.asm new file mode 100644 index 00000000..38ee5d96 --- /dev/null +++ b/music/sfx/sfx_02_13.asm @@ -0,0 +1,6 @@ +SFX_02_13_Ch1: ; 835d (2:435d) + note D_, 1 + note F#, 2 + note D_, 3 + endchannel +; 0x8361 \ No newline at end of file diff --git a/music/sfx/sfx_02_14.asm b/music/sfx/sfx_02_14.asm new file mode 100644 index 00000000..9942507a --- /dev/null +++ b/music/sfx/sfx_02_14.asm @@ -0,0 +1,46 @@ +SFX_02_14_Ch1: ; 8987 (2:4987) + dutycycle 245 + note D_, 5 + unknownmusic0xf3 + note C#, 9 + note C_, 8 + note D_, 16 + octave 3 + note A_, 9 + note C_, 8 + note D_, 9 + note A_, 2 + note F_, 9 + note C_, 8 + endchannel + + +SFX_02_14_Ch2: ; 8996 (2:4996) + dutycycle 160 + note D_, 6 + note B_, 4 + note C_, 9 + note C_, 8 + note D_, 16 + rest 6 + note G#, 9 + note C_, 8 + note D_, 9 + note G_, 2 + note E_, 9 + note C_, 8 + endchannel + + +SFX_02_14_Ch3: ; 89a5 (2:49a5) + note D_, 4 + note A#, 2 + note C#, 13 + note D_, 15 + note A_, 5 + note D_, 13 + note D_, 9 + note G#, 2 + note C#, 13 + endchannel +; 0x89af \ No newline at end of file diff --git a/music/sfx/sfx_02_15.asm b/music/sfx/sfx_02_15.asm new file mode 100644 index 00000000..13293cee --- /dev/null +++ b/music/sfx/sfx_02_15.asm @@ -0,0 +1,55 @@ +SFX_02_15_Ch1: ; 8b97 (2:4b97) + dutycycle 160 + note D_, 5 + unknownmusic0xf3 + note C_, 1 + note C_, 7 + note D_, 9 + notetype 5, 6, 0 + note C_, 8 + note D_, 4 + octave 6 + note D_, 1 + note C_, 8 + note D_, 9 + notetype 1, 1, 0 + note C_, 8 + endchannel + + +SFX_02_15_Ch2: ; 8baa (2:4baa) + dutycycle 90 + note D_, 6 + note B_, 4 + unknownmusic0xf1 + note C_, 7 + note D_, 8 + rest 6 + note F_, 3 + note C_, 8 + note D_, 4 + note A#, 3 + note C#, 2 + note C_, 8 + note D_, 9 + note B_, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_02_15_Ch3: ; 8bbd (2:4bbd) + note D_, 4 + note A#, 3 + note D#, 13 + note D_, 13 + note A_, 5 + note D_, 13 + note D_, 4 + note G#, 3 + note C#, 13 + note D_, 9 + note G_, 2 + note D_, 13 + endchannel +; 0x8bca \ No newline at end of file diff --git a/music/sfx/sfx_02_16.asm b/music/sfx/sfx_02_16.asm new file mode 100644 index 00000000..286d4b6b --- /dev/null +++ b/music/sfx/sfx_02_16.asm @@ -0,0 +1,35 @@ +SFX_02_16_Ch1: ; 8b0c (2:4b0c) + duty 0 + note D_, 9 + unknownmusic0xf5 + note G#, 1 + note C_, 5 + note D_, 3 + octave 7 + octave 8 + note C_, 6 + note D_, 9 + notetype 1, 13, 12 + note C_, 6 + endchannel + + +SFX_02_16_Ch2: ; 8b1b (2:4b1b) + dutycycle 165 + note D_, 8 + note A_, 6 + note E_, 2 + note C_, 5 + note D_, 3 + note G#, 2 + note D_, 2 + note C_, 6 + note D_, 9 + note F#, 2 + note C#, 11 + note C_, 6 + + +SFX_02_16_Ch3: ; 8b29 (2:4b29) + endchannel +; 0x8b2a \ No newline at end of file diff --git a/music/sfx/sfx_02_17.asm b/music/sfx/sfx_02_17.asm new file mode 100644 index 00000000..5a4775ca --- /dev/null +++ b/music/sfx/sfx_02_17.asm @@ -0,0 +1,78 @@ +SFX_02_17_Ch1: ; 88a6 (2:48a6) + dutycycle 240 + note D_, 5 + unknownmusic0xf7 + note C_, 9 + note C_, 7 + note D_, 7 + octave 2 + note C_, 1 + note C_, 7 + note D_, 7 + notetype 7, 15, 0 + note C_, 6 + note D_, 7 + rest 5 + octave 8 + note C_, 6 + note D_, 6 + notetype 3, 12, 0 + note C_, 6 + note D_, 5 + notetype 3, 10, 0 + note C_, 6 + note D_, 9 + octave 7 + note G#, 1 + note C_, 6 + endchannel + + +SFX_02_17_Ch2: ; 88c5 (2:48c5) + dutycycle 10 + note D_, 5 + rest 8 + note C_, 5 + note C_, 6 + note D_, 7 + note A#, 7 + note C_, 3 + note C_, 6 + note D_, 7 + note A_, 8 + unknownmusic0xf1 + note C_, 5 + note D_, 5 + note B_, 5 + octave 7 + note C_, 5 + note D_, 6 + note A#, 4 + rest 3 + note C_, 5 + note D_, 5 + note B_, 4 + note A#, 4 + note C_, 5 + note D_, 9 + rest 2 + note G#, 3 + note C_, 5 + endchannel + + +SFX_02_17_Ch3: ; 88e4 (2:48e4) + note D_, 13 + octave 4 + note E_, 13 + note D_, 11 + rest 8 + note F_, 13 + note D_, 13 + note B_, 7 + note E_, 13 + note D_, 16 + note A#, 3 + note F_, 13 + endchannel +; 0x88f1 \ No newline at end of file diff --git a/music/sfx/sfx_02_18.asm b/music/sfx/sfx_02_18.asm new file mode 100644 index 00000000..1ffb9833 --- /dev/null +++ b/music/sfx/sfx_02_18.asm @@ -0,0 +1,81 @@ +SFX_02_18_Ch1: ; 8c55 (2:4c55) + dutycycle 240 + note D_, 5 + unknownmusic0xf7 + note A#, 1 + note C_, 7 + note D_, 9 + octave 2 + note A#, 5 + note C_, 7 + note D_, 5 + notetype 6, 10, 0 + note C_, 7 + note D_, 13 + notetype 3, 2, 0 + note C_, 7 + note D_, 9 + rest 4 + note D_, 5 + note C_, 7 + note D_, 5 + rest 3 + note D_, 1 + note C_, 7 + note D_, 9 + note B_, 2 + note C#, 1 + note C_, 7 + endchannel + + +SFX_02_18_Ch2: ; 8c74 (2:4c74) + dutycycle 90 + note D_, 5 + octave 1 + note C_, 2 + note C_, 7 + note D_, 9 + notetype 6, 0, 3 + note C_, 7 + note D_, 5 + rest 7 + note C_, 2 + note C_, 7 + note D_, 13 + rest 4 + note G#, 2 + note C_, 6 + note D_, 9 + note B_, 4 + note G#, 4 + note C_, 6 + note D_, 5 + note B_, 3 + note G#, 3 + note C_, 6 + note D_, 9 + note A#, 2 + note G_, 2 + note C_, 6 + endchannel + + +SFX_02_18_Ch3: ; 8c93 (2:4c93) + note D_, 8 + notetype 6, 5, 12 + note D_, 9 + octave 2 + note E_, 13 + note D_, 5 + notetype 4, 5, 12 + note D_, 5 + notetype 4, 4, 12 + note D_, 8 + rest 4 + note E_, 13 + note D_, 9 + note A#, 2 + note F_, 13 + endchannel +; 0x8ca6 \ No newline at end of file diff --git a/music/sfx/sfx_02_19.asm b/music/sfx/sfx_02_19.asm new file mode 100644 index 00000000..c85abea4 --- /dev/null +++ b/music/sfx/sfx_02_19.asm @@ -0,0 +1,42 @@ +SFX_02_19_Ch1: ; 8a35 (2:4a35) + dutycycle 10 + note D_, 7 + octave 6 + note C_, 1 + note C_, 6 + note D_, 7 + octave 5 + note G#, 1 + note C_, 6 + note D_, 7 + notetype 3, 7, 0 + note C_, 6 + note D_, 9 + note A#, 2 + note F#, 1 + note C_, 6 + endchannel + + +SFX_02_19_Ch2: ; 8a48 (2:4a48) + dutycycle 245 + note D_, 7 + octave 6 + note G#, 3 + note C_, 5 + note D_, 7 + notetype 3, 0, 1 + note C_, 6 + note D_, 7 + note B_, 3 + octave 6 + note C_, 5 + note D_, 9 + note G#, 2 + rest 2 + note C_, 5 + + +SFX_02_19_Ch3: ; 8a5a (2:4a5a) + endchannel +; 0x8a5b \ No newline at end of file diff --git a/music/sfx/sfx_02_1a.asm b/music/sfx/sfx_02_1a.asm new file mode 100644 index 00000000..4649d2af --- /dev/null +++ b/music/sfx/sfx_02_1a.asm @@ -0,0 +1,51 @@ +SFX_02_1a_Ch1: ; 89df (2:49df) + dutycycle 250 + note D_, 7 + note G#, 4 + note E_, 8 + note C_, 3 + note D_, 16 + note F#, 3 + note D_, 7 + note C_, 3 + note D_, 5 + note F_, 3 + note E_, 6 + note C_, 3 + note D_, 10 + note F#, 4 + note C_, 7 + note C_, 3 + note D_, 16 + note G#, 3 + note D_, 6 + note C_, 3 + note D_, 16 + note E_, 3 + note C_, 8 + note C_, 3 + + +SFX_02_1a_Ch2: ; 89f9 (2:49f9) + endchannel + + +SFX_02_1a_Ch3: ; 89fa (2:49fa) + note D_, 9 + notetype 4, 8, 12 + note D_, 5 + octave 6 + note A_, 13 + note D_, 16 + rest 7 + note G#, 13 + note D_, 9 + octave 4 + note A#, 13 + note D_, 16 + notetype 7, 9, 12 + note D_, 16 + unknownmusic0xf2 + note A#, 13 + endchannel +; 0x8a0d \ No newline at end of file diff --git a/music/sfx/sfx_02_1b.asm b/music/sfx/sfx_02_1b.asm new file mode 100644 index 00000000..620b377f --- /dev/null +++ b/music/sfx/sfx_02_1b.asm @@ -0,0 +1,45 @@ +SFX_02_1b_Ch1: ; 8a0d (2:4a0d) + dutycycle 240 + note D_, 5 + unknownmusic0xf3 + octave 8 + note C_, 7 + note D_, 16 + octave 4 + note E_, 1 + note C_, 7 + note D_, 9 + rest 2 + note D_, 1 + note C_, 7 + endchannel + + +SFX_02_1b_Ch2: ; 8a1c (2:4a1c) + dutycycle 10 + note D_, 4 + rest 4 + note G#, 4 + note C_, 7 + note D_, 15 + note B_, 5 + note C_, 3 + note C_, 7 + note D_, 9 + note A#, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_02_1b_Ch3: ; 8a2b (2:4a2b) + note D_, 5 + notetype 3, 5, 12 + note D_, 16 + octave 2 + note E_, 13 + note D_, 9 + note B_, 2 + note F_, 13 + endchannel +; 0x8a35 \ No newline at end of file diff --git a/music/sfx/sfx_02_1c.asm b/music/sfx/sfx_02_1c.asm new file mode 100644 index 00000000..add71761 --- /dev/null +++ b/music/sfx/sfx_02_1c.asm @@ -0,0 +1,51 @@ +SFX_02_1c_Ch1: ; 8c25 (2:4c25) + dutycycle 240 + note D_, 16 + unknownmusic0xf6 + note F#, 6 + note C_, 6 + note D_, 11 + octave 4 + note G_, 13 + note C_, 6 + note D_, 4 + rest 3 + note F_, 13 + note C_, 6 + note D_, 16 + note B_, 3 + note D#, 13 + note C_, 6 + endchannel + + +SFX_02_1c_Ch2: ; 8c38 (2:4c38) + dutycycle 90 + note D_, 15 + notetype 6, 0, 3 + note C_, 6 + note D_, 10 + note B_, 5 + note C#, 12 + note C_, 6 + note D_, 5 + note A_, 3 + unknownmusic0xfa + note C_, 5 + note D_, 16 + note A#, 3 + notetype 11, 0, 4 + endchannel + + +SFX_02_1c_Ch3: ; 8c4b (2:4c4b) + note D_, 13 + octave 2 + note E_, 13 + note D_, 12 + notetype 7, 5, 12 + note D_, 16 + rest 3 + note E_, 13 + endchannel +; 0x8c55 \ No newline at end of file diff --git a/music/sfx/sfx_02_1d.asm b/music/sfx/sfx_02_1d.asm new file mode 100644 index 00000000..3673e0cf --- /dev/null +++ b/music/sfx/sfx_02_1d.asm @@ -0,0 +1,83 @@ +SFX_02_1d_Ch1: ; 872f (2:472f) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + note A#, 1 + note C_, 8 + note D_, 7 + octave 2 + note A#, 4 + note C_, 8 + note D_, 11 + unknownmusic0xf4 + note A#, 1 + note C_, 8 + dutycycle 165 + note D_, 11 + unknownmusic0xf6 + notetype 8, 0, 7 + note D_, 5 + octave 5 + notetype 7, 0, 7 + note D_, 16 + unknownmusic0xf2 + notetype 8, 0, 7 + endchannel + + +SFX_02_1d_Ch2: ; 874c (2:474c) + dutycycle 5 + note D_, 3 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 16 + note A#, 8 + note A#, 2 + note C_, 7 + note D_, 7 + note G#, 7 + note A#, 3 + note C_, 7 + note D_, 11 + note G_, 5 + note A#, 2 + note C_, 7 + dutycycle 95 + note D_, 11 + note G_, 7 + notetype 6, 0, 6 + note D_, 5 + note G#, 4 + notetype 9, 0, 6 + note D_, 16 + note A#, 3 + notetype 7, 0, 6 + endchannel + + +SFX_02_1d_Ch3: ; 876d (2:476d) + note D_, 3 + unknownmusic0xf2 + note D#, 13 + note D_, 9 + octave 4 + note D#, 15 + note D_, 16 + notetype 7, 3, 12 + note D_, 7 + rest 6 + note D#, 12 + note D_, 7 + octave 4 + note D#, 14 + note D_, 9 + note B_, 7 + note D#, 13 + note D_, 7 + notetype 4, 3, 13 + note D_, 9 + rest 2 + note D#, 12 + endchannel +; 0x8786 \ No newline at end of file diff --git a/music/sfx/sfx_02_1e.asm b/music/sfx/sfx_02_1e.asm new file mode 100644 index 00000000..0932b9bc --- /dev/null +++ b/music/sfx/sfx_02_1e.asm @@ -0,0 +1,94 @@ +SFX_02_1e_Ch1: ; 8bca (2:4bca) + dutycycle 240 + note D_, 9 + unknownmusic0xf7 + octave 8 + note C_, 7 + note D_, 7 + octave 2 + octave 3 + note C_, 7 + note D_, 4 + unknownmusic0xf4 + octave 8 + note C_, 7 + note D_, 4 + unknownmusic0xf6 + notetype 0, 0, 6 + note D_, 4 + octave 5 + rest 1 + note C_, 7 + note D_, 5 + unknownmusic0xf2 + note B_, 1 + note C_, 7 + note D_, 16 + note A#, 3 + rest 9 + note C_, 7 + endchannel + + +SFX_02_1e_Ch2: ; 8be9 (2:4be9) + dutycycle 5 + note D_, 4 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 9 + note A#, 8 + note A#, 2 + note C_, 7 + note D_, 7 + note G#, 7 + note A#, 4 + note C_, 7 + note D_, 4 + note G_, 5 + note A#, 2 + note C_, 7 + note D_, 4 + note G_, 7 + note A_, 2 + note C_, 7 + note D_, 4 + note G#, 4 + note G#, 3 + note C_, 7 + note D_, 5 + note A#, 3 + note G_, 2 + note C_, 7 + note D_, 16 + note G_, 3 + note G#, 10 + note C_, 7 + endchannel + + +SFX_02_1e_Ch3: ; 8c0c (2:4c0c) + note D_, 3 + unknownmusic0xf2 + note D#, 13 + note D_, 9 + octave 4 + note D#, 15 + note D_, 9 + notetype 7, 3, 12 + note D_, 6 + rest 6 + note D#, 12 + note D_, 4 + notetype 4, 2, 12 + note D_, 3 + note B_, 7 + note D#, 13 + note D_, 4 + note A#, 5 + note D_, 13 + note D_, 9 + note A_, 2 + note D#, 13 + endchannel +; 0x8c25 \ No newline at end of file diff --git a/music/sfx/sfx_02_1f.asm b/music/sfx/sfx_02_1f.asm new file mode 100644 index 00000000..715a0971 --- /dev/null +++ b/music/sfx/sfx_02_1f.asm @@ -0,0 +1,98 @@ +SFX_02_1f_Ch1: ; 8a5b (2:4a5b) + dutycycle 204 + note D_, 5 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 5 + octave 7 + note G#, 1 + note C_, 8 + note D_, 5 + notetype 1, 4, 0 + note C_, 8 + note D_, 5 + octave 7 + note E_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + note D_, 5 + notetype 1, 0, 0 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 5 + notetype 1, 8, 2 + note C_, 8 + note D_, 5 + rest 2 + note E_, 3 + note C_, 8 + note D_, 9 + note B_, 2 + note E_, 2 + note C_, 8 + endchannel + + +SFX_02_1f_Ch2: ; 8a86 (2:4a86) + dutycycle 68 + note D_, 13 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 5 + octave 7 + note G#, 3 + note C_, 8 + note D_, 5 + notetype 1, 4, 1 + note C_, 8 + note D_, 5 + octave 7 + note E_, 2 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note G#, 3 + note C_, 8 + note D_, 9 + notetype 1, 0, 1 + note C_, 8 + endchannel + + +SFX_02_1f_Ch3: ; 8aa5 (2:4aa5) + note D_, 16 + note C_, 9 + note C_, 1 + note D_, 5 + note C_, 9 + note C_, 1 + note D_, 5 + notetype 1, 4, 12 + note D_, 5 + note B_, 2 + note D_, 13 + note D_, 5 + notetype 1, 3, 12 + note D_, 5 + note B_, 2 + note D#, 13 + note D_, 5 + rest 2 + note D_, 13 + note D_, 9 + note A#, 2 + note E_, 13 + endchannel +; 0x8abe \ No newline at end of file diff --git a/music/sfx/sfx_02_20.asm b/music/sfx/sfx_02_20.asm new file mode 100644 index 00000000..c242647e --- /dev/null +++ b/music/sfx/sfx_02_20.asm @@ -0,0 +1,80 @@ +SFX_02_20_Ch1: ; 8abe (2:4abe) + dutycycle 204 + note D_, 9 + unknownmusic0xf5 + note C_, 1 + note C_, 7 + note D_, 3 + notetype 2, 3, 8 + note C_, 7 + note D_, 3 + rest 3 + note D#, 1 + note C_, 7 + note D_, 3 + rest 3 + note D_, 9 + note C_, 7 + note D_, 3 + note B_, 3 + note D_, 1 + note C_, 7 + note D_, 3 + note B_, 3 + note C#, 1 + note C_, 7 + note D_, 3 + note A#, 3 + note C#, 9 + note C_, 7 + note D_, 3 + note B_, 3 + note C#, 1 + note C_, 7 + note D_, 9 + rest 2 + note D_, 1 + note C_, 7 + endchannel + + +SFX_02_20_Ch2: ; 8ae5 (2:4ae5) + dutycycle 68 + note D_, 13 + rest 4 + rest 1 + note C_, 6 + note D_, 4 + note B_, 2 + unknownmusic0xf9 + note C_, 6 + note D_, 3 + note A#, 2 + unknownmusic0xf1 + note C_, 6 + note D_, 3 + note A#, 2 + unknownmusic0xe9 + note C_, 6 + note D_, 3 + note A_, 2 + octave 7 + note C_, 6 + note D_, 3 + note A_, 2 + notetype 9, 0, 5 + note D_, 3 + note G#, 2 + notetype 1, 0, 5 + note D_, 3 + note A_, 2 + notetype 9, 0, 5 + note D_, 9 + note A_, 2 + octave 7 + note C_, 6 + + +SFX_02_20_Ch3: ; 8b0b (2:4b0b) + endchannel +; 0x8b0c \ No newline at end of file diff --git a/music/sfx/sfx_02_21.asm b/music/sfx/sfx_02_21.asm new file mode 100644 index 00000000..268204a8 --- /dev/null +++ b/music/sfx/sfx_02_21.asm @@ -0,0 +1,106 @@ +SFX_02_21_Ch1: ; 8b2a (2:4b2a) + dutycycle 136 + note D_, 6 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note D_, 10 + notetype 1, 6, 0 + note C_, 7 + note D_, 6 + octave 6 + note C#, 3 + note C_, 7 + note D_, 10 + rest 2 + note D_, 3 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 1 + note C_, 7 + note D_, 7 + notetype 1, 2, 0 + note C_, 7 + loopchannel 2, SFX_02_21_Ch1 + endchannel + + +SFX_02_21_Ch2: ; 8b49 (2:4b49) + dutycycle 64 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 6 + unknownmusic0xf2 + note F_, 2 + note C_, 7 + note D_, 10 + notetype 1, 6, 1 + note C_, 7 + note D_, 6 + octave 6 + note C#, 5 + note C_, 7 + note D_, 9 + rest 2 + note D_, 5 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 2 + note C_, 7 + note D_, 13 + notetype 1, 2, 1 + note C_, 7 + note D_, 6 + octave 6 + note C#, 5 + note C_, 7 + note D_, 9 + rest 2 + note D_, 5 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 2 + note C_, 7 + note D_, 5 + notetype 1, 2, 1 + note C_, 7 + endchannel + + +SFX_02_21_Ch3: ; 8b78 (2:4b78) + note D_, 7 + notetype 2, 1, 12 + note D_, 10 + note B_, 2 + note D_, 13 + note D_, 9 + rest 3 + note D_, 13 + note D_, 10 + note B_, 2 + note D#, 13 + note D_, 7 + rest 3 + note D_, 13 + note D_, 10 + note A#, 3 + note D#, 13 + note D_, 8 + rest 3 + note D_, 13 + note D_, 6 + note A#, 2 + note D#, 13 + note D_, 10 + rest 3 + note D_, 13 + note D_, 5 + note A#, 2 + note D#, 13 + endchannel +; 0x8b97 \ No newline at end of file diff --git a/music/sfx/sfx_02_22.asm b/music/sfx/sfx_02_22.asm new file mode 100644 index 00000000..502c7f2a --- /dev/null +++ b/music/sfx/sfx_02_22.asm @@ -0,0 +1,54 @@ +SFX_02_22_Ch1: ; 89af (2:49af) + dutycycle 165 + note D_, 5 + octave 7 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf2 + note G#, 1 + note C_, 8 + note D_, 3 + note A_, 3 + note E_, 1 + note C_, 8 + note D_, 9 + octave 7 + note C_, 1 + note C_, 7 + endchannel + + +SFX_02_22_Ch2: ; 89c2 (2:49c2) + dutycycle 10 + note D_, 5 + note B_, 2 + octave 7 + note C_, 7 + note D_, 4 + rest 3 + octave 7 + note C_, 7 + note D_, 4 + note F#, 3 + note G#, 2 + note C_, 7 + note D_, 9 + note B_, 2 + octave 7 + note C_, 6 + endchannel + + +SFX_02_22_Ch3: ; 89d5 (2:49d5) + note D_, 3 + note F#, 2 + note D#, 3 + note D_, 3 + note F#, 2 + note D_, 2 + note D_, 9 + note F#, 2 + note C#, 2 + endchannel +; 0x89df \ No newline at end of file diff --git a/music/sfx/sfx_02_23.asm b/music/sfx/sfx_02_23.asm new file mode 100644 index 00000000..4660b743 --- /dev/null +++ b/music/sfx/sfx_02_23.asm @@ -0,0 +1,75 @@ +SFX_02_23_Ch1: ; 88f1 (2:48f1) + dutycycle 241 + note D_, 5 + unknownmusic0xf7 + rest 1 + note C_, 8 + note D_, 13 + octave 2 + rest 3 + note C_, 8 + note D_, 7 + note B_, 6 + note G#, 1 + note C_, 7 + note D_, 5 + rest 5 + note G_, 1 + note C_, 7 + note D_, 5 + note B_, 6 + note F#, 1 + note C_, 7 + note D_, 9 + rest 2 + note E_, 1 + note C_, 7 + endchannel + + +SFX_02_23_Ch2: ; 890c (2:490c) + dutycycle 204 + note D_, 4 + rest 8 + note G#, 2 + note C_, 8 + note D_, 13 + note B_, 7 + note G#, 1 + note C_, 8 + note D_, 7 + note A#, 6 + note E_, 2 + note C_, 7 + note D_, 5 + rest 5 + note D#, 3 + note C_, 7 + note D_, 7 + note B_, 6 + note D_, 2 + note C_, 7 + note D_, 9 + note A#, 2 + note C_, 3 + note C_, 7 + endchannel + + +SFX_02_23_Ch3: ; 8927 (2:4927) + note D_, 4 + octave 4 + note D#, 13 + note D_, 13 + notetype 6, 2, 12 + note D_, 5 + octave 4 + note D#, 13 + note D_, 9 + note B_, 8 + note F_, 13 + note D_, 16 + rest 3 + note F_, 14 + endchannel +; 0x8937 \ No newline at end of file diff --git a/music/sfx/sfx_02_24.asm b/music/sfx/sfx_02_24.asm new file mode 100644 index 00000000..d35f1fc2 --- /dev/null +++ b/music/sfx/sfx_02_24.asm @@ -0,0 +1,83 @@ +SFX_02_24_Ch1: ; 8937 (2:4937) + dutycycle 201 + note D_, 9 + unknownmusic0xf7 + note G#, 1 + note C_, 7 + note D_, 3 + unknownmusic0xf7 + note F#, 1 + note C_, 7 + note D_, 2 + octave 1 + note E_, 1 + note C_, 7 + note D_, 2 + octave 1 + note D_, 1 + note C_, 7 + note D_, 16 + notetype 1, 0, 0 + note C_, 7 + note D_, 5 + rest 8 + note E_, 1 + note C_, 8 + note D_, 5 + note A#, 8 + note D#, 1 + note C_, 8 + note D_, 16 + note A_, 2 + note D_, 1 + note C_, 8 + endchannel + + +SFX_02_24_Ch2: ; 895a (2:495a) + dutycycle 121 + note D_, 11 + octave 1 + note G#, 3 + note C_, 7 + note D_, 3 + octave 1 + note F#, 3 + note C_, 7 + note D_, 2 + notetype 7, 4, 2 + note C_, 7 + note D_, 2 + notetype 7, 2, 2 + note C_, 7 + note D_, 16 + rest 2 + note C_, 3 + note C_, 7 + note D_, 5 + note B_, 8 + note E_, 3 + note C_, 8 + note D_, 3 + note A_, 8 + note D#, 3 + note C_, 8 + note D_, 16 + note G#, 2 + note D_, 3 + note C_, 8 + endchannel + + +SFX_02_24_Ch3: ; 897d (2:497d) + note D_, 5 + note G_, 5 + note D_, 2 + note D_, 5 + note G_, 5 + note C#, 1 + note D_, 5 + note G_, 2 + note D_, 1 + endchannel +; 0x8987 \ No newline at end of file diff --git a/music/sfx/sfx_02_25.asm b/music/sfx/sfx_02_25.asm new file mode 100644 index 00000000..83e8e020 --- /dev/null +++ b/music/sfx/sfx_02_25.asm @@ -0,0 +1,87 @@ +SFX_02_25_Ch1: ; 8813 (2:4813) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + note A#, 1 + note C_, 8 + note D_, 9 + octave 2 + note A#, 5 + note C_, 8 + note D_, 5 + notetype 6, 10, 0 + note C_, 8 + note D_, 16 + notetype 3, 2, 0 + note C_, 8 + note D_, 9 + rest 4 + note D_, 4 + note C_, 8 + note D_, 3 + rest 3 + note D_, 9 + note C_, 8 + note D_, 9 + note B_, 2 + note D#, 1 + note C_, 8 + endchannel + + +SFX_02_25_Ch2: ; 8832 (2:4832) + dutycycle 10 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 7 + note A#, 8 + note E_, 2 + note C_, 8 + note D_, 9 + note G#, 7 + note E_, 4 + note C_, 8 + note D_, 5 + note G_, 7 + note E_, 2 + note C_, 8 + note D_, 14 + note G#, 4 + rest 3 + note C_, 7 + note D_, 8 + note G_, 4 + rest 2 + note C_, 7 + note D_, 4 + note G#, 3 + rest 13 + note C_, 7 + note D_, 9 + note G_, 2 + notetype 8, 0, 6 + endchannel + + +SFX_02_25_Ch3: ; 8855 (2:4855) + note D_, 3 + unknownmusic0xf2 + note E_, 13 + note D_, 7 + octave 2 + note D#, 11 + note D_, 5 + notetype 7, 3, 10 + note D_, 7 + notetype 6, 2, 12 + note D_, 9 + octave 3 + note D#, 13 + note D_, 13 + notetype 2, 3, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x886b \ No newline at end of file diff --git a/music/sfx/sfx_02_26.asm b/music/sfx/sfx_02_26.asm new file mode 100644 index 00000000..134a9701 --- /dev/null +++ b/music/sfx/sfx_02_26.asm @@ -0,0 +1,52 @@ +SFX_02_26_Ch1: ; 8d2b (2:4d2b) + dutycycle 165 + note D_, 13 + unknownmusic0xf2 + note E_, 1 + note C_, 5 + note D_, 16 + octave 5 + note A#, 1 + note C_, 5 + note D_, 5 + notetype 2, 9, 0 + note C_, 5 + note D_, 9 + notetype 1, 8, 0 + note C_, 5 + endchannel + + +SFX_02_26_Ch2: ; 8d3e (2:4d3e) + dutycycle 238 + note D_, 12 + notetype 2, 3, 8 + note C_, 5 + note D_, 15 + rest 7 + note A_, 9 + note C_, 5 + note D_, 4 + note B_, 3 + note G#, 9 + note C_, 5 + note D_, 9 + note B_, 2 + note G_, 9 + note C_, 5 + endchannel + + +SFX_02_26_Ch3: ; 8d51 (2:4d51) + note D_, 11 + octave 2 + note F#, 13 + note D_, 16 + notetype 2, 5, 12 + note D_, 4 + rest 3 + note F#, 13 + note D_, 9 + notetype 1, 5, 12 + endchannel +; 0x8d5e \ No newline at end of file diff --git a/music/sfx/sfx_02_27.asm b/music/sfx/sfx_02_27.asm new file mode 100644 index 00000000..01a33228 --- /dev/null +++ b/music/sfx/sfx_02_27.asm @@ -0,0 +1,74 @@ +SFX_02_27_Ch1: ; 8d5e (2:4d5e) + dutycycle 51 + note D_, 16 + unknownmusic0xf6 + rest 1 + note C_, 6 + note D_, 9 + octave 5 + note B_, 13 + note C_, 6 + note D_, 7 + notetype 2, 13, 0 + note C_, 6 + note D_, 7 + note B_, 3 + octave 8 + note C_, 6 + note D_, 7 + rest 3 + stereopanning 5 + note D_, 9 + note B_, 2 + note C_, 1 + note C_, 7 + endchannel + + +SFX_02_27_Ch2: ; 8d79 (2:4d79) + dutycycle 153 + note D_, 15 + rest 7 + note B_, 2 + note C_, 5 + note D_, 8 + rest 4 + note A#, 14 + note C_, 5 + note D_, 6 + note B_, 3 + rest 2 + note C_, 5 + note D_, 9 + note A_, 3 + notetype 1, 0, 4 + note D_, 7 + note A#, 3 + octave 7 + note C_, 5 + note D_, 9 + note A_, 2 + unknownmusic0xf1 + note C_, 5 + endchannel + + +SFX_02_27_Ch3: ; 8d94 (2:4d94) + note D_, 11 + octave 2 + note F_, 13 + note D_, 11 + notetype 6, 6, 12 + note D_, 5 + rest 3 + note E_, 13 + note D_, 7 + notetype 3, 5, 12 + note D_, 9 + note B_, 4 + note E_, 13 + note D_, 9 + note A#, 2 + note F_, 13 + endchannel +; 0x8da7 \ No newline at end of file diff --git a/music/sfx/sfx_02_28.asm b/music/sfx/sfx_02_28.asm new file mode 100644 index 00000000..b8d25f6c --- /dev/null +++ b/music/sfx/sfx_02_28.asm @@ -0,0 +1,44 @@ +SFX_02_28_Ch1: ; 8da7 (2:4da7) + dutycycle 240 + note D_, 9 + octave 4 + note A_, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf5 + rest 1 + note C_, 8 + note D_, 9 + notetype 1, 13, 8 + note C_, 8 + endchannel + + +SFX_02_28_Ch2: ; 8db6 (2:4db6) + dutycycle 165 + note D_, 11 + rest 5 + note G_, 2 + note C_, 8 + note D_, 16 + note B_, 7 + note A#, 3 + note C_, 8 + note D_, 9 + note A#, 2 + note B_, 8 + note C_, 8 + endchannel + + +SFX_02_28_Ch3: ; 8dc5 (2:4dc5) + note D_, 9 + octave 4 + note E_, 13 + note D_, 15 + rest 5 + note D#, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x8dcf \ No newline at end of file diff --git a/music/sfx/sfx_02_29.asm b/music/sfx/sfx_02_29.asm new file mode 100644 index 00000000..1f857265 --- /dev/null +++ b/music/sfx/sfx_02_29.asm @@ -0,0 +1,76 @@ +SFX_02_29_Ch1: ; 8e35 (2:4e35) + dutycycle 240 + note D_, 5 + unknownmusic0xf3 + note G#, 1 + note C_, 8 + note D_, 16 + octave 1 + note C_, 1 + note C_, 8 + note D_, 9 + notetype 3, 1, 0 + note C_, 8 + note D_, 5 + rest 3 + note C_, 1 + note C_, 8 + note D_, 5 + notetype 2, 15, 0 + note C_, 7 + note D_, 9 + rest 2 + octave 8 + note C_, 7 + endchannel + + +SFX_02_29_Ch2: ; 8e50 (2:4e50) + dutycycle 90 + note D_, 7 + rest 4 + note C_, 2 + note C_, 8 + note D_, 15 + note B_, 8 + note G#, 2 + note C_, 7 + note D_, 8 + note B_, 4 + note A_, 3 + note C_, 7 + note D_, 4 + note A#, 3 + note G#, 2 + note C_, 7 + note D_, 5 + note B_, 3 + note G_, 3 + note C_, 7 + note D_, 9 + note A#, 2 + note F#, 2 + note C_, 7 + endchannel + + +SFX_02_29_Ch3: ; 8e6b (2:4e6b) + note D_, 7 + octave 5 + note F_, 13 + note D_, 15 + notetype 6, 4, 12 + note D_, 7 + rest 7 + note D#, 13 + note D_, 4 + note B_, 4 + note E_, 13 + note D_, 4 + note A#, 3 + note F_, 13 + note D_, 9 + note B_, 2 + note F#, 13 + endchannel +; 0x8e7e \ No newline at end of file diff --git a/music/sfx/sfx_02_2a.asm b/music/sfx/sfx_02_2a.asm new file mode 100644 index 00000000..ff623a70 --- /dev/null +++ b/music/sfx/sfx_02_2a.asm @@ -0,0 +1,44 @@ +SFX_02_2a_Ch1: ; 8cc8 (2:4cc8) + dutycycle 240 + note D_, 16 + notetype 7, 8, 0 + note C_, 8 + note D_, 5 + octave 2 + note A#, 1 + note C_, 8 + note D_, 16 + notetype 2, 4, 0 + note C_, 8 + endchannel + + +SFX_02_2a_Ch2: ; 8cd7 (2:4cd7) + dutycycle 90 + note D_, 16 + rest 8 + note F_, 4 + note C_, 8 + note D_, 6 + note B_, 7 + note G_, 3 + note C_, 8 + note D_, 16 + rest 3 + note C#, 2 + note C_, 8 + endchannel + + +SFX_02_2a_Ch3: ; 8ce6 (2:4ce6) + note D_, 14 + unknownmusic0xf6 + note E_, 13 + note D_, 5 + octave 2 + note D#, 13 + note D_, 16 + unknownmusic0xf2 + note E_, 13 + endchannel +; 0x8cf0 \ No newline at end of file diff --git a/music/sfx/sfx_02_2b.asm b/music/sfx/sfx_02_2b.asm new file mode 100644 index 00000000..bfc6e9ca --- /dev/null +++ b/music/sfx/sfx_02_2b.asm @@ -0,0 +1,56 @@ +SFX_02_2b_Ch1: ; 8e7e (2:4e7e) + dutycycle 15 + note D_, 16 + unknownmusic0xf7 + note C_, 1 + note C_, 6 + note D_, 16 + octave 1 + note C_, 9 + note C_, 6 + note D_, 9 + note B_, 5 + note G#, 1 + note C_, 5 + note D_, 16 + note A#, 3 + note F#, 1 + note C_, 5 + endchannel + + +SFX_02_2b_Ch2: ; 8e91 (2:4e91) + dutycycle 68 + note D_, 15 + notetype 7, 8, 1 + note C_, 5 + note D_, 15 + rest 8 + note G#, 10 + note C_, 5 + note D_, 11 + note B_, 5 + note C_, 2 + note C_, 5 + note D_, 16 + rest 3 + octave 7 + note C_, 4 + endchannel + + +SFX_02_2b_Ch3: ; 8ea4 (2:4ea4) + note D_, 15 + unknownmusic0xf7 + note G_, 13 + note D_, 13 + unknownmusic0xf6 + note F#, 13 + note D_, 10 + octave 4 + note G_, 13 + note D_, 16 + octave 6 + note F#, 13 + endchannel +; 0x8eb1 \ No newline at end of file diff --git a/music/sfx/sfx_02_2c.asm b/music/sfx/sfx_02_2c.asm new file mode 100644 index 00000000..b61163f9 --- /dev/null +++ b/music/sfx/sfx_02_2c.asm @@ -0,0 +1,90 @@ +SFX_02_2c_Ch1: ; 8f8e (2:4f8e) + dutycycle 80 + note D_, 11 + unknownmusic0xf5 + note G#, 1 + note C_, 7 + note D_, 4 + octave 6 + note A#, 1 + note C_, 7 + note D_, 4 + unknownmusic0xf2 + rest 1 + note C_, 7 + note D_, 4 + octave 6 + octave 8 + note C_, 7 + note D_, 4 + notetype 2, 0, 0 + note C_, 8 + note D_, 4 + rest 3 + octave 8 + note C_, 7 + note D_, 4 + notetype 2, 12, 0 + note C_, 7 + note D_, 9 + rest 2 + note A#, 1 + note C_, 7 + endchannel + + +SFX_02_2c_Ch2: ; 8fb1 (2:4fb1) + dutycycle 15 + note D_, 10 + notetype 5, 3, 1 + note C_, 7 + note D_, 4 + notetype 2, 5, 2 + note C_, 7 + note D_, 4 + octave 6 + note G_, 2 + note C_, 7 + note D_, 4 + note B_, 3 + note A_, 2 + note C_, 7 + note D_, 4 + rest 3 + note B_, 3 + note C_, 7 + note D_, 4 + note B_, 3 + note A_, 2 + note C_, 7 + note D_, 4 + rest 3 + note G_, 2 + note C_, 7 + note D_, 9 + note B_, 2 + note F_, 2 + note C_, 7 + endchannel + + +SFX_02_2c_Ch3: ; 8fd4 (2:4fd4) + note D_, 7 + octave 5 + note E_, 13 + note D_, 5 + rest 4 + note D#, 13 + note D_, 6 + notetype 4, 3, 12 + note D_, 5 + rest 5 + note D_, 13 + note D_, 7 + note B_, 5 + note D#, 13 + note D_, 9 + rest 2 + note D_, 13 + endchannel +; 0x8fe7 \ No newline at end of file diff --git a/music/sfx/sfx_02_2d.asm b/music/sfx/sfx_02_2d.asm new file mode 100644 index 00000000..574b6ad2 --- /dev/null +++ b/music/sfx/sfx_02_2d.asm @@ -0,0 +1,38 @@ +SFX_02_2d_Ch1: ; 8ca6 (2:4ca6) + dutycycle 27 + note D_, 8 + notetype 2, 4, 0 + note C_, 8 + note D_, 16 + octave 3 + note F#, 1 + note C_, 8 + note D_, 16 + rest 2 + note D#, 1 + note C_, 8 + endchannel + + +SFX_02_2d_Ch2: ; 8cb5 (2:4cb5) + dutycycle 129 + note D_, 3 + rest 3 + note C_, 2 + note C_, 8 + note D_, 5 + rest 3 + note C_, 9 + note C_, 8 + note D_, 16 + notetype 7, 4, 1 + note C_, 8 + note D_, 16 + note A#, 3 + note C_, 2 + note C_, 8 + + +SFX_02_2d_Ch3: ; 8cc7 (2:4cc7) + endchannel +; 0x8cc8 \ No newline at end of file diff --git a/music/sfx/sfx_02_2e.asm b/music/sfx/sfx_02_2e.asm new file mode 100644 index 00000000..90a2a145 --- /dev/null +++ b/music/sfx/sfx_02_2e.asm @@ -0,0 +1,74 @@ +SFX_02_2e_Ch1: ; 8eff (2:4eff) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + note E_, 1 + note C_, 8 + note D_, 13 + octave 2 + note E_, 5 + note C_, 8 + note D_, 7 + notetype 5, 5, 0 + note C_, 8 + note D_, 5 + rest 4 + note F#, 1 + note C_, 8 + note D_, 4 + rest 4 + note G#, 1 + note C_, 8 + note D_, 9 + notetype 1, 10, 0 + note C_, 8 + endchannel + + +SFX_02_2e_Ch2: ; 8f1a (2:4f1a) + dutycycle 10 + note D_, 7 + rest 8 + note C_, 2 + note C_, 8 + note D_, 12 + note B_, 7 + note C_, 3 + note C_, 8 + note D_, 7 + note A#, 6 + note C#, 2 + note C_, 8 + note D_, 5 + note A_, 4 + note D_, 2 + note C_, 8 + note D_, 4 + note A#, 4 + note E_, 2 + note C_, 8 + note D_, 9 + note A_, 2 + note F#, 3 + note C_, 8 + endchannel + + +SFX_02_2e_Ch3: ; 8f35 (2:4f35) + note D_, 4 + octave 6 + note D#, 13 + note D_, 9 + notetype 6, 4, 12 + note D_, 6 + notetype 4, 3, 12 + note D_, 13 + rest 8 + note E_, 13 + note D_, 3 + octave 6 + note D#, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x8f48 \ No newline at end of file diff --git a/music/sfx/sfx_02_2f.asm b/music/sfx/sfx_02_2f.asm new file mode 100644 index 00000000..918ab86f --- /dev/null +++ b/music/sfx/sfx_02_2f.asm @@ -0,0 +1,61 @@ +SFX_02_2f_Ch1: ; 8cf0 (2:4cf0) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + rest 1 + note C_, 7 + note D_, 16 + octave 1 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf4 + stereopanning 6 + note D_, 5 + octave 4 + octave 8 + note C_, 7 + note D_, 9 + notetype 1, 13, 0 + note C_, 7 + endchannel + + +SFX_02_2f_Ch2: ; 8d07 (2:4d07) + dutycycle 10 + note D_, 8 + octave 2 + note G#, 2 + note C_, 7 + note D_, 15 + notetype 5, 12, 1 + note C_, 7 + note D_, 5 + rest 5 + note B_, 2 + note C_, 7 + note D_, 5 + notetype 4, 10, 1 + note C_, 7 + note D_, 9 + rest 2 + note A_, 2 + note C_, 7 + endchannel + + +SFX_02_2f_Ch3: ; 8d1e (2:4d1e) + note D_, 11 + note A#, 7 + note D#, 13 + note D_, 15 + note A_, 5 + note D_, 13 + note D_, 6 + note A#, 4 + note D#, 13 + note D_, 9 + note A_, 2 + note D_, 13 + endchannel +; 0x8d2b \ No newline at end of file diff --git a/music/sfx/sfx_02_30.asm b/music/sfx/sfx_02_30.asm new file mode 100644 index 00000000..80a392a8 --- /dev/null +++ b/music/sfx/sfx_02_30.asm @@ -0,0 +1,80 @@ +SFX_02_30_Ch1: ; 8eb1 (2:4eb1) + dutycycle 245 + note D_, 8 + notetype 6, 14, 1 + note C_, 8 + note D_, 7 + rest 7 + octave 6 + note C_, 8 + note D_, 10 + notetype 6, 14, 1 + note C_, 8 + note D_, 8 + rest 7 + octave 8 + note C_, 8 + note D_, 6 + note B_, 7 + octave 6 + note C_, 8 + note D_, 8 + rest 7 + octave 7 + note C_, 8 + note D_, 7 + note B_, 7 + octave 8 + note C_, 8 + note D_, 9 + note A#, 2 + notetype 15, 0, 7 + endchannel + + +SFX_02_30_Ch2: ; 8ed4 (2:4ed4) + dutycycle 68 + note D_, 7 + rest 4 + rest 10 + note C_, 8 + note D_, 7 + note B_, 4 + rest 8 + note C_, 8 + note D_, 11 + rest 5 + rest 4 + note C_, 8 + note D_, 9 + note B_, 5 + rest 8 + note C_, 8 + note D_, 7 + rest 4 + rest 10 + note C_, 8 + note D_, 16 + note A#, 3 + rest 6 + note C_, 8 + endchannel + + +SFX_02_30_Ch3: ; 8eef (2:4eef) + note D_, 14 + note C#, 10 + note G_, 13 + note D_, 14 + unknownmusic0xf7 + note G#, 13 + note D_, 13 + notetype 6, 7, 12 + note D_, 9 + rest 5 + note F#, 13 + note D_, 16 + note B_, 4 + note F_, 13 + endchannel +; 0x8eff \ No newline at end of file diff --git a/music/sfx/sfx_02_31.asm b/music/sfx/sfx_02_31.asm new file mode 100644 index 00000000..2a451e50 --- /dev/null +++ b/music/sfx/sfx_02_31.asm @@ -0,0 +1,72 @@ +SFX_02_31_Ch1: ; 8f48 (2:4f48) + dutycycle 244 + note D_, 16 + stereopanning 5 + note C_, 8 + note D_, 11 + octave 8 + note C_, 1 + note C_, 8 + note D_, 7 + note B_, 5 + note C#, 1 + note C_, 8 + note D_, 5 + notetype 3, 0, 0 + note C_, 8 + note D_, 7 + note B_, 3 + note D_, 1 + note C_, 7 + note D_, 9 + note A#, 2 + note D_, 5 + note C_, 7 + endchannel + + +SFX_02_31_Ch2: ; 8f63 (2:4f63) + dutycycle 34 + note D_, 16 + note B_, 1 + rest 4 + note C_, 7 + note D_, 11 + note A#, 1 + rest 2 + note C_, 7 + note D_, 7 + note G#, 5 + notetype 2, 0, 6 + note D_, 5 + note A_, 4 + rest 2 + note C_, 7 + note D_, 7 + note G#, 3 + octave 7 + note C_, 6 + note D_, 9 + note F#, 2 + unknownmusic0xe8 + note C_, 6 + endchannel + + +SFX_02_31_Ch3: ; 8f7e (2:4f7e) + note D_, 7 + octave 2 + note E_, 13 + note D_, 16 + notetype 6, 3, 12 + note D_, 11 + rest 6 + note E_, 11 + note D_, 2 + note B_, 3 + note F_, 12 + note D_, 16 + rest 3 + note E_, 13 + endchannel +; 0x8f8e \ No newline at end of file diff --git a/music/sfx/sfx_02_32.asm b/music/sfx/sfx_02_32.asm new file mode 100644 index 00000000..b58755a1 --- /dev/null +++ b/music/sfx/sfx_02_32.asm @@ -0,0 +1,105 @@ +SFX_02_32_Ch1: ; 8dcf (2:4dcf) + dutycycle 240 + note D_, 7 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note D_, 7 + octave 6 + note E_, 1 + note C_, 7 + note D_, 7 + notetype 2, 8, 0 + note C_, 7 + note D_, 7 + octave 6 + rest 1 + note C_, 7 + note D_, 7 + notetype 2, 0, 0 + note C_, 8 + note D_, 7 + rest 3 + note E_, 1 + note C_, 8 + note D_, 7 + note B_, 3 + note G#, 1 + note C_, 8 + note D_, 9 + note A#, 2 + rest 1 + note C_, 8 + endchannel + + +SFX_02_32_Ch2: ; 8df2 (2:4df2) + dutycycle 17 + note D_, 4 + note C_, 9 + note C_, 2 + note C_, 1 + note D_, 7 + rest 3 + rest 2 + note C_, 6 + note D_, 7 + note B_, 3 + note C_, 3 + note C_, 7 + note D_, 7 + note A#, 3 + note E_, 2 + note C_, 7 + note D_, 7 + note B_, 3 + note G#, 3 + note C_, 7 + note D_, 7 + note A#, 3 + rest 3 + note C_, 7 + note D_, 7 + note A_, 3 + note C_, 2 + note C_, 8 + note D_, 7 + note A#, 3 + note E_, 3 + note C_, 8 + note D_, 9 + note G#, 2 + note G#, 2 + note C_, 8 + endchannel + + +SFX_02_32_Ch3: ; 8e19 (2:4e19) + note D_, 7 + note C_, 9 + note C_, 2 + note D_, 6 + octave 6 + note F_, 13 + note D_, 6 + rest 3 + note E_, 13 + note D_, 6 + notetype 2, 3, 12 + note D_, 6 + note B_, 3 + note D_, 13 + note D_, 6 + rest 3 + note C#, 13 + note D_, 6 + note A#, 3 + note C#, 12 + note D_, 6 + note A_, 3 + note C#, 11 + note D_, 9 + note G#, 2 + note C#, 9 + endchannel +; 0x8e35 \ No newline at end of file diff --git a/music/sfx/sfx_02_33.asm b/music/sfx/sfx_02_33.asm new file mode 100644 index 00000000..84abb7aa --- /dev/null +++ b/music/sfx/sfx_02_33.asm @@ -0,0 +1,54 @@ +SFX_02_33_Ch1: ; 8fe7 (2:4fe7) + dutycycle 165 + note D_, 4 + unknownmusic0xf4 + note E_, 2 + note C_, 7 + note D_, 14 + notetype 6, 2, 1 + note C_, 8 + note D_, 9 + unknownmusic0xf4 + note C#, 10 + note C_, 8 + note D_, 9 + rest 2 + note C#, 11 + note C_, 8 + endchannel + + +SFX_02_33_Ch2: ; 8ffa (2:4ffa) + dutycycle 204 + note D_, 5 + unknownmusic0xf4 + note G#, 1 + note C_, 6 + note D_, 15 + octave 2 + octave 8 + note C_, 7 + note D_, 9 + notetype 5, 13, 8 + note C_, 7 + note D_, 9 + notetype 1, 13, 12 + note C_, 7 + endchannel + + +SFX_02_33_Ch3: ; 900d (2:500d) + note D_, 6 + rest 5 + note E_, 7 + note D_, 14 + note A#, 6 + note E_, 5 + note D_, 9 + rest 5 + note E_, 6 + note D_, 9 + note B_, 2 + note E_, 5 + endchannel +; 0x901a \ No newline at end of file diff --git a/music/sfx/sfx_02_34.asm b/music/sfx/sfx_02_34.asm new file mode 100644 index 00000000..be0bd3b7 --- /dev/null +++ b/music/sfx/sfx_02_34.asm @@ -0,0 +1,53 @@ +SFX_02_34_Ch1: ; 901a (2:501a) + dutycycle 240 + note D_, 14 + unknownmusic0xf1 + note C#, 2 + note C_, 6 + note D_, 14 + octave 7 + note C#, 6 + note C_, 6 + note D_, 14 + octave 7 + note C#, 2 + note C_, 6 + note D_, 9 + notetype 1, 1, 1 + note C_, 6 + endchannel + + +SFX_02_34_Ch2: ; 902d (2:502d) + dutycycle 21 + note D_, 13 + octave 7 + note C_, 13 + note C_, 6 + note D_, 13 + notetype 1, 1, 0 + note C_, 6 + note D_, 15 + rest 2 + note C_, 13 + note C_, 6 + note D_, 9 + rest 2 + note C_, 11 + note C_, 6 + endchannel + + +SFX_02_34_Ch3: ; 9040 (2:5040) + note D_, 15 + unknownmusic0xf2 + note F#, 6 + note D_, 14 + octave 6 + note F_, 6 + note D_, 15 + notetype 2, 5, 6 + note D_, 9 + notetype 1, 6, 6 + endchannel +; 0x904d \ No newline at end of file diff --git a/music/sfx/sfx_02_35.asm b/music/sfx/sfx_02_35.asm new file mode 100644 index 00000000..70f4a2d8 --- /dev/null +++ b/music/sfx/sfx_02_35.asm @@ -0,0 +1,71 @@ +SFX_02_35_Ch1: ; 904d (2:504d) + dutycycle 27 + note D_, 4 + unknownmusic0xf3 + note F#, 5 + note C_, 6 + note D_, 3 + octave 6 + note E_, 5 + note C_, 6 + note D_, 6 + notetype 1, 2, 2 + note C_, 6 + note D_, 3 + note B_, 3 + note G#, 5 + note C_, 5 + note D_, 9 + notetype 1, 10, 2 + note C_, 5 + note D_, 4 + unknownmusic0xf3 + note D_, 5 + note C_, 6 + note D_, 5 + octave 4 + octave 4 + note C_, 5 + note D_, 9 + notetype 1, 0, 2 + note C_, 6 + endchannel + + +SFX_02_35_Ch2: ; 9070 (2:5070) + dutycycle 204 + note D_, 4 + notetype 3, 6, 0 + note C_, 6 + note D_, 3 + rest 3 + note E_, 1 + note C_, 6 + note D_, 6 + rest 2 + note D_, 1 + note C_, 6 + note D_, 3 + note A_, 3 + note G#, 1 + note C_, 5 + note D_, 9 + rest 2 + note A#, 1 + note C_, 5 + note D_, 4 + notetype 3, 2, 0 + note C_, 6 + note D_, 4 + rest 5 + octave 8 + note C_, 5 + note D_, 9 + rest 2 + note C_, 1 + note C_, 6 + + +SFX_02_35_Ch3: ; 9092 (2:5092) + endchannel +; 0x9093 \ No newline at end of file diff --git a/music/sfx/sfx_02_36.asm b/music/sfx/sfx_02_36.asm new file mode 100644 index 00000000..776d5d64 --- /dev/null +++ b/music/sfx/sfx_02_36.asm @@ -0,0 +1,56 @@ +SFX_02_36_Ch1: ; 9093 (2:5093) + dutycycle 17 + note D_, 3 + note D#, 14 + note G#, 2 + note C_, 4 + note D_, 8 + unknownmusic0xf5 + note C_, 2 + note C_, 7 + note D_, 2 + rest 3 + note G#, 2 + note C_, 5 + note D_, 9 + note A_, 2 + note G#, 2 + note C_, 4 + endchannel + + +SFX_02_36_Ch2: ; 90a6 (2:50a6) + dutycycle 238 + note D_, 3 + note D#, 15 + note B_, 1 + note C_, 6 + note D_, 8 + notetype 5, 5, 13 + note C_, 8 + note D_, 2 + note B_, 3 + note B_, 1 + note C_, 7 + note D_, 9 + note F#, 2 + note B_, 1 + note C_, 6 + endchannel + + +SFX_02_36_Ch3: ; 90b9 (2:50b9) + note D_, 3 + note A_, 3 + note E_, 10 + note D_, 8 + note B_, 6 + note D_, 10 + note D_, 2 + note A#, 3 + note D#, 10 + note D_, 9 + note A_, 2 + note E_, 10 + endchannel +; 0x90c6 \ No newline at end of file diff --git a/music/sfx/sfx_02_37.asm b/music/sfx/sfx_02_37.asm new file mode 100644 index 00000000..6a0591bb --- /dev/null +++ b/music/sfx/sfx_02_37.asm @@ -0,0 +1,59 @@ +SFX_02_37_Ch1: ; 8786 (2:4786) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + rest 1 + note C_, 8 + note D_, 7 + octave 4 + rest 2 + note C_, 8 + note D_, 11 + unknownmusic0xf6 + rest 1 + note C_, 8 + note D_, 5 + notetype 3, 12, 2 + note C_, 8 + note D_, 9 + rest 2 + rest 1 + note C_, 8 + endchannel + + +SFX_02_37_Ch2: ; 879d (2:479d) + dutycycle 95 + note D_, 16 + note A_, 8 + note G#, 2 + note C_, 8 + note D_, 7 + note G#, 5 + note G#, 1 + note C_, 8 + note D_, 11 + note A_, 7 + note G#, 2 + note C_, 8 + note D_, 16 + note G#, 4 + note G#, 2 + note C_, 8 + endchannel + + +SFX_02_37_Ch3: ; 87b0 (2:47b0) + note D_, 4 + unknownmusic0xf2 + note D#, 13 + note D_, 14 + octave 2 + note D_, 13 + note D_, 16 + notetype 7, 3, 12 + note D_, 9 + rest 2 + note D_, 13 + endchannel +; 0x87bd \ No newline at end of file diff --git a/music/sfx/sfx_02_38.asm b/music/sfx/sfx_02_38.asm new file mode 100644 index 00000000..b020e2e5 --- /dev/null +++ b/music/sfx/sfx_02_38.asm @@ -0,0 +1,88 @@ +SFX_02_38_Ch1: ; 87bd (2:47bd) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + note G#, 1 + note C_, 7 + note D_, 11 + octave 2 + note G#, 5 + note C_, 7 + note D_, 16 + notetype 7, 9, 0 + note C_, 7 + note D_, 9 + notetype 5, 9, 0 + note C_, 7 + note D_, 7 + rest 5 + note G#, 9 + note C_, 7 + note D_, 6 + notetype 3, 7, 0 + note C_, 7 + note D_, 5 + notetype 3, 6, 0 + note C_, 7 + note D_, 9 + rest 2 + note E_, 1 + note C_, 7 + endchannel + + +SFX_02_38_Ch2: ; 87e0 (2:47e0) + dutycycle 5 + note D_, 16 + note B_, 8 + note E_, 2 + note C_, 7 + note D_, 11 + note A_, 7 + note E_, 3 + note C_, 7 + note D_, 16 + note A#, 8 + note F_, 2 + note C_, 7 + note D_, 9 + note A#, 6 + note F_, 2 + note C_, 7 + note D_, 7 + note A_, 5 + note E_, 8 + note C_, 7 + note D_, 6 + note A#, 4 + note D#, 2 + note C_, 7 + note D_, 5 + note A_, 4 + note D_, 3 + note C_, 7 + note D_, 9 + note G_, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_02_38_Ch3: ; 8803 (2:4803) + note D_, 16 + octave 4 + note D#, 13 + note D_, 11 + rest 8 + note E_, 13 + note D_, 11 + rest 8 + note D#, 13 + note D_, 13 + note B_, 8 + note E_, 13 + note D_, 16 + note A#, 3 + note F_, 13 + endchannel +; 0x8813 \ No newline at end of file diff --git a/music/sfx/sfx_02_39.asm b/music/sfx/sfx_02_39.asm new file mode 100644 index 00000000..c85aa022 --- /dev/null +++ b/music/sfx/sfx_02_39.asm @@ -0,0 +1,63 @@ +SFX_02_39_Ch1: ; 886b (2:486b) + dutycycle 165 + note D_, 7 + unknownmusic0xf4 + note E_, 1 + note C_, 8 + note D_, 16 + octave 5 + note D#, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf4 + note E_, 1 + note C_, 8 + note D_, 6 + note B_, 4 + note E_, 9 + note C_, 8 + note D_, 9 + notetype 1, 5, 0 + note C_, 8 + endchannel + + +SFX_02_39_Ch2: ; 8882 (2:4882) + dutycycle 119 + note D_, 7 + rest 4 + note C#, 3 + note C_, 8 + note D_, 16 + note B_, 4 + note C_, 5 + note C_, 8 + note D_, 4 + rest 4 + note C#, 3 + note C_, 8 + note D_, 5 + rest 4 + note D_, 2 + note C_, 8 + note D_, 9 + note B_, 2 + note D#, 3 + note C_, 8 + endchannel + + +SFX_02_39_Ch3: ; 8899 (2:4899) + note D_, 9 + notetype 6, 2, 12 + note D_, 13 + rest 7 + note D#, 13 + note D_, 11 + note B_, 7 + note D_, 13 + note D_, 9 + note A_, 2 + note C#, 13 + endchannel +; 0x88a6 \ No newline at end of file diff --git a/music/sfx/sfx_02_3a.asm b/music/sfx/sfx_02_3a.asm new file mode 100644 index 00000000..6df6ea30 --- /dev/null +++ b/music/sfx/sfx_02_3a.asm @@ -0,0 +1,48 @@ +SFX_02_3a_Ch1: ; ad77 (2:6d77) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + vibrato 6, 2, 6 + duty 2 + unknownmusic0xe8 + notetype 4, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note G#, 2 + notetype 12, 11, 3 + octave 4 + note E_, 4 + endchannel + + +SFX_02_3a_Ch2: ; ad8e (2:6d8e) + unknownmusic0xf8 + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + notetype 12, 12, 3 + note B_, 4 + endchannel + + +SFX_02_3a_Ch3: ; ad9e (2:6d9e) + unknownmusic0xf8 + notetype 4, 1, 0 + octave 4 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + notetype 12, 1, 0 + octave 4 + note B_, 2 + rest 2 + endchannel +; 0xadae \ No newline at end of file diff --git a/music/sfx/sfx_02_3b.asm b/music/sfx/sfx_02_3b.asm new file mode 100644 index 00000000..e851055d --- /dev/null +++ b/music/sfx/sfx_02_3b.asm @@ -0,0 +1,70 @@ +SFX_02_3b_Ch1: ; b316 (2:7316) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 5, 11, 4 + octave 4 + note D_, 4 + note C_, 4 + octave 3 + note A_, 8 + notetype 5, 11, 2 + octave 4 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 + octave 3 + note A#, 2 + notetype 5, 11, 4 + octave 4 + note C_, 8 + endchannel + + +SFX_02_3b_Ch2: ; b335 (2:7335) + unknownmusic0xf8 + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + note A_, 4 + note F_, 4 + note C_, 8 + notetype 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + notetype 5, 12, 4 + note A_, 8 + endchannel + + +SFX_02_3b_Ch3: ; b34d (2:734d) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 5 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note A_, 8 + endchannel +; 0xb362 \ No newline at end of file diff --git a/music/sfx/sfx_02_3c.asm b/music/sfx/sfx_02_3c.asm new file mode 100644 index 00000000..686140e3 --- /dev/null +++ b/music/sfx/sfx_02_3c.asm @@ -0,0 +1,18 @@ +SFX_02_3c_Ch1: ; 840a (2:440a) + duty 2 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 3 + note C#, 1 + note D_, 3 + note D_, 9 + octave 6 + note C_, 1 + note C_, 3 + note C#, 1 + note C_, 9 + endchannel +; 0x841b \ No newline at end of file diff --git a/music/sfx/sfx_02_3d.asm b/music/sfx/sfx_02_3d.asm new file mode 100644 index 00000000..e251802e --- /dev/null +++ b/music/sfx/sfx_02_3d.asm @@ -0,0 +1,15 @@ +SFX_02_3d_Ch1: ; 84b7 (2:44b7) + duty 2 + note C#, 1 + note C#, 8 + note D_, 16 + stereopanning 240 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x84c6 \ No newline at end of file diff --git a/music/sfx/sfx_02_3e.asm b/music/sfx/sfx_02_3e.asm new file mode 100644 index 00000000..de8f673d --- /dev/null +++ b/music/sfx/sfx_02_3e.asm @@ -0,0 +1,22 @@ +SFX_02_3e_Ch1: ; 84d9 (2:44d9) + duty 2 + note C#, 1 + note C#, 5 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note C#, 1 + note C#, 8 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x84ee \ No newline at end of file diff --git a/music/sfx/sfx_02_3f.asm b/music/sfx/sfx_02_3f.asm new file mode 100644 index 00000000..2d46b12c --- /dev/null +++ b/music/sfx/sfx_02_3f.asm @@ -0,0 +1,9 @@ +SFX_02_3f_Ch1: ; 83c3 (2:43c3) + note D_, 2 + octave 6 + note D#, 4 + note D_, 9 + octave 7 + note D_, 3 + endchannel +; 0x83ca \ No newline at end of file diff --git a/music/sfx/sfx_02_40.asm b/music/sfx/sfx_02_40.asm new file mode 100644 index 00000000..3e00e906 --- /dev/null +++ b/music/sfx/sfx_02_40.asm @@ -0,0 +1,18 @@ +SFX_02_40_Ch1: ; 8462 (2:4462) + duty 2 + note D_, 1 + note A_, 2 + rest 1 + note C_, 8 + note D_, 1 + note G#, 2 + notetype 0, 0, 7 + note D_, 1 + note A_, 2 + rest 1 + note C_, 8 + note D_, 13 + note A#, 2 + notetype 0, 0, 7 + endchannel +; 0x8475 \ No newline at end of file diff --git a/music/sfx/sfx_02_41.asm b/music/sfx/sfx_02_41.asm new file mode 100644 index 00000000..776eb01e --- /dev/null +++ b/music/sfx/sfx_02_41.asm @@ -0,0 +1,78 @@ +SFX_02_41_Ch1: ; b2c8 (2:72c8) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + notetype 5, 11, 1 + octave 3 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 4 + note E_, 4 + octave 3 + note F_, 4 + endchannel + + +SFX_02_41_Ch2: ; b2e1 (2:72e1) + unknownmusic0xf8 + duty 2 + notetype 5, 12, 2 + octave 5 + note F_, 2 + note E_, 1 + rest 1 + note D_, 2 + note C_, 1 + rest 1 + octave 4 + note A#, 2 + octave 5 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + endchannel + + +SFX_02_41_Ch3: ; b2f7 (2:72f7) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 5 + note C_, 1 + rest 1 + octave 4 + note F_, 2 + octave 5 + note C_, 1 + rest 1 + octave 4 + note A#, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + octave 5 + note F_, 1 + rest 3 + note C_, 1 + rest 3 + octave 4 + note F_, 2 + rest 2 + endchannel +; 0xb316 \ No newline at end of file diff --git a/music/sfx/sfx_02_42.asm b/music/sfx/sfx_02_42.asm new file mode 100644 index 00000000..89f7e427 --- /dev/null +++ b/music/sfx/sfx_02_42.asm @@ -0,0 +1,60 @@ +SFX_02_42_Ch1: ; b362 (2:7362) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 5, 10, 4 + octave 3 + note A#, 4 + notetype 5, 11, 1 + octave 4 + note C_, 2 + note C_, 1 + note C_, 1 + notetype 5, 10, 4 + note D#, 4 + notetype 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + notetype 5, 11, 4 + note A#, 8 + endchannel + + +SFX_02_42_Ch2: ; b381 (2:7381) + unknownmusic0xf8 + vibrato 4, 2, 3 + duty 2 + notetype 5, 13, 1 + octave 4 + note G_, 2 + note G_, 1 + note G_, 1 + notetype 5, 12, 4 + note D#, 4 + notetype 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + notetype 5, 12, 4 + octave 5 + note D#, 8 + endchannel + + +SFX_02_42_Ch3: ; b39d (2:739d) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 4 + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + endchannel +; 0xb3a7 \ No newline at end of file diff --git a/music/sfx/sfx_02_43.asm b/music/sfx/sfx_02_43.asm new file mode 100644 index 00000000..b7bcabab --- /dev/null +++ b/music/sfx/sfx_02_43.asm @@ -0,0 +1,17 @@ +SFX_02_43_Ch1: ; 84c6 (2:44c6) + duty 0 + note C#, 1 + note C#, 5 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + loopchannel 4, SFX_02_43_Ch1 + note D_, 16 + unknownmusic0xf3 + note C_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x84d9 \ No newline at end of file diff --git a/music/sfx/sfx_02_44.asm b/music/sfx/sfx_02_44.asm new file mode 100644 index 00000000..32795c41 --- /dev/null +++ b/music/sfx/sfx_02_44.asm @@ -0,0 +1,15 @@ +SFX_02_44_Ch1: ; 84ee (2:44ee) + duty 2 + note C#, 1 + note C#, 6 + note D_, 16 + stereopanning 240 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x84fd \ No newline at end of file diff --git a/music/sfx/sfx_02_45.asm b/music/sfx/sfx_02_45.asm new file mode 100644 index 00000000..9d9d99d8 --- /dev/null +++ b/music/sfx/sfx_02_45.asm @@ -0,0 +1,44 @@ +SFX_02_45_Ch1: ; 84fd (2:44fd) + duty 2 + note D_, 16 + unknownmusic0xf2 + rest 1 + note C_, 8 + note D_, 16 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 4 + note A#, 2 + note G#, 1 + note C_, 8 + note D_, 4 + note A#, 2 + note C_, 1 + note C_, 8 + note D_, 4 + note A#, 2 + note E_, 1 + note C_, 8 + note D_, 4 + note A#, 2 + note C_, 1 + note C_, 8 + note D_, 4 + note A#, 2 + note G#, 1 + note C_, 8 + note D_, 4 + note A#, 2 + note C_, 1 + note C_, 8 + note D_, 4 + note A#, 2 + rest 1 + note C_, 8 + note D_, 9 + note A#, 2 + note C_, 1 + note C_, 8 + endchannel +; 0x8528 \ No newline at end of file diff --git a/music/sfx/sfx_02_46.asm b/music/sfx/sfx_02_46.asm new file mode 100644 index 00000000..3d438186 --- /dev/null +++ b/music/sfx/sfx_02_46.asm @@ -0,0 +1,17 @@ +SFX_02_46_Ch1: ; 8528 (2:4528) + duty 2 + note D_, 5 + stereopanning 0 + note C_, 7 + note D_, 5 + stereopanning 0 + note C_, 5 + note D_, 5 + stereopanning 0 + note C_, 3 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x853b \ No newline at end of file diff --git a/music/sfx/sfx_02_47.asm b/music/sfx/sfx_02_47.asm new file mode 100644 index 00000000..6f6c8d83 --- /dev/null +++ b/music/sfx/sfx_02_47.asm @@ -0,0 +1,18 @@ +SFX_02_47_Ch1: ; 853b (2:453b) + duty 2 + note D_, 7 + stereopanning 0 + note C_, 8 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 7 + stereopanning 0 + note C_, 8 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x854e \ No newline at end of file diff --git a/music/sfx/sfx_02_48.asm b/music/sfx/sfx_02_48.asm new file mode 100644 index 00000000..9ae3fbcb --- /dev/null +++ b/music/sfx/sfx_02_48.asm @@ -0,0 +1,27 @@ +SFX_02_48_Ch1: ; 854e (2:454e) + duty 1 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 7, 0, 0 + note C_, 7 + note D_, 16 + note B_, 8 + note G#, 1 + note C_, 6 + note D_, 16 + note G#, 8 + note C_, 1 + note C_, 6 + note D_, 16 + note E_, 8 + note G#, 1 + note C_, 5 + note D_, 16 + note C#, 8 + note C_, 1 + note C_, 5 + note C#, 1 + note C_, 9 + endchannel +; 0x8569 \ No newline at end of file diff --git a/music/sfx/sfx_02_49.asm b/music/sfx/sfx_02_49.asm new file mode 100644 index 00000000..4a9b2e48 --- /dev/null +++ b/music/sfx/sfx_02_49.asm @@ -0,0 +1,24 @@ +SFX_02_49_Ch1: ; 8569 (2:4569) + duty 2 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 3 + unknownmusic0xf1 + note G#, 1 + note C_, 7 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x8580 \ No newline at end of file diff --git a/music/sfx/sfx_02_4a.asm b/music/sfx/sfx_02_4a.asm new file mode 100644 index 00000000..43d498f4 --- /dev/null +++ b/music/sfx/sfx_02_4a.asm @@ -0,0 +1,22 @@ +SFX_02_4a_Ch1: ; 8580 (2:4580) + duty 2 + note C#, 1 + note D_, 13 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + note C#, 1 + note D_, 3 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 6 + note C#, 1 + note C_, 9 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x8595 \ No newline at end of file diff --git a/music/sfx/sfx_02_4b.asm b/music/sfx/sfx_02_4b.asm new file mode 100644 index 00000000..1b99ac1b --- /dev/null +++ b/music/sfx/sfx_02_4b.asm @@ -0,0 +1,27 @@ +SFX_02_4b_Ch1: ; 8595 (2:4595) + duty 1 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 7, 0, 0 + note C_, 6 + note D_, 16 + note B_, 8 + note G#, 1 + note C_, 6 + note D_, 16 + note G#, 8 + note C_, 1 + note C_, 7 + note D_, 16 + note E_, 8 + note G#, 1 + note C_, 7 + note D_, 16 + note C#, 8 + note C_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x85b0 \ No newline at end of file diff --git a/music/sfx/sfx_02_4c.asm b/music/sfx/sfx_02_4c.asm new file mode 100644 index 00000000..0ae3c014 --- /dev/null +++ b/music/sfx/sfx_02_4c.asm @@ -0,0 +1,27 @@ +SFX_02_4c_Ch1: ; 85b0 (2:45b0) + duty 1 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 7, 0, 0 + note C_, 8 + note D_, 16 + note B_, 8 + note G#, 1 + note C_, 7 + note D_, 16 + note G#, 8 + note C_, 1 + note C_, 7 + note D_, 16 + note E_, 8 + note G#, 1 + note C_, 6 + note D_, 16 + note C#, 8 + note C_, 1 + note C_, 6 + note C#, 1 + note C_, 9 + endchannel +; 0x85cb \ No newline at end of file diff --git a/music/sfx/sfx_02_4d.asm b/music/sfx/sfx_02_4d.asm new file mode 100644 index 00000000..3e60d6e4 --- /dev/null +++ b/music/sfx/sfx_02_4d.asm @@ -0,0 +1,11 @@ +SFX_02_4d_Ch1: ; 85cb (2:45cb) + duty 1 + note C#, 1 + note C#, 7 + note D_, 16 + notetype 2, 0, 0 + note C_, 6 + note C#, 1 + note C_, 9 + endchannel +; 0x85d6 \ No newline at end of file diff --git a/music/sfx/sfx_02_4e.asm b/music/sfx/sfx_02_4e.asm new file mode 100644 index 00000000..1102cad9 --- /dev/null +++ b/music/sfx/sfx_02_4e.asm @@ -0,0 +1,12 @@ +SFX_02_4e_Ch1: ; 85d6 (2:45d6) + duty 2 + note C#, 1 + note A_, 6 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 5 + note C#, 1 + note C_, 9 + endchannel +; 0x85e1 \ No newline at end of file diff --git a/music/sfx/sfx_02_4f.asm b/music/sfx/sfx_02_4f.asm new file mode 100644 index 00000000..5aab75b4 --- /dev/null +++ b/music/sfx/sfx_02_4f.asm @@ -0,0 +1,15 @@ +SFX_02_4f_Ch1: ; 85e1 (2:45e1) + note D_, 3 + unknownmusic0xf1 + note D#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + unknownmusic0xf1 + note D_, 3 + note D_, 2 + note C_, 1 + note C_, 1 + endchannel +; 0x85ee \ No newline at end of file diff --git a/music/sfx/sfx_02_50.asm b/music/sfx/sfx_02_50.asm new file mode 100644 index 00000000..6e600616 --- /dev/null +++ b/music/sfx/sfx_02_50.asm @@ -0,0 +1,50 @@ +SFX_02_50_Ch1: ; 85ee (2:45ee) + note D_, 3 + unknownmusic0xf1 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note A#, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + notetype 1, 1, 2 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note G#, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note B_, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note F#, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note A_, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note E_, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + endchannel +; 0x861f \ No newline at end of file diff --git a/music/sfx/sfx_02_51.asm b/music/sfx/sfx_02_51.asm new file mode 100644 index 00000000..aa66d484 --- /dev/null +++ b/music/sfx/sfx_02_51.asm @@ -0,0 +1,41 @@ +SFX_02_51_Ch1: ; 861f (2:461f) + duty 3 + note C#, 1 + note F_, 11 + note D_, 5 + stereopanning 0 + note C_, 6 + note C#, 1 + note C_, 9 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel + + +SFX_02_51_Ch2: ; 8636 (2:4636) + duty 3 + note D_, 5 + stereopanning 1 + note C_, 5 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 1 + note C_, 5 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x8649 \ No newline at end of file diff --git a/music/sfx/sfx_02_52.asm b/music/sfx/sfx_02_52.asm new file mode 100644 index 00000000..d3da600a --- /dev/null +++ b/music/sfx/sfx_02_52.asm @@ -0,0 +1,11 @@ +SFX_02_52_Ch1: ; 8649 (2:4649) + duty 0 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 2, 0, 0 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x8654 \ No newline at end of file diff --git a/music/sfx/sfx_02_53.asm b/music/sfx/sfx_02_53.asm new file mode 100644 index 00000000..e880dd42 --- /dev/null +++ b/music/sfx/sfx_02_53.asm @@ -0,0 +1,27 @@ +SFX_02_53_Ch1: ; 8654 (2:4654) + note D_, 5 + note A#, 3 + note D_, 4 + note D_, 9 + unknownmusic0xf1 + note D#, 5 + note D_, 16 + note C_, 1 + note C_, 1 + note D_, 3 + unknownmusic0xf7 + note D_, 5 + note D_, 3 + unknownmusic0xf7 + note D#, 5 + note D_, 5 + unknownmusic0xf7 + note E_, 5 + note D_, 9 + unknownmusic0xf4 + note F_, 6 + note D_, 9 + unknownmusic0xf1 + note E_, 5 + endchannel +; 0x866d \ No newline at end of file diff --git a/music/sfx/sfx_02_54.asm b/music/sfx/sfx_02_54.asm new file mode 100644 index 00000000..dd793701 --- /dev/null +++ b/music/sfx/sfx_02_54.asm @@ -0,0 +1,55 @@ +SFX_02_54_Ch1: ; 866d (2:466d) + duty 2 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + endchannel + + +SFX_02_54_Ch2: ; 868c (2:468c) + duty 3 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note G#, 3 + note C_, 5 + endchannel +; 0x86ab \ No newline at end of file diff --git a/music/sfx/sfx_02_55.asm b/music/sfx/sfx_02_55.asm new file mode 100644 index 00000000..e2123a28 --- /dev/null +++ b/music/sfx/sfx_02_55.asm @@ -0,0 +1,30 @@ +SFX_02_55_Ch1: ; 86ab (2:46ab) + duty 1 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + note C#, 1 + note D_, 3 + note D_, 5 + octave 6 + note C_, 1 + note C_, 6 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 8 + note C#, 1 + note D_, 3 + note D_, 16 + octave 6 + note C_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x86c8 \ No newline at end of file diff --git a/music/sfx/sfx_02_56.asm b/music/sfx/sfx_02_56.asm new file mode 100644 index 00000000..83087d24 --- /dev/null +++ b/music/sfx/sfx_02_56.asm @@ -0,0 +1,18 @@ +SFX_02_56_Ch1: ; 83e1 (2:43e1) + note D_, 3 + unknownmusic0xf7 + note D_, 5 + note D_, 3 + unknownmusic0xf7 + note D#, 5 + note D_, 5 + unknownmusic0xf7 + note E_, 5 + note D_, 9 + unknownmusic0xf4 + note F_, 6 + note D_, 9 + unknownmusic0xf1 + note E_, 5 + endchannel +; 0x83f1 \ No newline at end of file diff --git a/music/sfx/sfx_02_57.asm b/music/sfx/sfx_02_57.asm new file mode 100644 index 00000000..1da59f79 --- /dev/null +++ b/music/sfx/sfx_02_57.asm @@ -0,0 +1,8 @@ +SFX_02_57_Ch1: ; 83f1 (2:43f1) + note D_, 10 + unknownmusic0xf1 + note E_, 5 + note D_, 9 + notetype 1, 4, 3 + endchannel +; 0x83f8 \ No newline at end of file diff --git a/music/sfx/sfx_02_58.asm b/music/sfx/sfx_02_58.asm new file mode 100644 index 00000000..53e0431d --- /dev/null +++ b/music/sfx/sfx_02_58.asm @@ -0,0 +1,21 @@ +SFX_02_58_Ch1: ; 83f8 (2:43f8) + duty 2 + note D_, 9 + octave 7 + note E_, 1 + note C_, 8 + endchannel + + +SFX_02_58_Ch2: ; 83ff (2:43ff) + duty 2 + note D_, 3 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 9 + note B_, 2 + note E_, 2 + note C_, 8 + endchannel +; 0x840a \ No newline at end of file diff --git a/music/sfx/sfx_02_59.asm b/music/sfx/sfx_02_59.asm new file mode 100644 index 00000000..7ded7c7e --- /dev/null +++ b/music/sfx/sfx_02_59.asm @@ -0,0 +1,21 @@ +SFX_02_59_Ch1: ; 841b (2:441b) + duty 2 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + endchannel + + +SFX_02_59_Ch2: ; 8422 (2:4422) + duty 2 + note D_, 2 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + note A#, 2 + note F#, 2 + note C_, 8 + endchannel +; 0x842d \ No newline at end of file diff --git a/music/sfx/sfx_02_5a.asm b/music/sfx/sfx_02_5a.asm new file mode 100644 index 00000000..c0e428fc --- /dev/null +++ b/music/sfx/sfx_02_5a.asm @@ -0,0 +1,29 @@ +SFX_02_5a_Ch1: ; 842d (2:442d) + duty 2 + note D_, 5 + octave 7 + note C_, 1 + note C_, 8 + note D_, 9 + unknownmusic0xf2 + octave 8 + note C_, 8 + endchannel + + +SFX_02_5a_Ch2: ; 8438 (2:4438) + duty 2 + note D_, 2 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + note A_, 2 + rest 2 + note C_, 7 + note D_, 9 + note A#, 3 + note A#, 2 + note C_, 8 + endchannel +; 0x8447 \ No newline at end of file diff --git a/music/sfx/sfx_02_5b.asm b/music/sfx/sfx_02_5b.asm new file mode 100644 index 00000000..992857e9 --- /dev/null +++ b/music/sfx/sfx_02_5b.asm @@ -0,0 +1,12 @@ +SFX_02_5b_Ch1: ; 8447 (2:4447) + duty 2 + note C#, 1 + note F_, 11 + note D_, 16 + unknownmusic0xf1 + note C_, 1 + note C_, 4 + note C#, 1 + note C_, 9 + endchannel +; 0x8452 \ No newline at end of file diff --git a/music/sfx/sfx_02_5c.asm b/music/sfx/sfx_02_5c.asm new file mode 100644 index 00000000..a7e98039 --- /dev/null +++ b/music/sfx/sfx_02_5c.asm @@ -0,0 +1,18 @@ +SFX_02_5c_Ch1: ; 8452 (2:4452) + note D_, 3 + unknownmusic0xf1 + note F_, 5 + note D_, 13 + note G_, 2 + note D_, 4 + note D_, 3 + note B_, 2 + note F_, 5 + note D_, 13 + note F#, 2 + note D_, 4 + note D_, 7 + note E_, 2 + note F_, 5 + endchannel +; 0x8462 \ No newline at end of file diff --git a/music/sfx/sfx_02_5d.asm b/music/sfx/sfx_02_5d.asm new file mode 100644 index 00000000..c76cf8c7 --- /dev/null +++ b/music/sfx/sfx_02_5d.asm @@ -0,0 +1,67 @@ +SFX_02_5d_Ch1: ; 8475 (2:4475) + duty 2 + note D_, 5 + unknownmusic0xf4 + note C_, 1 + note C_, 8 + note D_, 3 + octave 4 + note C_, 1 + note C_, 7 + note D_, 3 + octave 4 + note G#, 1 + note C_, 7 + note D_, 3 + octave 4 + rest 1 + note C_, 7 + note D_, 3 + octave 4 + note C_, 1 + note C_, 8 + note D_, 3 + octave 4 + note A#, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf2 + octave 8 + note C_, 8 + endchannel + + +SFX_02_5d_Ch2: ; 8494 (2:4494) + duty 2 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 3 + notetype 4, 0, 1 + note C_, 8 + note D_, 3 + rest 5 + note C_, 2 + note C_, 7 + note D_, 3 + rest 5 + note G#, 2 + note C_, 7 + note D_, 3 + rest 5 + rest 2 + note C_, 7 + note D_, 3 + rest 5 + note C_, 2 + note C_, 8 + note D_, 3 + rest 5 + note A#, 2 + note C_, 8 + note D_, 16 + notetype 2, 14, 1 + note C_, 8 + endchannel +; 0x84b7 \ No newline at end of file diff --git a/music/sfx/sfx_02_5e.asm b/music/sfx/sfx_02_5e.asm new file mode 100644 index 00000000..ad47ebf0 --- /dev/null +++ b/music/sfx/sfx_02_5e.asm @@ -0,0 +1,22 @@ +SFX_02_5e_Ch1: ; 83ca (2:43ca) + vibrato 16, 1, 4 + notetype 12, 1, 0 + octave 5 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + octave 6 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 5 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 8 + rest 12 + endchannel +; 0x83e1 \ No newline at end of file diff --git a/music/sfx/sfx_02_5f.asm b/music/sfx/sfx_02_5f.asm new file mode 100644 index 00000000..60421533 --- /dev/null +++ b/music/sfx/sfx_02_5f.asm @@ -0,0 +1,28 @@ +SFX_02_5f_Ch1: ; 86c8 (2:46c8) + duty 2 + note D_, 16 + unknownmusic0xf3 + note D#, 1 + note C_, 8 + note D_, 9 + note F#, 6 + note D#, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf4 + note C_, 1 + note C_, 8 + note D_, 16 + note G_, 5 + note C_, 1 + note C_, 8 + note D_, 16 + note E_, 5 + note C_, 1 + note C_, 8 + note D_, 16 + note D_, 5 + note C_, 1 + note C_, 8 + endchannel +; 0x86e3 \ No newline at end of file diff --git a/music/sfx/sfx_08_01.asm b/music/sfx/sfx_08_01.asm new file mode 100644 index 00000000..43c13dbb --- /dev/null +++ b/music/sfx/sfx_08_01.asm @@ -0,0 +1,6 @@ +SFX_08_01_Ch1: ; 202fd (8:42fd) + note D_, 1 + rest 2 + note D#, 4 + endchannel +; 0x20301 \ No newline at end of file diff --git a/music/sfx/sfx_08_02.asm b/music/sfx/sfx_08_02.asm new file mode 100644 index 00000000..1870aa00 --- /dev/null +++ b/music/sfx/sfx_08_02.asm @@ -0,0 +1,6 @@ +SFX_08_02_Ch1: ; 20301 (8:4301) + note D_, 1 + note B_, 2 + note D#, 4 + endchannel +; 0x20305 \ No newline at end of file diff --git a/music/sfx/sfx_08_03.asm b/music/sfx/sfx_08_03.asm new file mode 100644 index 00000000..0fcd83b0 --- /dev/null +++ b/music/sfx/sfx_08_03.asm @@ -0,0 +1,6 @@ +SFX_08_03_Ch1: ; 20305 (8:4305) + note D_, 1 + note A#, 2 + note D#, 4 + endchannel +; 0x20309 \ No newline at end of file diff --git a/music/sfx/sfx_08_04.asm b/music/sfx/sfx_08_04.asm new file mode 100644 index 00000000..98d759c6 --- /dev/null +++ b/music/sfx/sfx_08_04.asm @@ -0,0 +1,6 @@ +SFX_08_04_Ch1: ; 20309 (8:4309) + note D_, 1 + note G#, 2 + note D#, 4 + endchannel +; 0x2030d \ No newline at end of file diff --git a/music/sfx/sfx_08_05.asm b/music/sfx/sfx_08_05.asm new file mode 100644 index 00000000..44cd722f --- /dev/null +++ b/music/sfx/sfx_08_05.asm @@ -0,0 +1,21 @@ +SFX_08_05_Ch1: ; 2030d (8:430d) + note D_, 8 + note G#, 5 + note D#, 8 + note D_, 7 + note G#, 5 + note D#, 7 + note D_, 6 + note G#, 4 + note D#, 6 + note D_, 5 + note G#, 4 + note D#, 5 + note D_, 4 + note G#, 3 + note D#, 4 + note D_, 3 + note G#, 2 + note D#, 3 + endchannel +; 0x20320 \ No newline at end of file diff --git a/music/sfx/sfx_08_06.asm b/music/sfx/sfx_08_06.asm new file mode 100644 index 00000000..94a1eb2f --- /dev/null +++ b/music/sfx/sfx_08_06.asm @@ -0,0 +1,6 @@ +SFX_08_06_Ch1: ; 20320 (8:4320) + note D_, 1 + note F_, 2 + note D_, 11 + endchannel +; 0x20324 \ No newline at end of file diff --git a/music/sfx/sfx_08_07.asm b/music/sfx/sfx_08_07.asm new file mode 100644 index 00000000..c285d3f5 --- /dev/null +++ b/music/sfx/sfx_08_07.asm @@ -0,0 +1,9 @@ +SFX_08_07_Ch1: ; 20324 (8:4324) + note D_, 2 + note E_, 2 + note D_, 12 + note D_, 1 + note F#, 2 + note D_, 11 + endchannel +; 0x2032b \ No newline at end of file diff --git a/music/sfx/sfx_08_08.asm b/music/sfx/sfx_08_08.asm new file mode 100644 index 00000000..0db7649d --- /dev/null +++ b/music/sfx/sfx_08_08.asm @@ -0,0 +1,6 @@ +SFX_08_08_Ch1: ; 2032b (8:432b) + note D_, 1 + note G#, 2 + note C#, 1 + endchannel +; 0x2032f \ No newline at end of file diff --git a/music/sfx/sfx_08_09.asm b/music/sfx/sfx_08_09.asm new file mode 100644 index 00000000..90879433 --- /dev/null +++ b/music/sfx/sfx_08_09.asm @@ -0,0 +1,6 @@ +SFX_08_09_Ch1: ; 2032f (8:432f) + note D_, 1 + note G#, 3 + note D_, 4 + endchannel +; 0x20333 \ No newline at end of file diff --git a/music/sfx/sfx_08_0a.asm b/music/sfx/sfx_08_0a.asm new file mode 100644 index 00000000..dc0d06c0 --- /dev/null +++ b/music/sfx/sfx_08_0a.asm @@ -0,0 +1,6 @@ +SFX_08_0a_Ch1: ; 20333 (8:4333) + note D_, 1 + note G#, 3 + note D_, 6 + endchannel +; 0x20337 \ No newline at end of file diff --git a/music/sfx/sfx_08_0b.asm b/music/sfx/sfx_08_0b.asm new file mode 100644 index 00000000..d22a3e40 --- /dev/null +++ b/music/sfx/sfx_08_0b.asm @@ -0,0 +1,6 @@ +SFX_08_0b_Ch1: ; 20337 (8:4337) + note D_, 1 + note G#, 3 + note D_, 7 + endchannel +; 0x2033b \ No newline at end of file diff --git a/music/sfx/sfx_08_0c.asm b/music/sfx/sfx_08_0c.asm new file mode 100644 index 00000000..90db61bd --- /dev/null +++ b/music/sfx/sfx_08_0c.asm @@ -0,0 +1,6 @@ +SFX_08_0c_Ch1: ; 2033b (8:433b) + note D_, 1 + note A#, 2 + note C#, 1 + endchannel +; 0x2033f \ No newline at end of file diff --git a/music/sfx/sfx_08_0d.asm b/music/sfx/sfx_08_0d.asm new file mode 100644 index 00000000..96335764 --- /dev/null +++ b/music/sfx/sfx_08_0d.asm @@ -0,0 +1,6 @@ +SFX_08_0d_Ch1: ; 2033f (8:433f) + note D_, 1 + note A#, 3 + note C#, 2 + endchannel +; 0x20343 \ No newline at end of file diff --git a/music/sfx/sfx_08_0e.asm b/music/sfx/sfx_08_0e.asm new file mode 100644 index 00000000..4e7074a0 --- /dev/null +++ b/music/sfx/sfx_08_0e.asm @@ -0,0 +1,6 @@ +SFX_08_0e_Ch1: ; 20343 (8:4343) + note D_, 1 + note A#, 3 + note F_, 1 + endchannel +; 0x20347 \ No newline at end of file diff --git a/music/sfx/sfx_08_0f.asm b/music/sfx/sfx_08_0f.asm new file mode 100644 index 00000000..233785da --- /dev/null +++ b/music/sfx/sfx_08_0f.asm @@ -0,0 +1,9 @@ +SFX_08_0f_Ch1: ; 20347 (8:4347) + note D_, 1 + note A#, 2 + note C#, 9 + note D_, 1 + note D#, 2 + note D#, 4 + endchannel +; 0x2034e \ No newline at end of file diff --git a/music/sfx/sfx_08_10.asm b/music/sfx/sfx_08_10.asm new file mode 100644 index 00000000..bd950a44 --- /dev/null +++ b/music/sfx/sfx_08_10.asm @@ -0,0 +1,9 @@ +SFX_08_10_Ch1: ; 2034e (8:434e) + note D_, 3 + note A_, 2 + note D_, 9 + note D_, 1 + note G_, 2 + note C#, 9 + endchannel +; 0x20355 \ No newline at end of file diff --git a/music/sfx/sfx_08_11.asm b/music/sfx/sfx_08_11.asm new file mode 100644 index 00000000..e082f04a --- /dev/null +++ b/music/sfx/sfx_08_11.asm @@ -0,0 +1,6 @@ +SFX_08_11_Ch1: ; 20355 (8:4355) + note D_, 1 + note A_, 2 + note D_, 3 + endchannel +; 0x20359 \ No newline at end of file diff --git a/music/sfx/sfx_08_12.asm b/music/sfx/sfx_08_12.asm new file mode 100644 index 00000000..33465cb2 --- /dev/null +++ b/music/sfx/sfx_08_12.asm @@ -0,0 +1,6 @@ +SFX_08_12_Ch1: ; 20359 (8:4359) + note D_, 1 + note G_, 2 + note D_, 3 + endchannel +; 0x2035d \ No newline at end of file diff --git a/music/sfx/sfx_08_13.asm b/music/sfx/sfx_08_13.asm new file mode 100644 index 00000000..6af5c28a --- /dev/null +++ b/music/sfx/sfx_08_13.asm @@ -0,0 +1,6 @@ +SFX_08_13_Ch1: ; 2035d (8:435d) + note D_, 1 + note F#, 2 + note D_, 3 + endchannel +; 0x20361 \ No newline at end of file diff --git a/music/sfx/sfx_08_14.asm b/music/sfx/sfx_08_14.asm new file mode 100644 index 00000000..a7726bfb --- /dev/null +++ b/music/sfx/sfx_08_14.asm @@ -0,0 +1,46 @@ +SFX_08_14_Ch1: ; 20c2f (8:4c2f) + dutycycle 245 + note D_, 5 + unknownmusic0xf3 + note C#, 9 + note C_, 8 + note D_, 16 + octave 3 + note A_, 9 + note C_, 8 + note D_, 9 + note A_, 2 + note F_, 9 + note C_, 8 + endchannel + + +SFX_08_14_Ch2: ; 20c3e (8:4c3e) + dutycycle 160 + note D_, 6 + note B_, 4 + note C_, 9 + note C_, 8 + note D_, 16 + rest 6 + note G#, 9 + note C_, 8 + note D_, 9 + note G_, 2 + note E_, 9 + note C_, 8 + endchannel + + +SFX_08_14_Ch3: ; 20c4d (8:4c4d) + note D_, 4 + note A#, 2 + note C#, 13 + note D_, 15 + note A_, 5 + note D_, 13 + note D_, 9 + note G#, 2 + note C#, 13 + endchannel +; 0x20c57 \ No newline at end of file diff --git a/music/sfx/sfx_08_15.asm b/music/sfx/sfx_08_15.asm new file mode 100644 index 00000000..fc856df2 --- /dev/null +++ b/music/sfx/sfx_08_15.asm @@ -0,0 +1,55 @@ +SFX_08_15_Ch1: ; 20e3f (8:4e3f) + dutycycle 160 + note D_, 5 + unknownmusic0xf3 + note C_, 1 + note C_, 7 + note D_, 9 + notetype 5, 6, 0 + note C_, 8 + note D_, 4 + octave 6 + note D_, 1 + note C_, 8 + note D_, 9 + notetype 1, 1, 0 + note C_, 8 + endchannel + + +SFX_08_15_Ch2: ; 20e52 (8:4e52) + dutycycle 90 + note D_, 6 + note B_, 4 + unknownmusic0xf1 + note C_, 7 + note D_, 8 + rest 6 + note F_, 3 + note C_, 8 + note D_, 4 + note A#, 3 + note C#, 2 + note C_, 8 + note D_, 9 + note B_, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_08_15_Ch3: ; 20e65 (8:4e65) + note D_, 4 + note A#, 3 + note D#, 13 + note D_, 13 + note A_, 5 + note D_, 13 + note D_, 4 + note G#, 3 + note C#, 13 + note D_, 9 + note G_, 2 + note D_, 13 + endchannel +; 0x20e72 \ No newline at end of file diff --git a/music/sfx/sfx_08_16.asm b/music/sfx/sfx_08_16.asm new file mode 100644 index 00000000..b34a3287 --- /dev/null +++ b/music/sfx/sfx_08_16.asm @@ -0,0 +1,35 @@ +SFX_08_16_Ch1: ; 20db4 (8:4db4) + duty 0 + note D_, 9 + unknownmusic0xf5 + note G#, 1 + note C_, 5 + note D_, 3 + octave 7 + octave 8 + note C_, 6 + note D_, 9 + notetype 1, 13, 12 + note C_, 6 + endchannel + + +SFX_08_16_Ch2: ; 20dc3 (8:4dc3) + dutycycle 165 + note D_, 8 + note A_, 6 + note E_, 2 + note C_, 5 + note D_, 3 + note G#, 2 + note D_, 2 + note C_, 6 + note D_, 9 + note F#, 2 + note C#, 11 + note C_, 6 + + +SFX_08_16_Ch3: ; 20dd1 (8:4dd1) + endchannel +; 0x20dd2 \ No newline at end of file diff --git a/music/sfx/sfx_08_17.asm b/music/sfx/sfx_08_17.asm new file mode 100644 index 00000000..46d47843 --- /dev/null +++ b/music/sfx/sfx_08_17.asm @@ -0,0 +1,78 @@ +SFX_08_17_Ch1: ; 20b4e (8:4b4e) + dutycycle 240 + note D_, 5 + unknownmusic0xf7 + note C_, 9 + note C_, 7 + note D_, 7 + octave 2 + note C_, 1 + note C_, 7 + note D_, 7 + notetype 7, 15, 0 + note C_, 6 + note D_, 7 + rest 5 + octave 8 + note C_, 6 + note D_, 6 + notetype 3, 12, 0 + note C_, 6 + note D_, 5 + notetype 3, 10, 0 + note C_, 6 + note D_, 9 + octave 7 + note G#, 1 + note C_, 6 + endchannel + + +SFX_08_17_Ch2: ; 20b6d (8:4b6d) + dutycycle 10 + note D_, 5 + rest 8 + note C_, 5 + note C_, 6 + note D_, 7 + note A#, 7 + note C_, 3 + note C_, 6 + note D_, 7 + note A_, 8 + unknownmusic0xf1 + note C_, 5 + note D_, 5 + note B_, 5 + octave 7 + note C_, 5 + note D_, 6 + note A#, 4 + rest 3 + note C_, 5 + note D_, 5 + note B_, 4 + note A#, 4 + note C_, 5 + note D_, 9 + rest 2 + note G#, 3 + note C_, 5 + endchannel + + +SFX_08_17_Ch3: ; 20b8c (8:4b8c) + note D_, 13 + octave 4 + note E_, 13 + note D_, 11 + rest 8 + note F_, 13 + note D_, 13 + note B_, 7 + note E_, 13 + note D_, 16 + note A#, 3 + note F_, 13 + endchannel +; 0x20b99 \ No newline at end of file diff --git a/music/sfx/sfx_08_18.asm b/music/sfx/sfx_08_18.asm new file mode 100644 index 00000000..55fc8cb6 --- /dev/null +++ b/music/sfx/sfx_08_18.asm @@ -0,0 +1,81 @@ +SFX_08_18_Ch1: ; 20efd (8:4efd) + dutycycle 240 + note D_, 5 + unknownmusic0xf7 + note A#, 1 + note C_, 7 + note D_, 9 + octave 2 + note A#, 5 + note C_, 7 + note D_, 5 + notetype 6, 10, 0 + note C_, 7 + note D_, 13 + notetype 3, 2, 0 + note C_, 7 + note D_, 9 + rest 4 + note D_, 5 + note C_, 7 + note D_, 5 + rest 3 + note D_, 1 + note C_, 7 + note D_, 9 + note B_, 2 + note C#, 1 + note C_, 7 + endchannel + + +SFX_08_18_Ch2: ; 20f1c (8:4f1c) + dutycycle 90 + note D_, 5 + octave 1 + note C_, 2 + note C_, 7 + note D_, 9 + notetype 6, 0, 3 + note C_, 7 + note D_, 5 + rest 7 + note C_, 2 + note C_, 7 + note D_, 13 + rest 4 + note G#, 2 + note C_, 6 + note D_, 9 + note B_, 4 + note G#, 4 + note C_, 6 + note D_, 5 + note B_, 3 + note G#, 3 + note C_, 6 + note D_, 9 + note A#, 2 + note G_, 2 + note C_, 6 + endchannel + + +SFX_08_18_Ch3: ; 20f3b (8:4f3b) + note D_, 8 + notetype 6, 5, 12 + note D_, 9 + octave 2 + note E_, 13 + note D_, 5 + notetype 4, 5, 12 + note D_, 5 + notetype 4, 4, 12 + note D_, 8 + rest 4 + note E_, 13 + note D_, 9 + note A#, 2 + note F_, 13 + endchannel +; 0x20f4e \ No newline at end of file diff --git a/music/sfx/sfx_08_19.asm b/music/sfx/sfx_08_19.asm new file mode 100644 index 00000000..ed88daf3 --- /dev/null +++ b/music/sfx/sfx_08_19.asm @@ -0,0 +1,42 @@ +SFX_08_19_Ch1: ; 20cdd (8:4cdd) + dutycycle 10 + note D_, 7 + octave 6 + note C_, 1 + note C_, 6 + note D_, 7 + octave 5 + note G#, 1 + note C_, 6 + note D_, 7 + notetype 3, 7, 0 + note C_, 6 + note D_, 9 + note A#, 2 + note F#, 1 + note C_, 6 + endchannel + + +SFX_08_19_Ch2: ; 20cf0 (8:4cf0) + dutycycle 245 + note D_, 7 + octave 6 + note G#, 3 + note C_, 5 + note D_, 7 + notetype 3, 0, 1 + note C_, 6 + note D_, 7 + note B_, 3 + octave 6 + note C_, 5 + note D_, 9 + note G#, 2 + rest 2 + note C_, 5 + + +SFX_08_19_Ch3: ; 20d02 (8:4d02) + endchannel +; 0x20d03 \ No newline at end of file diff --git a/music/sfx/sfx_08_1a.asm b/music/sfx/sfx_08_1a.asm new file mode 100644 index 00000000..0c96762e --- /dev/null +++ b/music/sfx/sfx_08_1a.asm @@ -0,0 +1,51 @@ +SFX_08_1a_Ch1: ; 20c87 (8:4c87) + dutycycle 250 + note D_, 7 + note G#, 4 + note E_, 8 + note C_, 3 + note D_, 16 + note F#, 3 + note D_, 7 + note C_, 3 + note D_, 5 + note F_, 3 + note E_, 6 + note C_, 3 + note D_, 10 + note F#, 4 + note C_, 7 + note C_, 3 + note D_, 16 + note G#, 3 + note D_, 6 + note C_, 3 + note D_, 16 + note E_, 3 + note C_, 8 + note C_, 3 + + +SFX_08_1a_Ch2: ; 20ca1 (8:4ca1) + endchannel + + +SFX_08_1a_Ch3: ; 20ca2 (8:4ca2) + note D_, 9 + notetype 4, 8, 12 + note D_, 5 + octave 6 + note A_, 13 + note D_, 16 + rest 7 + note G#, 13 + note D_, 9 + octave 4 + note A#, 13 + note D_, 16 + notetype 7, 9, 12 + note D_, 16 + unknownmusic0xf2 + note A#, 13 + endchannel +; 0x20cb5 \ No newline at end of file diff --git a/music/sfx/sfx_08_1b.asm b/music/sfx/sfx_08_1b.asm new file mode 100644 index 00000000..1d63d05e --- /dev/null +++ b/music/sfx/sfx_08_1b.asm @@ -0,0 +1,45 @@ +SFX_08_1b_Ch1: ; 20cb5 (8:4cb5) + dutycycle 240 + note D_, 5 + unknownmusic0xf3 + octave 8 + note C_, 7 + note D_, 16 + octave 4 + note E_, 1 + note C_, 7 + note D_, 9 + rest 2 + note D_, 1 + note C_, 7 + endchannel + + +SFX_08_1b_Ch2: ; 20cc4 (8:4cc4) + dutycycle 10 + note D_, 4 + rest 4 + note G#, 4 + note C_, 7 + note D_, 15 + note B_, 5 + note C_, 3 + note C_, 7 + note D_, 9 + note A#, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_08_1b_Ch3: ; 20cd3 (8:4cd3) + note D_, 5 + notetype 3, 5, 12 + note D_, 16 + octave 2 + note E_, 13 + note D_, 9 + note B_, 2 + note F_, 13 + endchannel +; 0x20cdd \ No newline at end of file diff --git a/music/sfx/sfx_08_1c.asm b/music/sfx/sfx_08_1c.asm new file mode 100644 index 00000000..0f01428f --- /dev/null +++ b/music/sfx/sfx_08_1c.asm @@ -0,0 +1,51 @@ +SFX_08_1c_Ch1: ; 20ecd (8:4ecd) + dutycycle 240 + note D_, 16 + unknownmusic0xf6 + note F#, 6 + note C_, 6 + note D_, 11 + octave 4 + note G_, 13 + note C_, 6 + note D_, 4 + rest 3 + note F_, 13 + note C_, 6 + note D_, 16 + note B_, 3 + note D#, 13 + note C_, 6 + endchannel + + +SFX_08_1c_Ch2: ; 20ee0 (8:4ee0) + dutycycle 90 + note D_, 15 + notetype 6, 0, 3 + note C_, 6 + note D_, 10 + note B_, 5 + note C#, 12 + note C_, 6 + note D_, 5 + note A_, 3 + unknownmusic0xfa + note C_, 5 + note D_, 16 + note A#, 3 + notetype 11, 0, 4 + endchannel + + +SFX_08_1c_Ch3: ; 20ef3 (8:4ef3) + note D_, 13 + octave 2 + note E_, 13 + note D_, 12 + notetype 7, 5, 12 + note D_, 16 + rest 3 + note E_, 13 + endchannel +; 0x20efd \ No newline at end of file diff --git a/music/sfx/sfx_08_1d.asm b/music/sfx/sfx_08_1d.asm new file mode 100644 index 00000000..ea7c944d --- /dev/null +++ b/music/sfx/sfx_08_1d.asm @@ -0,0 +1,83 @@ +SFX_08_1d_Ch1: ; 209d7 (8:49d7) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + note A#, 1 + note C_, 8 + note D_, 7 + octave 2 + note A#, 4 + note C_, 8 + note D_, 11 + unknownmusic0xf4 + note A#, 1 + note C_, 8 + dutycycle 165 + note D_, 11 + unknownmusic0xf6 + notetype 8, 0, 7 + note D_, 5 + octave 5 + notetype 7, 0, 7 + note D_, 16 + unknownmusic0xf2 + notetype 8, 0, 7 + endchannel + + +SFX_08_1d_Ch2: ; 209f4 (8:49f4) + dutycycle 5 + note D_, 3 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 16 + note A#, 8 + note A#, 2 + note C_, 7 + note D_, 7 + note G#, 7 + note A#, 3 + note C_, 7 + note D_, 11 + note G_, 5 + note A#, 2 + note C_, 7 + dutycycle 95 + note D_, 11 + note G_, 7 + notetype 6, 0, 6 + note D_, 5 + note G#, 4 + notetype 9, 0, 6 + note D_, 16 + note A#, 3 + notetype 7, 0, 6 + endchannel + + +SFX_08_1d_Ch3: ; 20a15 (8:4a15) + note D_, 3 + unknownmusic0xf2 + note D#, 13 + note D_, 9 + octave 4 + note D#, 15 + note D_, 16 + notetype 7, 3, 12 + note D_, 7 + rest 6 + note D#, 12 + note D_, 7 + octave 4 + note D#, 14 + note D_, 9 + note B_, 7 + note D#, 13 + note D_, 7 + notetype 4, 3, 13 + note D_, 9 + rest 2 + note D#, 12 + endchannel +; 0x20a2e \ No newline at end of file diff --git a/music/sfx/sfx_08_1e.asm b/music/sfx/sfx_08_1e.asm new file mode 100644 index 00000000..8b116c46 --- /dev/null +++ b/music/sfx/sfx_08_1e.asm @@ -0,0 +1,94 @@ +SFX_08_1e_Ch1: ; 20e72 (8:4e72) + dutycycle 240 + note D_, 9 + unknownmusic0xf7 + octave 8 + note C_, 7 + note D_, 7 + octave 2 + octave 3 + note C_, 7 + note D_, 4 + unknownmusic0xf4 + octave 8 + note C_, 7 + note D_, 4 + unknownmusic0xf6 + notetype 0, 0, 6 + note D_, 4 + octave 5 + rest 1 + note C_, 7 + note D_, 5 + unknownmusic0xf2 + note B_, 1 + note C_, 7 + note D_, 16 + note A#, 3 + rest 9 + note C_, 7 + endchannel + + +SFX_08_1e_Ch2: ; 20e91 (8:4e91) + dutycycle 5 + note D_, 4 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 9 + note A#, 8 + note A#, 2 + note C_, 7 + note D_, 7 + note G#, 7 + note A#, 4 + note C_, 7 + note D_, 4 + note G_, 5 + note A#, 2 + note C_, 7 + note D_, 4 + note G_, 7 + note A_, 2 + note C_, 7 + note D_, 4 + note G#, 4 + note G#, 3 + note C_, 7 + note D_, 5 + note A#, 3 + note G_, 2 + note C_, 7 + note D_, 16 + note G_, 3 + note G#, 10 + note C_, 7 + endchannel + + +SFX_08_1e_Ch3: ; 20eb4 (8:4eb4) + note D_, 3 + unknownmusic0xf2 + note D#, 13 + note D_, 9 + octave 4 + note D#, 15 + note D_, 9 + notetype 7, 3, 12 + note D_, 6 + rest 6 + note D#, 12 + note D_, 4 + notetype 4, 2, 12 + note D_, 3 + note B_, 7 + note D#, 13 + note D_, 4 + note A#, 5 + note D_, 13 + note D_, 9 + note A_, 2 + note D#, 13 + endchannel +; 0x20ecd \ No newline at end of file diff --git a/music/sfx/sfx_08_1f.asm b/music/sfx/sfx_08_1f.asm new file mode 100644 index 00000000..081b729c --- /dev/null +++ b/music/sfx/sfx_08_1f.asm @@ -0,0 +1,98 @@ +SFX_08_1f_Ch1: ; 20d03 (8:4d03) + dutycycle 204 + note D_, 5 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 5 + octave 7 + note G#, 1 + note C_, 8 + note D_, 5 + notetype 1, 4, 0 + note C_, 8 + note D_, 5 + octave 7 + note E_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + note D_, 5 + notetype 1, 0, 0 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 5 + notetype 1, 8, 2 + note C_, 8 + note D_, 5 + rest 2 + note E_, 3 + note C_, 8 + note D_, 9 + note B_, 2 + note E_, 2 + note C_, 8 + endchannel + + +SFX_08_1f_Ch2: ; 20d2e (8:4d2e) + dutycycle 68 + note D_, 13 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 5 + octave 7 + note G#, 3 + note C_, 8 + note D_, 5 + notetype 1, 4, 1 + note C_, 8 + note D_, 5 + octave 7 + note E_, 2 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note G#, 3 + note C_, 8 + note D_, 9 + notetype 1, 0, 1 + note C_, 8 + endchannel + + +SFX_08_1f_Ch3: ; 20d4d (8:4d4d) + note D_, 16 + note C_, 9 + note C_, 1 + note D_, 5 + note C_, 9 + note C_, 1 + note D_, 5 + notetype 1, 4, 12 + note D_, 5 + note B_, 2 + note D_, 13 + note D_, 5 + notetype 1, 3, 12 + note D_, 5 + note B_, 2 + note D#, 13 + note D_, 5 + rest 2 + note D_, 13 + note D_, 9 + note A#, 2 + note E_, 13 + endchannel +; 0x20d66 \ No newline at end of file diff --git a/music/sfx/sfx_08_20.asm b/music/sfx/sfx_08_20.asm new file mode 100644 index 00000000..94432f09 --- /dev/null +++ b/music/sfx/sfx_08_20.asm @@ -0,0 +1,80 @@ +SFX_08_20_Ch1: ; 20d66 (8:4d66) + dutycycle 204 + note D_, 9 + unknownmusic0xf5 + note C_, 1 + note C_, 7 + note D_, 3 + notetype 2, 3, 8 + note C_, 7 + note D_, 3 + rest 3 + note D#, 1 + note C_, 7 + note D_, 3 + rest 3 + note D_, 9 + note C_, 7 + note D_, 3 + note B_, 3 + note D_, 1 + note C_, 7 + note D_, 3 + note B_, 3 + note C#, 1 + note C_, 7 + note D_, 3 + note A#, 3 + note C#, 9 + note C_, 7 + note D_, 3 + note B_, 3 + note C#, 1 + note C_, 7 + note D_, 9 + rest 2 + note D_, 1 + note C_, 7 + endchannel + + +SFX_08_20_Ch2: ; 20d8d (8:4d8d) + dutycycle 68 + note D_, 13 + rest 4 + rest 1 + note C_, 6 + note D_, 4 + note B_, 2 + unknownmusic0xf9 + note C_, 6 + note D_, 3 + note A#, 2 + unknownmusic0xf1 + note C_, 6 + note D_, 3 + note A#, 2 + unknownmusic0xe9 + note C_, 6 + note D_, 3 + note A_, 2 + octave 7 + note C_, 6 + note D_, 3 + note A_, 2 + notetype 9, 0, 5 + note D_, 3 + note G#, 2 + notetype 1, 0, 5 + note D_, 3 + note A_, 2 + notetype 9, 0, 5 + note D_, 9 + note A_, 2 + octave 7 + note C_, 6 + + +SFX_08_20_Ch3: ; 20db3 (8:4db3) + endchannel +; 0x20db4 \ No newline at end of file diff --git a/music/sfx/sfx_08_21.asm b/music/sfx/sfx_08_21.asm new file mode 100644 index 00000000..d6cadd3b --- /dev/null +++ b/music/sfx/sfx_08_21.asm @@ -0,0 +1,106 @@ +SFX_08_21_Ch1: ; 20dd2 (8:4dd2) + dutycycle 136 + note D_, 6 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note D_, 10 + notetype 1, 6, 0 + note C_, 7 + note D_, 6 + octave 6 + note C#, 3 + note C_, 7 + note D_, 10 + rest 2 + note D_, 3 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 1 + note C_, 7 + note D_, 7 + notetype 1, 2, 0 + note C_, 7 + loopchannel 2, SFX_08_21_Ch1 + endchannel + + +SFX_08_21_Ch2: ; 20df1 (8:4df1) + dutycycle 64 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 6 + unknownmusic0xf2 + note F_, 2 + note C_, 7 + note D_, 10 + notetype 1, 6, 1 + note C_, 7 + note D_, 6 + octave 6 + note C#, 5 + note C_, 7 + note D_, 9 + rest 2 + note D_, 5 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 2 + note C_, 7 + note D_, 13 + notetype 1, 2, 1 + note C_, 7 + note D_, 6 + octave 6 + note C#, 5 + note C_, 7 + note D_, 9 + rest 2 + note D_, 5 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 2 + note C_, 7 + note D_, 5 + notetype 1, 2, 1 + note C_, 7 + endchannel + + +SFX_08_21_Ch3: ; 20e20 (8:4e20) + note D_, 7 + notetype 2, 1, 12 + note D_, 10 + note B_, 2 + note D_, 13 + note D_, 9 + rest 3 + note D_, 13 + note D_, 10 + note B_, 2 + note D#, 13 + note D_, 7 + rest 3 + note D_, 13 + note D_, 10 + note A#, 3 + note D#, 13 + note D_, 8 + rest 3 + note D_, 13 + note D_, 6 + note A#, 2 + note D#, 13 + note D_, 10 + rest 3 + note D_, 13 + note D_, 5 + note A#, 2 + note D#, 13 + endchannel +; 0x20e3f \ No newline at end of file diff --git a/music/sfx/sfx_08_22.asm b/music/sfx/sfx_08_22.asm new file mode 100644 index 00000000..5e2c3b20 --- /dev/null +++ b/music/sfx/sfx_08_22.asm @@ -0,0 +1,54 @@ +SFX_08_22_Ch1: ; 20c57 (8:4c57) + dutycycle 165 + note D_, 5 + octave 7 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf2 + note G#, 1 + note C_, 8 + note D_, 3 + note A_, 3 + note E_, 1 + note C_, 8 + note D_, 9 + octave 7 + note C_, 1 + note C_, 7 + endchannel + + +SFX_08_22_Ch2: ; 20c6a (8:4c6a) + dutycycle 10 + note D_, 5 + note B_, 2 + octave 7 + note C_, 7 + note D_, 4 + rest 3 + octave 7 + note C_, 7 + note D_, 4 + note F#, 3 + note G#, 2 + note C_, 7 + note D_, 9 + note B_, 2 + octave 7 + note C_, 6 + endchannel + + +SFX_08_22_Ch3: ; 20c7d (8:4c7d) + note D_, 3 + note F#, 2 + note D#, 3 + note D_, 3 + note F#, 2 + note D_, 2 + note D_, 9 + note F#, 2 + note C#, 2 + endchannel +; 0x20c87 \ No newline at end of file diff --git a/music/sfx/sfx_08_23.asm b/music/sfx/sfx_08_23.asm new file mode 100644 index 00000000..90edadb7 --- /dev/null +++ b/music/sfx/sfx_08_23.asm @@ -0,0 +1,75 @@ +SFX_08_23_Ch1: ; 20b99 (8:4b99) + dutycycle 241 + note D_, 5 + unknownmusic0xf7 + rest 1 + note C_, 8 + note D_, 13 + octave 2 + rest 3 + note C_, 8 + note D_, 7 + note B_, 6 + note G#, 1 + note C_, 7 + note D_, 5 + rest 5 + note G_, 1 + note C_, 7 + note D_, 5 + note B_, 6 + note F#, 1 + note C_, 7 + note D_, 9 + rest 2 + note E_, 1 + note C_, 7 + endchannel + + +SFX_08_23_Ch2: ; 20bb4 (8:4bb4) + dutycycle 204 + note D_, 4 + rest 8 + note G#, 2 + note C_, 8 + note D_, 13 + note B_, 7 + note G#, 1 + note C_, 8 + note D_, 7 + note A#, 6 + note E_, 2 + note C_, 7 + note D_, 5 + rest 5 + note D#, 3 + note C_, 7 + note D_, 7 + note B_, 6 + note D_, 2 + note C_, 7 + note D_, 9 + note A#, 2 + note C_, 3 + note C_, 7 + endchannel + + +SFX_08_23_Ch3: ; 20bcf (8:4bcf) + note D_, 4 + octave 4 + note D#, 13 + note D_, 13 + notetype 6, 2, 12 + note D_, 5 + octave 4 + note D#, 13 + note D_, 9 + note B_, 8 + note F_, 13 + note D_, 16 + rest 3 + note F_, 14 + endchannel +; 0x20bdf \ No newline at end of file diff --git a/music/sfx/sfx_08_24.asm b/music/sfx/sfx_08_24.asm new file mode 100644 index 00000000..be3be69d --- /dev/null +++ b/music/sfx/sfx_08_24.asm @@ -0,0 +1,83 @@ +SFX_08_24_Ch1: ; 20bdf (8:4bdf) + dutycycle 201 + note D_, 9 + unknownmusic0xf7 + note G#, 1 + note C_, 7 + note D_, 3 + unknownmusic0xf7 + note F#, 1 + note C_, 7 + note D_, 2 + octave 1 + note E_, 1 + note C_, 7 + note D_, 2 + octave 1 + note D_, 1 + note C_, 7 + note D_, 16 + notetype 1, 0, 0 + note C_, 7 + note D_, 5 + rest 8 + note E_, 1 + note C_, 8 + note D_, 5 + note A#, 8 + note D#, 1 + note C_, 8 + note D_, 16 + note A_, 2 + note D_, 1 + note C_, 8 + endchannel + + +SFX_08_24_Ch2: ; 20c02 (8:4c02) + dutycycle 121 + note D_, 11 + octave 1 + note G#, 3 + note C_, 7 + note D_, 3 + octave 1 + note F#, 3 + note C_, 7 + note D_, 2 + notetype 7, 4, 2 + note C_, 7 + note D_, 2 + notetype 7, 2, 2 + note C_, 7 + note D_, 16 + rest 2 + note C_, 3 + note C_, 7 + note D_, 5 + note B_, 8 + note E_, 3 + note C_, 8 + note D_, 3 + note A_, 8 + note D#, 3 + note C_, 8 + note D_, 16 + note G#, 2 + note D_, 3 + note C_, 8 + endchannel + + +SFX_08_24_Ch3: ; 20c25 (8:4c25) + note D_, 5 + note G_, 5 + note D_, 2 + note D_, 5 + note G_, 5 + note C#, 1 + note D_, 5 + note G_, 2 + note D_, 1 + endchannel +; 0x20c2f \ No newline at end of file diff --git a/music/sfx/sfx_08_25.asm b/music/sfx/sfx_08_25.asm new file mode 100644 index 00000000..ab680595 --- /dev/null +++ b/music/sfx/sfx_08_25.asm @@ -0,0 +1,87 @@ +SFX_08_25_Ch1: ; 20abb (8:4abb) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + note A#, 1 + note C_, 8 + note D_, 9 + octave 2 + note A#, 5 + note C_, 8 + note D_, 5 + notetype 6, 10, 0 + note C_, 8 + note D_, 16 + notetype 3, 2, 0 + note C_, 8 + note D_, 9 + rest 4 + note D_, 4 + note C_, 8 + note D_, 3 + rest 3 + note D_, 9 + note C_, 8 + note D_, 9 + note B_, 2 + note D#, 1 + note C_, 8 + endchannel + + +SFX_08_25_Ch2: ; 20ada (8:4ada) + dutycycle 10 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 7 + note A#, 8 + note E_, 2 + note C_, 8 + note D_, 9 + note G#, 7 + note E_, 4 + note C_, 8 + note D_, 5 + note G_, 7 + note E_, 2 + note C_, 8 + note D_, 14 + note G#, 4 + rest 3 + note C_, 7 + note D_, 8 + note G_, 4 + rest 2 + note C_, 7 + note D_, 4 + note G#, 3 + rest 13 + note C_, 7 + note D_, 9 + note G_, 2 + notetype 8, 0, 6 + endchannel + + +SFX_08_25_Ch3: ; 20afd (8:4afd) + note D_, 3 + unknownmusic0xf2 + note E_, 13 + note D_, 7 + octave 2 + note D#, 11 + note D_, 5 + notetype 7, 3, 10 + note D_, 7 + notetype 6, 2, 12 + note D_, 9 + octave 3 + note D#, 13 + note D_, 13 + notetype 2, 3, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x20b13 \ No newline at end of file diff --git a/music/sfx/sfx_08_26.asm b/music/sfx/sfx_08_26.asm new file mode 100644 index 00000000..5b886f93 --- /dev/null +++ b/music/sfx/sfx_08_26.asm @@ -0,0 +1,52 @@ +SFX_08_26_Ch1: ; 20fd3 (8:4fd3) + dutycycle 165 + note D_, 13 + unknownmusic0xf2 + note E_, 1 + note C_, 5 + note D_, 16 + octave 5 + note A#, 1 + note C_, 5 + note D_, 5 + notetype 2, 9, 0 + note C_, 5 + note D_, 9 + notetype 1, 8, 0 + note C_, 5 + endchannel + + +SFX_08_26_Ch2: ; 20fe6 (8:4fe6) + dutycycle 238 + note D_, 12 + notetype 2, 3, 8 + note C_, 5 + note D_, 15 + rest 7 + note A_, 9 + note C_, 5 + note D_, 4 + note B_, 3 + note G#, 9 + note C_, 5 + note D_, 9 + note B_, 2 + note G_, 9 + note C_, 5 + endchannel + + +SFX_08_26_Ch3: ; 20ff9 (8:4ff9) + note D_, 11 + octave 2 + note F#, 13 + note D_, 16 + notetype 2, 5, 12 + note D_, 4 + rest 3 + note F#, 13 + note D_, 9 + notetype 1, 5, 12 + endchannel +; 0x21006 \ No newline at end of file diff --git a/music/sfx/sfx_08_27.asm b/music/sfx/sfx_08_27.asm new file mode 100644 index 00000000..8599f13a --- /dev/null +++ b/music/sfx/sfx_08_27.asm @@ -0,0 +1,74 @@ +SFX_08_27_Ch1: ; 21006 (8:5006) + dutycycle 51 + note D_, 16 + unknownmusic0xf6 + rest 1 + note C_, 6 + note D_, 9 + octave 5 + note B_, 13 + note C_, 6 + note D_, 7 + notetype 2, 13, 0 + note C_, 6 + note D_, 7 + note B_, 3 + octave 8 + note C_, 6 + note D_, 7 + rest 3 + stereopanning 5 + note D_, 9 + note B_, 2 + note C_, 1 + note C_, 7 + endchannel + + +SFX_08_27_Ch2: ; 21021 (8:5021) + dutycycle 153 + note D_, 15 + rest 7 + note B_, 2 + note C_, 5 + note D_, 8 + rest 4 + note A#, 14 + note C_, 5 + note D_, 6 + note B_, 3 + rest 2 + note C_, 5 + note D_, 9 + note A_, 3 + notetype 1, 0, 4 + note D_, 7 + note A#, 3 + octave 7 + note C_, 5 + note D_, 9 + note A_, 2 + unknownmusic0xf1 + note C_, 5 + endchannel + + +SFX_08_27_Ch3: ; 2103c (8:503c) + note D_, 11 + octave 2 + note F_, 13 + note D_, 11 + notetype 6, 6, 12 + note D_, 5 + rest 3 + note E_, 13 + note D_, 7 + notetype 3, 5, 12 + note D_, 9 + note B_, 4 + note E_, 13 + note D_, 9 + note A#, 2 + note F_, 13 + endchannel +; 0x2104f \ No newline at end of file diff --git a/music/sfx/sfx_08_28.asm b/music/sfx/sfx_08_28.asm new file mode 100644 index 00000000..78931129 --- /dev/null +++ b/music/sfx/sfx_08_28.asm @@ -0,0 +1,44 @@ +SFX_08_28_Ch1: ; 2104f (8:504f) + dutycycle 240 + note D_, 9 + octave 4 + note A_, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf5 + rest 1 + note C_, 8 + note D_, 9 + notetype 1, 13, 8 + note C_, 8 + endchannel + + +SFX_08_28_Ch2: ; 2105e (8:505e) + dutycycle 165 + note D_, 11 + rest 5 + note G_, 2 + note C_, 8 + note D_, 16 + note B_, 7 + note A#, 3 + note C_, 8 + note D_, 9 + note A#, 2 + note B_, 8 + note C_, 8 + endchannel + + +SFX_08_28_Ch3: ; 2106d (8:506d) + note D_, 9 + octave 4 + note E_, 13 + note D_, 15 + rest 5 + note D#, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x21077 \ No newline at end of file diff --git a/music/sfx/sfx_08_29.asm b/music/sfx/sfx_08_29.asm new file mode 100644 index 00000000..58a91cb0 --- /dev/null +++ b/music/sfx/sfx_08_29.asm @@ -0,0 +1,76 @@ +SFX_08_29_Ch1: ; 210dd (8:50dd) + dutycycle 240 + note D_, 5 + unknownmusic0xf3 + note G#, 1 + note C_, 8 + note D_, 16 + octave 1 + note C_, 1 + note C_, 8 + note D_, 9 + notetype 3, 1, 0 + note C_, 8 + note D_, 5 + rest 3 + note C_, 1 + note C_, 8 + note D_, 5 + notetype 2, 15, 0 + note C_, 7 + note D_, 9 + rest 2 + octave 8 + note C_, 7 + endchannel + + +SFX_08_29_Ch2: ; 210f8 (8:50f8) + dutycycle 90 + note D_, 7 + rest 4 + note C_, 2 + note C_, 8 + note D_, 15 + note B_, 8 + note G#, 2 + note C_, 7 + note D_, 8 + note B_, 4 + note A_, 3 + note C_, 7 + note D_, 4 + note A#, 3 + note G#, 2 + note C_, 7 + note D_, 5 + note B_, 3 + note G_, 3 + note C_, 7 + note D_, 9 + note A#, 2 + note F#, 2 + note C_, 7 + endchannel + + +SFX_08_29_Ch3: ; 21113 (8:5113) + note D_, 7 + octave 5 + note F_, 13 + note D_, 15 + notetype 6, 4, 12 + note D_, 7 + rest 7 + note D#, 13 + note D_, 4 + note B_, 4 + note E_, 13 + note D_, 4 + note A#, 3 + note F_, 13 + note D_, 9 + note B_, 2 + note F#, 13 + endchannel +; 0x21126 \ No newline at end of file diff --git a/music/sfx/sfx_08_2a.asm b/music/sfx/sfx_08_2a.asm new file mode 100644 index 00000000..6d7ef179 --- /dev/null +++ b/music/sfx/sfx_08_2a.asm @@ -0,0 +1,44 @@ +SFX_08_2a_Ch1: ; 20f70 (8:4f70) + dutycycle 240 + note D_, 16 + notetype 7, 8, 0 + note C_, 8 + note D_, 5 + octave 2 + note A#, 1 + note C_, 8 + note D_, 16 + notetype 2, 4, 0 + note C_, 8 + endchannel + + +SFX_08_2a_Ch2: ; 20f7f (8:4f7f) + dutycycle 90 + note D_, 16 + rest 8 + note F_, 4 + note C_, 8 + note D_, 6 + note B_, 7 + note G_, 3 + note C_, 8 + note D_, 16 + rest 3 + note C#, 2 + note C_, 8 + endchannel + + +SFX_08_2a_Ch3: ; 20f8e (8:4f8e) + note D_, 14 + unknownmusic0xf6 + note E_, 13 + note D_, 5 + octave 2 + note D#, 13 + note D_, 16 + unknownmusic0xf2 + note E_, 13 + endchannel +; 0x20f98 \ No newline at end of file diff --git a/music/sfx/sfx_08_2b.asm b/music/sfx/sfx_08_2b.asm new file mode 100644 index 00000000..6e2e7127 --- /dev/null +++ b/music/sfx/sfx_08_2b.asm @@ -0,0 +1,56 @@ +SFX_08_2b_Ch1: ; 21126 (8:5126) + dutycycle 15 + note D_, 16 + unknownmusic0xf7 + note C_, 1 + note C_, 6 + note D_, 16 + octave 1 + note C_, 9 + note C_, 6 + note D_, 9 + note B_, 5 + note G#, 1 + note C_, 5 + note D_, 16 + note A#, 3 + note F#, 1 + note C_, 5 + endchannel + + +SFX_08_2b_Ch2: ; 21139 (8:5139) + dutycycle 68 + note D_, 15 + notetype 7, 8, 1 + note C_, 5 + note D_, 15 + rest 8 + note G#, 10 + note C_, 5 + note D_, 11 + note B_, 5 + note C_, 2 + note C_, 5 + note D_, 16 + rest 3 + octave 7 + note C_, 4 + endchannel + + +SFX_08_2b_Ch3: ; 2114c (8:514c) + note D_, 15 + unknownmusic0xf7 + note G_, 13 + note D_, 13 + unknownmusic0xf6 + note F#, 13 + note D_, 10 + octave 4 + note G_, 13 + note D_, 16 + octave 6 + note F#, 13 + endchannel +; 0x21159 \ No newline at end of file diff --git a/music/sfx/sfx_08_2c.asm b/music/sfx/sfx_08_2c.asm new file mode 100644 index 00000000..02479f52 --- /dev/null +++ b/music/sfx/sfx_08_2c.asm @@ -0,0 +1,90 @@ +SFX_08_2c_Ch1: ; 21236 (8:5236) + dutycycle 80 + note D_, 11 + unknownmusic0xf5 + note G#, 1 + note C_, 7 + note D_, 4 + octave 6 + note A#, 1 + note C_, 7 + note D_, 4 + unknownmusic0xf2 + rest 1 + note C_, 7 + note D_, 4 + octave 6 + octave 8 + note C_, 7 + note D_, 4 + notetype 2, 0, 0 + note C_, 8 + note D_, 4 + rest 3 + octave 8 + note C_, 7 + note D_, 4 + notetype 2, 12, 0 + note C_, 7 + note D_, 9 + rest 2 + note A#, 1 + note C_, 7 + endchannel + + +SFX_08_2c_Ch2: ; 21259 (8:5259) + dutycycle 15 + note D_, 10 + notetype 5, 3, 1 + note C_, 7 + note D_, 4 + notetype 2, 5, 2 + note C_, 7 + note D_, 4 + octave 6 + note G_, 2 + note C_, 7 + note D_, 4 + note B_, 3 + note A_, 2 + note C_, 7 + note D_, 4 + rest 3 + note B_, 3 + note C_, 7 + note D_, 4 + note B_, 3 + note A_, 2 + note C_, 7 + note D_, 4 + rest 3 + note G_, 2 + note C_, 7 + note D_, 9 + note B_, 2 + note F_, 2 + note C_, 7 + endchannel + + +SFX_08_2c_Ch3: ; 2127c (8:527c) + note D_, 7 + octave 5 + note E_, 13 + note D_, 5 + rest 4 + note D#, 13 + note D_, 6 + notetype 4, 3, 12 + note D_, 5 + rest 5 + note D_, 13 + note D_, 7 + note B_, 5 + note D#, 13 + note D_, 9 + rest 2 + note D_, 13 + endchannel +; 0x2128f \ No newline at end of file diff --git a/music/sfx/sfx_08_2d.asm b/music/sfx/sfx_08_2d.asm new file mode 100644 index 00000000..3d6aaa3e --- /dev/null +++ b/music/sfx/sfx_08_2d.asm @@ -0,0 +1,38 @@ +SFX_08_2d_Ch1: ; 20f4e (8:4f4e) + dutycycle 27 + note D_, 8 + notetype 2, 4, 0 + note C_, 8 + note D_, 16 + octave 3 + note F#, 1 + note C_, 8 + note D_, 16 + rest 2 + note D#, 1 + note C_, 8 + endchannel + + +SFX_08_2d_Ch2: ; 20f5d (8:4f5d) + dutycycle 129 + note D_, 3 + rest 3 + note C_, 2 + note C_, 8 + note D_, 5 + rest 3 + note C_, 9 + note C_, 8 + note D_, 16 + notetype 7, 4, 1 + note C_, 8 + note D_, 16 + note A#, 3 + note C_, 2 + note C_, 8 + + +SFX_08_2d_Ch3: ; 20f6f (8:4f6f) + endchannel +; 0x20f70 \ No newline at end of file diff --git a/music/sfx/sfx_08_2e.asm b/music/sfx/sfx_08_2e.asm new file mode 100644 index 00000000..e20f9d69 --- /dev/null +++ b/music/sfx/sfx_08_2e.asm @@ -0,0 +1,74 @@ +SFX_08_2e_Ch1: ; 211a7 (8:51a7) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + note E_, 1 + note C_, 8 + note D_, 13 + octave 2 + note E_, 5 + note C_, 8 + note D_, 7 + notetype 5, 5, 0 + note C_, 8 + note D_, 5 + rest 4 + note F#, 1 + note C_, 8 + note D_, 4 + rest 4 + note G#, 1 + note C_, 8 + note D_, 9 + notetype 1, 10, 0 + note C_, 8 + endchannel + + +SFX_08_2e_Ch2: ; 211c2 (8:51c2) + dutycycle 10 + note D_, 7 + rest 8 + note C_, 2 + note C_, 8 + note D_, 12 + note B_, 7 + note C_, 3 + note C_, 8 + note D_, 7 + note A#, 6 + note C#, 2 + note C_, 8 + note D_, 5 + note A_, 4 + note D_, 2 + note C_, 8 + note D_, 4 + note A#, 4 + note E_, 2 + note C_, 8 + note D_, 9 + note A_, 2 + note F#, 3 + note C_, 8 + endchannel + + +SFX_08_2e_Ch3: ; 211dd (8:51dd) + note D_, 4 + octave 6 + note D#, 13 + note D_, 9 + notetype 6, 4, 12 + note D_, 6 + notetype 4, 3, 12 + note D_, 13 + rest 8 + note E_, 13 + note D_, 3 + octave 6 + note D#, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x211f0 \ No newline at end of file diff --git a/music/sfx/sfx_08_2f.asm b/music/sfx/sfx_08_2f.asm new file mode 100644 index 00000000..e72aae9f --- /dev/null +++ b/music/sfx/sfx_08_2f.asm @@ -0,0 +1,61 @@ +SFX_08_2f_Ch1: ; 20f98 (8:4f98) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + rest 1 + note C_, 7 + note D_, 16 + octave 1 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf4 + stereopanning 6 + note D_, 5 + octave 4 + octave 8 + note C_, 7 + note D_, 9 + notetype 1, 13, 0 + note C_, 7 + endchannel + + +SFX_08_2f_Ch2: ; 20faf (8:4faf) + dutycycle 10 + note D_, 8 + octave 2 + note G#, 2 + note C_, 7 + note D_, 15 + notetype 5, 12, 1 + note C_, 7 + note D_, 5 + rest 5 + note B_, 2 + note C_, 7 + note D_, 5 + notetype 4, 10, 1 + note C_, 7 + note D_, 9 + rest 2 + note A_, 2 + note C_, 7 + endchannel + + +SFX_08_2f_Ch3: ; 20fc6 (8:4fc6) + note D_, 11 + note A#, 7 + note D#, 13 + note D_, 15 + note A_, 5 + note D_, 13 + note D_, 6 + note A#, 4 + note D#, 13 + note D_, 9 + note A_, 2 + note D_, 13 + endchannel +; 0x20fd3 \ No newline at end of file diff --git a/music/sfx/sfx_08_30.asm b/music/sfx/sfx_08_30.asm new file mode 100644 index 00000000..55ed2640 --- /dev/null +++ b/music/sfx/sfx_08_30.asm @@ -0,0 +1,80 @@ +SFX_08_30_Ch1: ; 21159 (8:5159) + dutycycle 245 + note D_, 8 + notetype 6, 14, 1 + note C_, 8 + note D_, 7 + rest 7 + octave 6 + note C_, 8 + note D_, 10 + notetype 6, 14, 1 + note C_, 8 + note D_, 8 + rest 7 + octave 8 + note C_, 8 + note D_, 6 + note B_, 7 + octave 6 + note C_, 8 + note D_, 8 + rest 7 + octave 7 + note C_, 8 + note D_, 7 + note B_, 7 + octave 8 + note C_, 8 + note D_, 9 + note A#, 2 + notetype 15, 0, 7 + endchannel + + +SFX_08_30_Ch2: ; 2117c (8:517c) + dutycycle 68 + note D_, 7 + rest 4 + rest 10 + note C_, 8 + note D_, 7 + note B_, 4 + rest 8 + note C_, 8 + note D_, 11 + rest 5 + rest 4 + note C_, 8 + note D_, 9 + note B_, 5 + rest 8 + note C_, 8 + note D_, 7 + rest 4 + rest 10 + note C_, 8 + note D_, 16 + note A#, 3 + rest 6 + note C_, 8 + endchannel + + +SFX_08_30_Ch3: ; 21197 (8:5197) + note D_, 14 + note C#, 10 + note G_, 13 + note D_, 14 + unknownmusic0xf7 + note G#, 13 + note D_, 13 + notetype 6, 7, 12 + note D_, 9 + rest 5 + note F#, 13 + note D_, 16 + note B_, 4 + note F_, 13 + endchannel +; 0x211a7 \ No newline at end of file diff --git a/music/sfx/sfx_08_31.asm b/music/sfx/sfx_08_31.asm new file mode 100644 index 00000000..26caae0f --- /dev/null +++ b/music/sfx/sfx_08_31.asm @@ -0,0 +1,72 @@ +SFX_08_31_Ch1: ; 211f0 (8:51f0) + dutycycle 244 + note D_, 16 + stereopanning 5 + note C_, 8 + note D_, 11 + octave 8 + note C_, 1 + note C_, 8 + note D_, 7 + note B_, 5 + note C#, 1 + note C_, 8 + note D_, 5 + notetype 3, 0, 0 + note C_, 8 + note D_, 7 + note B_, 3 + note D_, 1 + note C_, 7 + note D_, 9 + note A#, 2 + note D_, 5 + note C_, 7 + endchannel + + +SFX_08_31_Ch2: ; 2120b (8:520b) + dutycycle 34 + note D_, 16 + note B_, 1 + rest 4 + note C_, 7 + note D_, 11 + note A#, 1 + rest 2 + note C_, 7 + note D_, 7 + note G#, 5 + notetype 2, 0, 6 + note D_, 5 + note A_, 4 + rest 2 + note C_, 7 + note D_, 7 + note G#, 3 + octave 7 + note C_, 6 + note D_, 9 + note F#, 2 + unknownmusic0xe8 + note C_, 6 + endchannel + + +SFX_08_31_Ch3: ; 21226 (8:5226) + note D_, 7 + octave 2 + note E_, 13 + note D_, 16 + notetype 6, 3, 12 + note D_, 11 + rest 6 + note E_, 11 + note D_, 2 + note B_, 3 + note F_, 12 + note D_, 16 + rest 3 + note E_, 13 + endchannel +; 0x21236 \ No newline at end of file diff --git a/music/sfx/sfx_08_32.asm b/music/sfx/sfx_08_32.asm new file mode 100644 index 00000000..a3787989 --- /dev/null +++ b/music/sfx/sfx_08_32.asm @@ -0,0 +1,105 @@ +SFX_08_32_Ch1: ; 21077 (8:5077) + dutycycle 240 + note D_, 7 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note D_, 7 + octave 6 + note E_, 1 + note C_, 7 + note D_, 7 + notetype 2, 8, 0 + note C_, 7 + note D_, 7 + octave 6 + rest 1 + note C_, 7 + note D_, 7 + notetype 2, 0, 0 + note C_, 8 + note D_, 7 + rest 3 + note E_, 1 + note C_, 8 + note D_, 7 + note B_, 3 + note G#, 1 + note C_, 8 + note D_, 9 + note A#, 2 + rest 1 + note C_, 8 + endchannel + + +SFX_08_32_Ch2: ; 2109a (8:509a) + dutycycle 17 + note D_, 4 + note C_, 9 + note C_, 2 + note C_, 1 + note D_, 7 + rest 3 + rest 2 + note C_, 6 + note D_, 7 + note B_, 3 + note C_, 3 + note C_, 7 + note D_, 7 + note A#, 3 + note E_, 2 + note C_, 7 + note D_, 7 + note B_, 3 + note G#, 3 + note C_, 7 + note D_, 7 + note A#, 3 + rest 3 + note C_, 7 + note D_, 7 + note A_, 3 + note C_, 2 + note C_, 8 + note D_, 7 + note A#, 3 + note E_, 3 + note C_, 8 + note D_, 9 + note G#, 2 + note G#, 2 + note C_, 8 + endchannel + + +SFX_08_32_Ch3: ; 210c1 (8:50c1) + note D_, 7 + note C_, 9 + note C_, 2 + note D_, 6 + octave 6 + note F_, 13 + note D_, 6 + rest 3 + note E_, 13 + note D_, 6 + notetype 2, 3, 12 + note D_, 6 + note B_, 3 + note D_, 13 + note D_, 6 + rest 3 + note C#, 13 + note D_, 6 + note A#, 3 + note C#, 12 + note D_, 6 + note A_, 3 + note C#, 11 + note D_, 9 + note G#, 2 + note C#, 9 + endchannel +; 0x210dd \ No newline at end of file diff --git a/music/sfx/sfx_08_33.asm b/music/sfx/sfx_08_33.asm new file mode 100644 index 00000000..63e69ae1 --- /dev/null +++ b/music/sfx/sfx_08_33.asm @@ -0,0 +1,54 @@ +SFX_08_33_Ch1: ; 2128f (8:528f) + dutycycle 165 + note D_, 4 + unknownmusic0xf4 + note E_, 2 + note C_, 7 + note D_, 14 + notetype 6, 2, 1 + note C_, 8 + note D_, 9 + unknownmusic0xf4 + note C#, 10 + note C_, 8 + note D_, 9 + rest 2 + note C#, 11 + note C_, 8 + endchannel + + +SFX_08_33_Ch2: ; 212a2 (8:52a2) + dutycycle 204 + note D_, 5 + unknownmusic0xf4 + note G#, 1 + note C_, 6 + note D_, 15 + octave 2 + octave 8 + note C_, 7 + note D_, 9 + notetype 5, 13, 8 + note C_, 7 + note D_, 9 + notetype 1, 13, 12 + note C_, 7 + endchannel + + +SFX_08_33_Ch3: ; 212b5 (8:52b5) + note D_, 6 + rest 5 + note E_, 7 + note D_, 14 + note A#, 6 + note E_, 5 + note D_, 9 + rest 5 + note E_, 6 + note D_, 9 + note B_, 2 + note E_, 5 + endchannel +; 0x212c2 \ No newline at end of file diff --git a/music/sfx/sfx_08_34.asm b/music/sfx/sfx_08_34.asm new file mode 100644 index 00000000..c0fe0578 --- /dev/null +++ b/music/sfx/sfx_08_34.asm @@ -0,0 +1,53 @@ +SFX_08_34_Ch1: ; 212c2 (8:52c2) + dutycycle 240 + note D_, 14 + unknownmusic0xf1 + note C#, 2 + note C_, 6 + note D_, 14 + octave 7 + note C#, 6 + note C_, 6 + note D_, 14 + octave 7 + note C#, 2 + note C_, 6 + note D_, 9 + notetype 1, 1, 1 + note C_, 6 + endchannel + + +SFX_08_34_Ch2: ; 212d5 (8:52d5) + dutycycle 21 + note D_, 13 + octave 7 + note C_, 13 + note C_, 6 + note D_, 13 + notetype 1, 1, 0 + note C_, 6 + note D_, 15 + rest 2 + note C_, 13 + note C_, 6 + note D_, 9 + rest 2 + note C_, 11 + note C_, 6 + endchannel + + +SFX_08_34_Ch3: ; 212e8 (8:52e8) + note D_, 15 + unknownmusic0xf2 + note F#, 6 + note D_, 14 + octave 6 + note F_, 6 + note D_, 15 + notetype 2, 5, 6 + note D_, 9 + notetype 1, 6, 6 + endchannel +; 0x212f5 \ No newline at end of file diff --git a/music/sfx/sfx_08_35.asm b/music/sfx/sfx_08_35.asm new file mode 100644 index 00000000..32f9b26d --- /dev/null +++ b/music/sfx/sfx_08_35.asm @@ -0,0 +1,71 @@ +SFX_08_35_Ch1: ; 212f5 (8:52f5) + dutycycle 27 + note D_, 4 + unknownmusic0xf3 + note F#, 5 + note C_, 6 + note D_, 3 + octave 6 + note E_, 5 + note C_, 6 + note D_, 6 + notetype 1, 2, 2 + note C_, 6 + note D_, 3 + note B_, 3 + note G#, 5 + note C_, 5 + note D_, 9 + notetype 1, 10, 2 + note C_, 5 + note D_, 4 + unknownmusic0xf3 + note D_, 5 + note C_, 6 + note D_, 5 + octave 4 + octave 4 + note C_, 5 + note D_, 9 + notetype 1, 0, 2 + note C_, 6 + endchannel + + +SFX_08_35_Ch2: ; 21318 (8:5318) + dutycycle 204 + note D_, 4 + notetype 3, 6, 0 + note C_, 6 + note D_, 3 + rest 3 + note E_, 1 + note C_, 6 + note D_, 6 + rest 2 + note D_, 1 + note C_, 6 + note D_, 3 + note A_, 3 + note G#, 1 + note C_, 5 + note D_, 9 + rest 2 + note A#, 1 + note C_, 5 + note D_, 4 + notetype 3, 2, 0 + note C_, 6 + note D_, 4 + rest 5 + octave 8 + note C_, 5 + note D_, 9 + rest 2 + note C_, 1 + note C_, 6 + + +SFX_08_35_Ch3: ; 2133a (8:533a) + endchannel +; 0x2133b \ No newline at end of file diff --git a/music/sfx/sfx_08_36.asm b/music/sfx/sfx_08_36.asm new file mode 100644 index 00000000..507667a0 --- /dev/null +++ b/music/sfx/sfx_08_36.asm @@ -0,0 +1,56 @@ +SFX_08_36_Ch1: ; 2133b (8:533b) + dutycycle 17 + note D_, 3 + note D#, 14 + note G#, 2 + note C_, 4 + note D_, 8 + unknownmusic0xf5 + note C_, 2 + note C_, 7 + note D_, 2 + rest 3 + note G#, 2 + note C_, 5 + note D_, 9 + note A_, 2 + note G#, 2 + note C_, 4 + endchannel + + +SFX_08_36_Ch2: ; 2134e (8:534e) + dutycycle 238 + note D_, 3 + note D#, 15 + note B_, 1 + note C_, 6 + note D_, 8 + notetype 5, 5, 13 + note C_, 8 + note D_, 2 + note B_, 3 + note B_, 1 + note C_, 7 + note D_, 9 + note F#, 2 + note B_, 1 + note C_, 6 + endchannel + + +SFX_08_36_Ch3: ; 21361 (8:5361) + note D_, 3 + note A_, 3 + note E_, 10 + note D_, 8 + note B_, 6 + note D_, 10 + note D_, 2 + note A#, 3 + note D#, 10 + note D_, 9 + note A_, 2 + note E_, 10 + endchannel +; 0x2136e \ No newline at end of file diff --git a/music/sfx/sfx_08_37.asm b/music/sfx/sfx_08_37.asm new file mode 100644 index 00000000..2805e7d5 --- /dev/null +++ b/music/sfx/sfx_08_37.asm @@ -0,0 +1,59 @@ +SFX_08_37_Ch1: ; 20a2e (8:4a2e) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + rest 1 + note C_, 8 + note D_, 7 + octave 4 + rest 2 + note C_, 8 + note D_, 11 + unknownmusic0xf6 + rest 1 + note C_, 8 + note D_, 5 + notetype 3, 12, 2 + note C_, 8 + note D_, 9 + rest 2 + rest 1 + note C_, 8 + endchannel + + +SFX_08_37_Ch2: ; 20a45 (8:4a45) + dutycycle 95 + note D_, 16 + note A_, 8 + note G#, 2 + note C_, 8 + note D_, 7 + note G#, 5 + note G#, 1 + note C_, 8 + note D_, 11 + note A_, 7 + note G#, 2 + note C_, 8 + note D_, 16 + note G#, 4 + note G#, 2 + note C_, 8 + endchannel + + +SFX_08_37_Ch3: ; 20a58 (8:4a58) + note D_, 4 + unknownmusic0xf2 + note D#, 13 + note D_, 14 + octave 2 + note D_, 13 + note D_, 16 + notetype 7, 3, 12 + note D_, 9 + rest 2 + note D_, 13 + endchannel +; 0x20a65 \ No newline at end of file diff --git a/music/sfx/sfx_08_38.asm b/music/sfx/sfx_08_38.asm new file mode 100644 index 00000000..96dbc74b --- /dev/null +++ b/music/sfx/sfx_08_38.asm @@ -0,0 +1,88 @@ +SFX_08_38_Ch1: ; 20a65 (8:4a65) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + note G#, 1 + note C_, 7 + note D_, 11 + octave 2 + note G#, 5 + note C_, 7 + note D_, 16 + notetype 7, 9, 0 + note C_, 7 + note D_, 9 + notetype 5, 9, 0 + note C_, 7 + note D_, 7 + rest 5 + note G#, 9 + note C_, 7 + note D_, 6 + notetype 3, 7, 0 + note C_, 7 + note D_, 5 + notetype 3, 6, 0 + note C_, 7 + note D_, 9 + rest 2 + note E_, 1 + note C_, 7 + endchannel + + +SFX_08_38_Ch2: ; 20a88 (8:4a88) + dutycycle 5 + note D_, 16 + note B_, 8 + note E_, 2 + note C_, 7 + note D_, 11 + note A_, 7 + note E_, 3 + note C_, 7 + note D_, 16 + note A#, 8 + note F_, 2 + note C_, 7 + note D_, 9 + note A#, 6 + note F_, 2 + note C_, 7 + note D_, 7 + note A_, 5 + note E_, 8 + note C_, 7 + note D_, 6 + note A#, 4 + note D#, 2 + note C_, 7 + note D_, 5 + note A_, 4 + note D_, 3 + note C_, 7 + note D_, 9 + note G_, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_08_38_Ch3: ; 20aab (8:4aab) + note D_, 16 + octave 4 + note D#, 13 + note D_, 11 + rest 8 + note E_, 13 + note D_, 11 + rest 8 + note D#, 13 + note D_, 13 + note B_, 8 + note E_, 13 + note D_, 16 + note A#, 3 + note F_, 13 + endchannel +; 0x20abb \ No newline at end of file diff --git a/music/sfx/sfx_08_39.asm b/music/sfx/sfx_08_39.asm new file mode 100644 index 00000000..c145e5a1 --- /dev/null +++ b/music/sfx/sfx_08_39.asm @@ -0,0 +1,63 @@ +SFX_08_39_Ch1: ; 20b13 (8:4b13) + dutycycle 165 + note D_, 7 + unknownmusic0xf4 + note E_, 1 + note C_, 8 + note D_, 16 + octave 5 + note D#, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf4 + note E_, 1 + note C_, 8 + note D_, 6 + note B_, 4 + note E_, 9 + note C_, 8 + note D_, 9 + notetype 1, 5, 0 + note C_, 8 + endchannel + + +SFX_08_39_Ch2: ; 20b2a (8:4b2a) + dutycycle 119 + note D_, 7 + rest 4 + note C#, 3 + note C_, 8 + note D_, 16 + note B_, 4 + note C_, 5 + note C_, 8 + note D_, 4 + rest 4 + note C#, 3 + note C_, 8 + note D_, 5 + rest 4 + note D_, 2 + note C_, 8 + note D_, 9 + note B_, 2 + note D#, 3 + note C_, 8 + endchannel + + +SFX_08_39_Ch3: ; 20b41 (8:4b41) + note D_, 9 + notetype 6, 2, 12 + note D_, 13 + rest 7 + note D#, 13 + note D_, 11 + note B_, 7 + note D_, 13 + note D_, 9 + note A_, 2 + note C#, 13 + endchannel +; 0x20b4e \ No newline at end of file diff --git a/music/sfx/sfx_08_3a.asm b/music/sfx/sfx_08_3a.asm new file mode 100644 index 00000000..7518cf8c --- /dev/null +++ b/music/sfx/sfx_08_3a.asm @@ -0,0 +1,64 @@ +SFX_08_3a_Ch1: ; 2397d (8:797d) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 6, 11, 4 + octave 4 + note F_, 4 + notetype 4, 11, 2 + note C_, 2 + note F_, 2 + note C_, 2 + notetype 6, 11, 3 + note D#, 2 + note D#, 2 + note E_, 2 + notetype 6, 11, 4 + note F_, 8 + endchannel + + +SFX_08_3a_Ch2: ; 23998 (8:7998) + unknownmusic0xf8 + vibrato 4, 2, 2 + duty 2 + notetype 6, 12, 4 + octave 4 + note A_, 4 + notetype 4, 12, 2 + note A_, 2 + note A_, 2 + note A_, 2 + notetype 6, 12, 4 + note A#, 2 + note A#, 2 + note A#, 2 + notetype 6, 12, 4 + note A_, 8 + endchannel + + +SFX_08_3a_Ch3: ; 239b0 (8:79b0) + unknownmusic0xf8 + notetype 6, 1, 0 + octave 5 + note A_, 4 + notetype 4, 1, 0 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + notetype 6, 1, 0 + note G_, 1 + rest 1 + note D#, 1 + rest 1 + note G_, 1 + rest 1 + note A_, 8 + endchannel +; 0x239c7 \ No newline at end of file diff --git a/music/sfx/sfx_08_3b.asm b/music/sfx/sfx_08_3b.asm new file mode 100644 index 00000000..2369ecaf --- /dev/null +++ b/music/sfx/sfx_08_3b.asm @@ -0,0 +1,70 @@ +SFX_08_3b_Ch1: ; 239c7 (8:79c7) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 5, 11, 4 + octave 4 + note D_, 4 + note C_, 4 + octave 3 + note A_, 8 + notetype 5, 11, 2 + octave 4 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 + octave 3 + note A#, 2 + notetype 5, 11, 4 + octave 4 + note C_, 8 + endchannel + + +SFX_08_3b_Ch2: ; 239e6 (8:79e6) + unknownmusic0xf8 + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + note A_, 4 + note F_, 4 + note C_, 8 + notetype 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + notetype 5, 12, 4 + note A_, 8 + endchannel + + +SFX_08_3b_Ch3: ; 239fe (8:79fe) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 5 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note A_, 8 + endchannel +; 0x23a13 \ No newline at end of file diff --git a/music/sfx/sfx_08_3c.asm b/music/sfx/sfx_08_3c.asm new file mode 100644 index 00000000..f9b3a5ec --- /dev/null +++ b/music/sfx/sfx_08_3c.asm @@ -0,0 +1,18 @@ +SFX_08_3c_Ch1: ; 203dd (8:43dd) + duty 2 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 3 + note C#, 1 + note D_, 3 + note D_, 9 + octave 6 + note C_, 1 + note C_, 3 + note C#, 1 + note C_, 9 + endchannel +; 0x203ee \ No newline at end of file diff --git a/music/sfx/sfx_08_3d.asm b/music/sfx/sfx_08_3d.asm new file mode 100644 index 00000000..d2a9539b --- /dev/null +++ b/music/sfx/sfx_08_3d.asm @@ -0,0 +1,15 @@ +SFX_08_3d_Ch1: ; 203ee (8:43ee) + duty 2 + note C#, 1 + note C#, 8 + note D_, 16 + stereopanning 240 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x203fd \ No newline at end of file diff --git a/music/sfx/sfx_08_3e.asm b/music/sfx/sfx_08_3e.asm new file mode 100644 index 00000000..c16790aa --- /dev/null +++ b/music/sfx/sfx_08_3e.asm @@ -0,0 +1,22 @@ +SFX_08_3e_Ch1: ; 203fd (8:43fd) + duty 2 + note C#, 1 + note C#, 5 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note C#, 1 + note C#, 8 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x20412 \ No newline at end of file diff --git a/music/sfx/sfx_08_3f.asm b/music/sfx/sfx_08_3f.asm new file mode 100644 index 00000000..3f706555 --- /dev/null +++ b/music/sfx/sfx_08_3f.asm @@ -0,0 +1,9 @@ +SFX_08_3f_Ch1: ; 203d6 (8:43d6) + note D_, 2 + octave 6 + note D#, 4 + note D_, 9 + octave 7 + note D_, 3 + endchannel +; 0x203dd \ No newline at end of file diff --git a/music/sfx/sfx_08_40.asm b/music/sfx/sfx_08_40.asm new file mode 100644 index 00000000..dc67553e --- /dev/null +++ b/music/sfx/sfx_08_40.asm @@ -0,0 +1,18 @@ +SFX_08_40_Ch1: ; 203c3 (8:43c3) + duty 2 + note D_, 1 + note A_, 2 + rest 1 + note C_, 8 + note D_, 1 + note G#, 2 + notetype 0, 0, 7 + note D_, 1 + note A_, 2 + rest 1 + note C_, 8 + note D_, 13 + note A#, 2 + notetype 0, 0, 7 + endchannel +; 0x203d6 \ No newline at end of file diff --git a/music/sfx/sfx_08_41.asm b/music/sfx/sfx_08_41.asm new file mode 100644 index 00000000..a381cec1 --- /dev/null +++ b/music/sfx/sfx_08_41.asm @@ -0,0 +1,19 @@ +SFX_08_41_Ch1: ; 2042d (8:442d) + duty 2 + note C#, 1 + note D_, 16 + note D_, 16 + unknownmusic0xf2 + note G#, 1 + note C_, 8 + endchannel + + +SFX_08_41_Ch2: ; 20436 (8:4436) + duty 2 + note D_, 16 + rest 3 + note G#, 3 + note C_, 8 + endchannel +; 0x2043d \ No newline at end of file diff --git a/music/sfx/sfx_08_42.asm b/music/sfx/sfx_08_42.asm new file mode 100644 index 00000000..af0f7057 --- /dev/null +++ b/music/sfx/sfx_08_42.asm @@ -0,0 +1,19 @@ +SFX_08_42_Ch1: ; 2043d (8:443d) + duty 2 + note C#, 1 + note C#, 7 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 5 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_42_Ch2: ; 20448 (8:4448) + note D_, 16 + note A#, 3 + note D_, 3 + endchannel +; 0x2044c \ No newline at end of file diff --git a/music/sfx/sfx_08_43.asm b/music/sfx/sfx_08_43.asm new file mode 100644 index 00000000..ffecddf0 --- /dev/null +++ b/music/sfx/sfx_08_43.asm @@ -0,0 +1,21 @@ +SFX_08_43_Ch1: ; 2044c (8:444c) + note D_, 16 + notetype 1, 0, 0 + note C_, 3 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_43_Ch2: ; 20453 (8:4453) + note D_, 5 + unknownmusic0xf5 + note D#, 4 + note D_, 9 + unknownmusic0xf4 + note D_, 3 + note D_, 16 + unknownmusic0xf2 + note D_, 2 + endchannel +; 0x2045d \ No newline at end of file diff --git a/music/sfx/sfx_08_44.asm b/music/sfx/sfx_08_44.asm new file mode 100644 index 00000000..66f9afff --- /dev/null +++ b/music/sfx/sfx_08_44.asm @@ -0,0 +1,36 @@ +SFX_08_44_Ch1: ; 2045d (8:445d) + note D_, 3 + note F#, 2 + note D_, 4 + note D_, 3 + note A#, 2 + note D#, 4 + note D_, 3 + rest 2 + note D#, 4 + note D_, 3 + note F_, 2 + note C#, 2 + note D_, 3 + unknownmusic0xf1 + note D#, 4 + note D_, 3 + note E_, 2 + note C#, 2 + note D_, 3 + rest 2 + note D#, 4 + note D_, 3 + note D#, 2 + note C#, 2 + note D_, 3 + note G#, 2 + note D#, 4 + note D_, 3 + note D#, 2 + note C#, 2 + note D_, 9 + note E_, 2 + note D#, 4 + endchannel +; 0x2047f \ No newline at end of file diff --git a/music/sfx/sfx_08_45.asm b/music/sfx/sfx_08_45.asm new file mode 100644 index 00000000..b20379c1 --- /dev/null +++ b/music/sfx/sfx_08_45.asm @@ -0,0 +1,30 @@ +SFX_08_45_Ch1: ; 2047f (8:447f) + duty 2 + note C#, 1 + note E_, 5 + note D_, 16 + stereopanning 240 + note C_, 5 + note C#, 1 + note C#, 8 + note D_, 16 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_45_Ch2: ; 20490 (8:4490) + duty 2 + note D_, 16 + note A_, 3 + note C_, 1 + note C_, 7 + note D_, 16 + note A_, 3 + note G#, 3 + note C_, 8 + endchannel +; 0x2049b \ No newline at end of file diff --git a/music/sfx/sfx_08_46.asm b/music/sfx/sfx_08_46.asm new file mode 100644 index 00000000..31d73ddf --- /dev/null +++ b/music/sfx/sfx_08_46.asm @@ -0,0 +1,62 @@ +SFX_08_46_Ch1: ; 23a13 (8:7a13) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 3 + unknownmusic0xe8 + notetype 6, 11, 2 + octave 3 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 1 + note G#, 1 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note D#, 1 + note D#, 1 + notetype 6, 11, 5 + note E_, 8 + endchannel + + +SFX_08_46_Ch2: ; 23a2e (8:7a2e) + unknownmusic0xf8 + duty 2 + notetype 6, 12, 2 + octave 4 + note G#, 2 + note G#, 1 + note G#, 1 + note E_, 2 + note E_, 1 + note E_, 1 + note B_, 2 + note B_, 1 + note B_, 1 + note A_, 2 + note A_, 1 + note A_, 1 + notetype 6, 12, 5 + note G#, 8 + endchannel + + +SFX_08_46_Ch3: ; 23a44 (8:7a44) + unknownmusic0xf8 + notetype 6, 1, 0 + octave 4 + note B_, 2 + rest 2 + octave 5 + note C#, 2 + rest 2 + note D#, 2 + rest 2 + note F#, 2 + note G_, 2 + note G#, 4 + endchannel +; 0x23a53 \ No newline at end of file diff --git a/music/sfx/sfx_08_47.asm b/music/sfx/sfx_08_47.asm new file mode 100644 index 00000000..ccee9e41 --- /dev/null +++ b/music/sfx/sfx_08_47.asm @@ -0,0 +1,6 @@ +SFX_08_47_Ch1: ; 204aa (8:44aa) + note D_, 3 + note A#, 2 + note C#, 3 + endchannel +; 0x204ae \ No newline at end of file diff --git a/music/sfx/sfx_08_48.asm b/music/sfx/sfx_08_48.asm new file mode 100644 index 00000000..91fa31f9 --- /dev/null +++ b/music/sfx/sfx_08_48.asm @@ -0,0 +1,12 @@ +SFX_08_48_Ch1: ; 204ae (8:44ae) + duty 1 + note C#, 1 + note A#, 16 + note D_, 16 + unknownmusic0xf2 + note G#, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x204b9 \ No newline at end of file diff --git a/music/sfx/sfx_08_49.asm b/music/sfx/sfx_08_49.asm new file mode 100644 index 00000000..321d1c76 --- /dev/null +++ b/music/sfx/sfx_08_49.asm @@ -0,0 +1,12 @@ +SFX_08_49_Ch1: ; 204b9 (8:44b9) + duty 1 + note C#, 1 + note A_, 8 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + note C#, 1 + note C_, 9 + endchannel +; 0x204c4 \ No newline at end of file diff --git a/music/sfx/sfx_08_4a.asm b/music/sfx/sfx_08_4a.asm new file mode 100644 index 00000000..f173ce6e --- /dev/null +++ b/music/sfx/sfx_08_4a.asm @@ -0,0 +1,6 @@ +SFX_08_4a_Ch1: ; 204c4 (8:44c4) + note D_, 3 + note A#, 2 + note D_, 3 + endchannel +; 0x204c8 \ No newline at end of file diff --git a/music/sfx/sfx_08_4b.asm b/music/sfx/sfx_08_4b.asm new file mode 100644 index 00000000..5e9afc92 --- /dev/null +++ b/music/sfx/sfx_08_4b.asm @@ -0,0 +1,6 @@ +SFX_08_4b_Ch1: ; 204c8 (8:44c8) + note D_, 9 + unknownmusic0xf1 + note F_, 5 + endchannel +; 0x204cc \ No newline at end of file diff --git a/music/sfx/sfx_08_4c.asm b/music/sfx/sfx_08_4c.asm new file mode 100644 index 00000000..cf0b4d4c --- /dev/null +++ b/music/sfx/sfx_08_4c.asm @@ -0,0 +1,7 @@ +SFX_08_4c_Ch1: ; 204cc (8:44cc) + note D_, 16 + note G#, 16 + note C#, 2 + note D_, 5 + endchannel +; 0x204d1 \ No newline at end of file diff --git a/music/sfx/sfx_08_4d.asm b/music/sfx/sfx_08_4d.asm new file mode 100644 index 00000000..cf07f9fa --- /dev/null +++ b/music/sfx/sfx_08_4d.asm @@ -0,0 +1,12 @@ +SFX_08_4d_Ch1: ; 204d6 (8:44d6) + note D_, 16 + note G#, 16 + note D#, 5 + note D_, 9 + unknownmusic0xf2 + note D#, 6 + note D_, 11 + unknownmusic0xf1 + note F_, 6 + endchannel +; 0x204e0 \ No newline at end of file diff --git a/music/sfx/sfx_08_4e.asm b/music/sfx/sfx_08_4e.asm new file mode 100644 index 00000000..7eee197a --- /dev/null +++ b/music/sfx/sfx_08_4e.asm @@ -0,0 +1,9 @@ +SFX_08_4e_Ch1: ; 204e0 (8:44e0) + note D_, 16 + note A_, 16 + note D_, 4 + note D_, 9 + unknownmusic0xf1 + note D_, 2 + endchannel +; 0x204e7 \ No newline at end of file diff --git a/music/sfx/sfx_08_4f.asm b/music/sfx/sfx_08_4f.asm new file mode 100644 index 00000000..e9d1c359 --- /dev/null +++ b/music/sfx/sfx_08_4f.asm @@ -0,0 +1,15 @@ +SFX_08_4f_Ch1: ; 204e7 (8:44e7) + note D_, 3 + octave 7 + note E_, 12 + note D_, 11 + unknownmusic0xf1 + note E_, 5 + note D_, 3 + octave 7 + note D#, 11 + note D_, 7 + unknownmusic0xf1 + note D#, 5 + endchannel +; 0x204f4 \ No newline at end of file diff --git a/music/sfx/sfx_08_50.asm b/music/sfx/sfx_08_50.asm new file mode 100644 index 00000000..dc8bd7b5 --- /dev/null +++ b/music/sfx/sfx_08_50.asm @@ -0,0 +1,12 @@ +SFX_08_50_Ch1: ; 204f4 (8:44f4) + note D_, 3 + unknownmusic0xf4 + note E_, 5 + note D_, 3 + unknownmusic0xf4 + note C#, 5 + note D_, 16 + unknownmusic0xf1 + note D#, 3 + endchannel +; 0x204fe \ No newline at end of file diff --git a/music/sfx/sfx_08_51.asm b/music/sfx/sfx_08_51.asm new file mode 100644 index 00000000..4f318e55 --- /dev/null +++ b/music/sfx/sfx_08_51.asm @@ -0,0 +1,15 @@ +SFX_08_51_Ch1: ; 204fe (8:44fe) + note D_, 5 + note G#, 16 + note F_, 6 + note D_, 3 + unknownmusic0xf4 + note E_, 5 + note D_, 9 + unknownmusic0xf4 + note D_, 3 + note D_, 16 + unknownmusic0xf2 + note D_, 2 + endchannel +; 0x2050b \ No newline at end of file diff --git a/music/sfx/sfx_08_52.asm b/music/sfx/sfx_08_52.asm new file mode 100644 index 00000000..e063a800 --- /dev/null +++ b/music/sfx/sfx_08_52.asm @@ -0,0 +1,13 @@ +SFX_08_52_Ch1: ; 2050b (8:450b) + note D_, 9 + note E_, 16 + note D_, 4 + note D_, 5 + rest 5 + note D_, 3 + note D_, 7 + unknownmusic0xf2 + note D_, 4 + loopchannel 4, SFX_08_52_Ch1 + endchannel +; 0x20519 \ No newline at end of file diff --git a/music/sfx/sfx_08_53.asm b/music/sfx/sfx_08_53.asm new file mode 100644 index 00000000..843bc854 --- /dev/null +++ b/music/sfx/sfx_08_53.asm @@ -0,0 +1,15 @@ +SFX_08_53_Ch1: ; 20519 (8:4519) + note D_, 9 + note E_, 16 + note D#, 4 + note D_, 5 + rest 5 + note D_, 3 + note D_, 7 + unknownmusic0xf2 + note D_, 4 + note D_, 16 + unknownmusic0xf2 + note D_, 3 + endchannel +; 0x20526 \ No newline at end of file diff --git a/music/sfx/sfx_08_54.asm b/music/sfx/sfx_08_54.asm new file mode 100644 index 00000000..d4782e63 --- /dev/null +++ b/music/sfx/sfx_08_54.asm @@ -0,0 +1,4 @@ +SFX_08_54_Ch1: ; 20526 (8:4526) + note D_, 9 + endchannel +; 0x20528 \ No newline at end of file diff --git a/music/sfx/sfx_08_55.asm b/music/sfx/sfx_08_55.asm new file mode 100644 index 00000000..42b458bd --- /dev/null +++ b/music/sfx/sfx_08_55.asm @@ -0,0 +1,27 @@ +SFX_08_55_Ch1: ; 20533 (8:4533) + note D_, 2 + rest 3 + note D#, 4 + note D_, 3 + unknownmusic0xf2 + note D_, 2 + note D_, 2 + octave 6 + note D#, 4 + note D_, 2 + rest 3 + note D#, 3 + note D_, 2 + note A_, 3 + note C#, 3 + note D_, 2 + note B_, 3 + note D#, 2 + note D_, 13 + note A_, 2 + note C#, 1 + note D_, 9 + unknownmusic0xf2 + note E_, 2 + endchannel +; 0x2054c \ No newline at end of file diff --git a/music/sfx/sfx_08_56.asm b/music/sfx/sfx_08_56.asm new file mode 100644 index 00000000..c23300e8 --- /dev/null +++ b/music/sfx/sfx_08_56.asm @@ -0,0 +1,12 @@ +SFX_08_56_Ch1: ; 2054c (8:454c) + note D_, 2 + note A_, 5 + note D_, 4 + note D_, 2 + note B_, 5 + note D_, 3 + note D_, 9 + unknownmusic0xf1 + note E_, 5 + endchannel +; 0x20556 \ No newline at end of file diff --git a/music/sfx/sfx_08_57.asm b/music/sfx/sfx_08_57.asm new file mode 100644 index 00000000..17bb63cf --- /dev/null +++ b/music/sfx/sfx_08_57.asm @@ -0,0 +1,15 @@ +SFX_08_57_Ch1: ; 20556 (8:4556) + note D_, 3 + note A_, 5 + note D#, 4 + note D_, 5 + note B_, 5 + note D_, 3 + note D_, 5 + unknownmusic0xf1 + note E_, 5 + note D_, 9 + unknownmusic0xf1 + note F_, 6 + endchannel +; 0x20563 \ No newline at end of file diff --git a/music/sfx/sfx_08_58.asm b/music/sfx/sfx_08_58.asm new file mode 100644 index 00000000..6fa45bf9 --- /dev/null +++ b/music/sfx/sfx_08_58.asm @@ -0,0 +1,4 @@ +SFX_08_58_Ch1: ; 20563 (8:4563) + note D_, 5 + endchannel +; 0x20565 \ No newline at end of file diff --git a/music/sfx/sfx_08_59.asm b/music/sfx/sfx_08_59.asm new file mode 100644 index 00000000..816645fa --- /dev/null +++ b/music/sfx/sfx_08_59.asm @@ -0,0 +1,12 @@ +SFX_08_59_Ch1: ; 2056a (8:456a) + note D_, 3 + note G#, 5 + note E_, 4 + note D_, 3 + rest 5 + note D_, 3 + note D_, 9 + unknownmusic0xf2 + note D#, 5 + endchannel +; 0x20574 \ No newline at end of file diff --git a/music/sfx/sfx_08_5a.asm b/music/sfx/sfx_08_5a.asm new file mode 100644 index 00000000..b8ca6acf --- /dev/null +++ b/music/sfx/sfx_08_5a.asm @@ -0,0 +1,9 @@ +SFX_08_5a_Ch1: ; 20574 (8:4574) + note D_, 5 + unknownmusic0xf1 + note D#, 5 + note D_, 16 + unknownmusic0xf2 + note F#, 5 + endchannel +; 0x2057b \ No newline at end of file diff --git a/music/sfx/sfx_08_5b.asm b/music/sfx/sfx_08_5b.asm new file mode 100644 index 00000000..a9e523aa --- /dev/null +++ b/music/sfx/sfx_08_5b.asm @@ -0,0 +1,9 @@ +SFX_08_5b_Ch1: ; 2057b (8:457b) + note D_, 3 + unknownmusic0xf1 + note D_, 3 + note D_, 16 + unknownmusic0xf2 + note C#, 3 + endchannel +; 0x20582 \ No newline at end of file diff --git a/music/sfx/sfx_08_5c.asm b/music/sfx/sfx_08_5c.asm new file mode 100644 index 00000000..c805b30a --- /dev/null +++ b/music/sfx/sfx_08_5c.asm @@ -0,0 +1,12 @@ +SFX_08_5c_Ch1: ; 20582 (8:4582) + note D_, 3 + rest 3 + note C_, 2 + note D_, 16 + unknownmusic0xf4 + note C_, 2 + note D_, 16 + unknownmusic0xf2 + note C_, 2 + endchannel +; 0x2058c \ No newline at end of file diff --git a/music/sfx/sfx_08_5d.asm b/music/sfx/sfx_08_5d.asm new file mode 100644 index 00000000..255186fb --- /dev/null +++ b/music/sfx/sfx_08_5d.asm @@ -0,0 +1,9 @@ +SFX_08_5d_Ch1: ; 2058c (8:458c) + note D_, 9 + unknownmusic0xf1 + note D#, 3 + note D_, 9 + unknownmusic0xf1 + note D#, 4 + endchannel +; 0x20593 \ No newline at end of file diff --git a/music/sfx/sfx_08_5e.asm b/music/sfx/sfx_08_5e.asm new file mode 100644 index 00000000..34a6e139 --- /dev/null +++ b/music/sfx/sfx_08_5e.asm @@ -0,0 +1,32 @@ +SFX_08_5e_Ch1: ; 20593 (8:4593) + duty 0 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 3 + note C#, 1 + note D_, 3 + note D_, 9 + octave 6 + note C_, 1 + note C_, 3 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_5e_Ch2: ; 205a4 (8:45a4) + note D_, 1 + notetype 1, 4, 2 + note D_, 5 + note A#, 2 + note D#, 3 + note D_, 1 + notetype 1, 2, 2 + note D_, 7 + note A#, 2 + note D#, 3 + endchannel +; 0x205b1 \ No newline at end of file diff --git a/music/sfx/sfx_08_5f.asm b/music/sfx/sfx_08_5f.asm new file mode 100644 index 00000000..d2d1fac1 --- /dev/null +++ b/music/sfx/sfx_08_5f.asm @@ -0,0 +1,15 @@ +SFX_08_5f_Ch1: ; 205b1 (8:45b1) + note D_, 4 + note A_, 3 + note D#, 2 + note D_, 4 + note B_, 3 + note D#, 3 + note D_, 4 + rest 3 + note D#, 4 + note D_, 9 + unknownmusic0xf1 + note F_, 5 + endchannel +; 0x205be \ No newline at end of file diff --git a/music/sfx/sfx_08_60.asm b/music/sfx/sfx_08_60.asm new file mode 100644 index 00000000..098157b8 --- /dev/null +++ b/music/sfx/sfx_08_60.asm @@ -0,0 +1,9 @@ +SFX_08_60_Ch1: ; 205be (8:45be) + note D_, 13 + unknownmusic0xf1 + note F_, 5 + note D_, 9 + unknownmusic0xf1 + note F#, 5 + endchannel +; 0x205c5 \ No newline at end of file diff --git a/music/sfx/sfx_08_61.asm b/music/sfx/sfx_08_61.asm new file mode 100644 index 00000000..7d2b29f7 --- /dev/null +++ b/music/sfx/sfx_08_61.asm @@ -0,0 +1,18 @@ +SFX_08_61_Ch1: ; 205c5 (8:45c5) + note D_, 3 + unknownmusic0xf1 + note D#, 4 + note D_, 3 + rest 2 + note D#, 3 + note D_, 3 + note A#, 2 + note D#, 2 + note D_, 16 + note G#, 3 + note D#, 3 + note D_, 9 + unknownmusic0xf1 + note D#, 5 + endchannel +; 0x205d5 \ No newline at end of file diff --git a/music/sfx/sfx_08_62.asm b/music/sfx/sfx_08_62.asm new file mode 100644 index 00000000..d407221f --- /dev/null +++ b/music/sfx/sfx_08_62.asm @@ -0,0 +1,8 @@ +SFX_08_62_Ch1: ; 205d5 (8:45d5) + note D_, 3 + notetype 2, 3, 2 + note D_, 16 + unknownmusic0xf2 + note E_, 4 + endchannel +; 0x205dc \ No newline at end of file diff --git a/music/sfx/sfx_08_63.asm b/music/sfx/sfx_08_63.asm new file mode 100644 index 00000000..0f0497e6 --- /dev/null +++ b/music/sfx/sfx_08_63.asm @@ -0,0 +1,18 @@ +SFX_08_63_Ch1: ; 205dc (8:45dc) + note D_, 3 + unknownmusic0xf2 + note E_, 4 + note D_, 5 + note B_, 6 + note D#, 3 + note D_, 10 + note G#, 7 + note D#, 2 + note D_, 8 + note F#, 5 + note C_, 1 + note D_, 16 + unknownmusic0xf2 + note F_, 6 + endchannel +; 0x205ec \ No newline at end of file diff --git a/music/sfx/sfx_08_64.asm b/music/sfx/sfx_08_64.asm new file mode 100644 index 00000000..9394994a --- /dev/null +++ b/music/sfx/sfx_08_64.asm @@ -0,0 +1,22 @@ +SFX_08_64_Ch1: ; 205ec (8:45ec) + duty 1 + note C#, 1 + note A_, 8 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_64_Ch2: ; 205f7 (8:45f7) + note D_, 16 + note D#, 16 + note D_, 3 + note D_, 16 + unknownmusic0xf2 + note D_, 2 + endchannel +; 0x205fe \ No newline at end of file diff --git a/music/sfx/sfx_08_65.asm b/music/sfx/sfx_08_65.asm new file mode 100644 index 00000000..62f0e283 --- /dev/null +++ b/music/sfx/sfx_08_65.asm @@ -0,0 +1,18 @@ +SFX_08_65_Ch1: ; 205fe (8:45fe) + note D_, 16 + note E_, 16 + note E_, 2 + note D_, 9 + note G#, 16 + note E_, 2 + note D_, 9 + rest 16 + note E_, 2 + note D_, 9 + unknownmusic0xf2 + note E_, 3 + note D_, 16 + unknownmusic0xf2 + note E_, 2 + endchannel +; 0x2060e \ No newline at end of file diff --git a/music/sfx/sfx_08_66.asm b/music/sfx/sfx_08_66.asm new file mode 100644 index 00000000..23ddd755 --- /dev/null +++ b/music/sfx/sfx_08_66.asm @@ -0,0 +1,4 @@ +SFX_08_66_Ch1: ; 2060e (8:460e) + note D_, 11 + endchannel +; 0x20610 \ No newline at end of file diff --git a/music/sfx/sfx_08_67.asm b/music/sfx/sfx_08_67.asm new file mode 100644 index 00000000..dd3c4b3f --- /dev/null +++ b/music/sfx/sfx_08_67.asm @@ -0,0 +1,48 @@ +SFX_08_67_Ch1: ; 20624 (8:4624) + duty 2 + note D_, 16 + note D#, 16 + rest 1 + note C_, 8 + +SFX_08_67_branch_2062a: + note D_, 16 + notetype 15, 12, 0 + note C_, 8 + loopchannel 4, SFX_08_67_branch_2062a + note D_, 16 + notetype 1, 12, 0 + note C_, 8 + endchannel + + +SFX_08_67_Ch2: ; 20637 (8:4637) + dutycycle 179 + note D_, 16 + note D_, 16 + rest 9 + note C_, 8 + +SFX_08_67_branch_2063d: + note D_, 16 + rest 16 + rest 8 + note C_, 8 + loopchannel 4, SFX_08_67_branch_2063d + note D_, 16 + rest 2 + rest 9 + note C_, 8 + endchannel + + +SFX_08_67_Ch3: ; 2064a (8:464a) + note D_, 4 + note A_, 8 + note C#, 3 + note D_, 4 + note A#, 2 + note C#, 2 + loopchannel 10, SFX_08_67_Ch3 + endchannel +; 0x20655 \ No newline at end of file diff --git a/music/sfx/sfx_08_68.asm b/music/sfx/sfx_08_68.asm new file mode 100644 index 00000000..04130056 --- /dev/null +++ b/music/sfx/sfx_08_68.asm @@ -0,0 +1,36 @@ +SFX_08_68_Ch1: ; 20655 (8:4655) + duty 0 + note D_, 1 + unknownmusic0xf1 + rest 1 + note C_, 8 + note D_, 1 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + loopchannel 12, SFX_08_68_Ch1 + endchannel + + +SFX_08_68_Ch2: ; 20664 (8:4664) + dutycycle 179 + note D_, 1 + octave 7 + rest 2 + note C_, 8 + note D_, 1 + octave 7 + note C_, 2 + note C_, 8 + loopchannel 12, SFX_08_68_Ch2 + endchannel + + +SFX_08_68_Ch3: ; 20673 (8:4673) + note D_, 2 + notetype 1, 4, 9 + note D_, 2 + notetype 1, 2, 9 + loopchannel 6, SFX_08_68_Ch3 + endchannel +; 0x2067e \ No newline at end of file diff --git a/music/sfx/sfx_08_69.asm b/music/sfx/sfx_08_69.asm new file mode 100644 index 00000000..f4477964 --- /dev/null +++ b/music/sfx/sfx_08_69.asm @@ -0,0 +1,40 @@ +SFX_08_69_Ch1: ; 2067e (8:467e) + dutycycle 201 + note D_, 12 + unknownmusic0xf3 + note D_, 1 + note C_, 2 + note D_, 10 + notetype 3, 5, 0 + note C_, 2 + loopchannel 5, SFX_08_69_Ch1 + note D_, 9 + octave 5 + note D#, 1 + note C_, 2 + note D_, 16 + rest 3 + note C#, 1 + note C_, 2 + endchannel + + +SFX_08_69_Ch2: ; 20695 (8:4695) + note D_, 11 + unknownmusic0xf3 + note D#, 6 + note D_, 15 + unknownmusic0xf6 + note E_, 6 + loopchannel 4, SFX_08_69_Ch2 + note D_, 13 + unknownmusic0xf4 + note B_, 13 + note D_, 13 + unknownmusic0xf5 + note A_, 13 + note D_, 16 + unknownmusic0xf4 + note A#, 13 + endchannel +; 0x206a9 \ No newline at end of file diff --git a/music/sfx/sfx_08_6a.asm b/music/sfx/sfx_08_6a.asm new file mode 100644 index 00000000..6d56b533 --- /dev/null +++ b/music/sfx/sfx_08_6a.asm @@ -0,0 +1,62 @@ +SFX_08_6a_Ch1: ; 206a9 (8:46a9) + dutycycle 57 + note D_, 5 + unknownmusic0xf4 + note C_, 1 + note C_, 7 + note D_, 4 + rest 5 + note C_, 1 + note C_, 6 + note D_, 6 + note B_, 6 + note C_, 1 + note C_, 7 + note D_, 14 + octave 6 + rest 1 + note C_, 7 + loopchannel 3, SFX_08_6a_Ch1 + note D_, 9 + notetype 1, 0, 0 + note C_, 7 + endchannel + + +SFX_08_6a_Ch2: ; 206c4 (8:46c4) + dutycycle 141 + note D_, 6 + octave 4 + octave 8 + note C_, 6 + note D_, 5 + note B_, 5 + octave 8 + note C_, 5 + note D_, 7 + note A#, 6 + unknownmusic0xe8 + note C_, 6 + note D_, 15 + notetype 1, 10, 0 + note C_, 7 + loopchannel 3, SFX_08_6a_Ch2 + endchannel + + +SFX_08_6a_Ch3: ; 206db (8:46db) + note D_, 6 + rest 4 + note D#, 4 + note D_, 4 + note A_, 3 + note E_, 4 + note D_, 11 + note B_, 6 + note D#, 4 + note D_, 16 + rest 4 + note D#, 3 + loopchannel 2, SFX_08_6a_Ch3 + endchannel +; 0x206ec \ No newline at end of file diff --git a/music/sfx/sfx_08_6b.asm b/music/sfx/sfx_08_6b.asm new file mode 100644 index 00000000..6b50fcf3 --- /dev/null +++ b/music/sfx/sfx_08_6b.asm @@ -0,0 +1,51 @@ +SFX_08_6b_Ch1: ; 206ec (8:46ec) + dutycycle 210 + note D_, 4 + note G#, 2 + note C_, 1 + note C_, 4 + note D_, 4 + rest 2 + note C_, 1 + note C_, 5 + note D_, 4 + unknownmusic0xf1 + note C_, 1 + note C_, 6 + note D_, 4 + note B_, 2 + note C_, 1 + note C_, 5 + note D_, 4 + note G_, 2 + note C_, 1 + note C_, 4 + loopchannel 5, SFX_08_6b_Ch1 + note D_, 9 + note G#, 2 + note C_, 1 + note C_, 5 + endchannel + + +SFX_08_6b_Ch2: ; 2070b (8:470b) + note D_, 4 + note F#, 3 + note D_, 3 + note D_, 4 + note A#, 3 + note D#, 3 + note D_, 4 + notetype 2, 3, 3 + note D_, 4 + note A_, 3 + note D_, 4 + note D_, 4 + note F_, 3 + note C#, 3 + loopchannel 5, SFX_08_6b_Ch2 + note D_, 9 + note G#, 2 + note C#, 3 + endchannel +; 0x20722 \ No newline at end of file diff --git a/music/sfx/sfx_08_6c.asm b/music/sfx/sfx_08_6c.asm new file mode 100644 index 00000000..96ce3e45 --- /dev/null +++ b/music/sfx/sfx_08_6c.asm @@ -0,0 +1,52 @@ +SFX_08_6c_Ch1: ; 20722 (8:4722) + dutycycle 57 + note D_, 16 + unknownmusic0xf4 + note C_, 1 + note C_, 6 + note D_, 16 + rest 5 + note C_, 1 + note C_, 5 + note D_, 16 + octave 6 + rest 1 + note C_, 6 + loopchannel 3, SFX_08_6c_Ch1 + endchannel + + +SFX_08_6c_Ch2: ; 20735 (8:4735) + dutycycle 141 + note D_, 8 + octave 4 + note D#, 1 + note C_, 5 + note D_, 16 + note B_, 5 + note D#, 1 + note C_, 4 + note D_, 16 + note A#, 3 + note D#, 9 + note C_, 5 + loopchannel 4, SFX_08_6c_Ch2 + endchannel + + +SFX_08_6c_Ch3: ; 20748 (8:4748) + note D_, 10 + unknownmusic0xf4 + note E_, 5 + note D_, 10 + unknownmusic0xf2 + note E_, 4 + note D_, 16 + unknownmusic0xf4 + note E_, 3 + note D_, 16 + unknownmusic0xf4 + note E_, 2 + loopchannel 3, SFX_08_6c_Ch3 + endchannel +; 0x20759 \ No newline at end of file diff --git a/music/sfx/sfx_08_6d.asm b/music/sfx/sfx_08_6d.asm new file mode 100644 index 00000000..3b90f524 --- /dev/null +++ b/music/sfx/sfx_08_6d.asm @@ -0,0 +1,52 @@ +SFX_08_6d_Ch1: ; 20759 (8:4759) + dutycycle 161 + note D_, 11 + unknownmusic0xf1 + note E_, 1 + note C_, 7 + note D_, 11 + unknownmusic0xf3 + note G#, 1 + note C_, 7 + note D_, 11 + unknownmusic0xf2 + note D_, 1 + note C_, 7 + loopchannel 4, SFX_08_6d_Ch1 + note D_, 11 + unknownmusic0xf1 + note E_, 1 + note C_, 7 + endchannel + + +SFX_08_6d_Ch2: ; 20770 (8:4770) + dutycycle 179 + note D_, 11 + unknownmusic0xf3 + note G_, 2 + note C_, 6 + note D_, 8 + octave 5 + note D#, 2 + note C_, 6 + note D_, 11 + unknownmusic0xf1 + note F_, 2 + note C_, 6 + loopchannel 4, SFX_08_6d_Ch2 + note D_, 11 + unknownmusic0xf1 + note G_, 2 + note C_, 6 + endchannel + + +SFX_08_6d_Ch3: ; 20787 (8:4787) + note D_, 3 + notetype 1, 4, 10 + note D_, 3 + notetype 2, 2, 10 + loopchannel 21, SFX_08_6d_Ch3 + endchannel +; 0x20792 \ No newline at end of file diff --git a/music/sfx/sfx_08_6e.asm b/music/sfx/sfx_08_6e.asm new file mode 100644 index 00000000..b38e9fbf --- /dev/null +++ b/music/sfx/sfx_08_6e.asm @@ -0,0 +1,55 @@ +SFX_08_6e_Ch1: ; 20792 (8:4792) + duty 0 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 3 + note D_, 4 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note C_, 1 + note C_, 6 + note D_, 6 + unknownmusic0xf1 + stereopanning 7 + loopchannel 8, SFX_08_6e_Ch1 + endchannel + + +SFX_08_6e_Ch2: ; 207a9 (8:47a9) + dutycycle 179 + note D_, 3 + octave 7 + note C_, 3 + note C_, 4 + note D_, 4 + octave 7 + unknownmusic0xf2 + note C_, 8 + note D_, 5 + octave 7 + note C_, 3 + note C_, 7 + note D_, 6 + octave 7 + note C_, 3 + note C_, 8 + loopchannel 8, SFX_08_6e_Ch2 + endchannel + + +SFX_08_6e_Ch3: ; 207c0 (8:47c0) + note D_, 3 + notetype 3, 1, 0 + note D_, 4 + notetype 3, 1, 1 + note D_, 3 + notetype 2, 1, 0 + note D_, 6 + notetype 2, 1, 2 + loopchannel 9, SFX_08_6e_Ch3 + endchannel +; 0x207d1 \ No newline at end of file diff --git a/music/sfx/sfx_08_6f.asm b/music/sfx/sfx_08_6f.asm new file mode 100644 index 00000000..2235fbaf --- /dev/null +++ b/music/sfx/sfx_08_6f.asm @@ -0,0 +1,31 @@ +SFX_08_6f_Ch1: ; 207d1 (8:47d1) + dutycycle 43 + note D_, 4 + unknownmusic0xf1 + stereopanning 7 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 3 + loopchannel 8, SFX_08_6f_Ch1 + endchannel + + +SFX_08_6f_Ch2: ; 207e0 (8:47e0) + dutycycle 179 + note D_, 5 + octave 6 + note C_, 3 + note C_, 3 + note D_, 5 + octave 7 + octave 6 + note C_, 8 + loopchannel 9, SFX_08_6f_Ch2 + endchannel + + +SFX_08_6f_Ch3: ; 207ef (8:47ef) + note D_, 5 + endchannel +; 0x207f1 \ No newline at end of file diff --git a/music/sfx/sfx_08_70.asm b/music/sfx/sfx_08_70.asm new file mode 100644 index 00000000..6a94b64d --- /dev/null +++ b/music/sfx/sfx_08_70.asm @@ -0,0 +1,83 @@ +SFX_08_70_Ch1: ; 207fa (8:47fa) + duty 2 + note C#, 1 + unknownmusic0xf7 + note D_, 9 + rest 5 + note B_, 14 + note C_, 8 + note D_, 9 + rest 5 + note B_, 15 + note C_, 8 + note D_, 9 + rest 5 + note B_, 16 + note C_, 8 + note D_, 9 + rest 5 + rest 1 + note C_, 8 + note D_, 16 + rest 5 + rest 2 + note C_, 8 + note D_, 16 + unknownmusic0xf2 + rest 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_70_Ch2: ; 20819 (8:4819) + duty 2 + note D_, 9 + rest 5 + note G_, 1 + note C_, 8 + note D_, 9 + rest 5 + note F#, 2 + note C_, 8 + note D_, 9 + rest 5 + note F#, 3 + note C_, 8 + note D_, 9 + rest 5 + note F#, 4 + note C_, 8 + note D_, 16 + rest 5 + note F#, 5 + note C_, 8 + note D_, 16 + unknownmusic0xf2 + note F#, 5 + note C_, 8 + endchannel + + +SFX_08_70_Ch3: ; 20834 (8:4834) + note D_, 16 + note D#, 16 + note C#, 5 + note D_, 16 + rest 16 + note C#, 4 + note D_, 16 + rest 16 + note C#, 3 + note D_, 16 + rest 16 + note C#, 2 + note D_, 16 + rest 16 + note C#, 1 + note D_, 16 + rest 3 + note C#, 1 + endchannel +; 0x20847 \ No newline at end of file diff --git a/music/sfx/sfx_08_71.asm b/music/sfx/sfx_08_71.asm new file mode 100644 index 00000000..4ff045ea --- /dev/null +++ b/music/sfx/sfx_08_71.asm @@ -0,0 +1,30 @@ +SFX_08_71_Ch1: ; 20847 (8:4847) + duty 2 + note D_, 16 + endchannel + octave 8 + note C_, 8 + note D_, 16 + endchannel + octave 8 + note C_, 8 + note D_, 16 + endchannel + octave 8 + note C_, 8 + note D_, 16 + endchannel + octave 8 + note C_, 8 + note D_, 16 + unknownmusic0xf2 + octave 8 + note C_, 8 + endchannel + + +SFX_08_71_Ch2: ; 2085e (8:485e) + duty 3 + note D_, 16 + endchannel +; 0x20862 \ No newline at end of file diff --git a/music/sfx/sfx_08_72.asm b/music/sfx/sfx_08_72.asm new file mode 100644 index 00000000..9af4e8fa --- /dev/null +++ b/music/sfx/sfx_08_72.asm @@ -0,0 +1,21 @@ +SFX_08_72_Ch1: ; 20875 (8:4875) + duty 2 + note C#, 1 + note A#, 16 + note D_, 9 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel + + +SFX_08_72_Ch2: ; 20880 (8:4880) + duty 3 + note D_, 9 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + endchannel +; 0x20887 \ No newline at end of file diff --git a/music/sfx/sfx_08_73.asm b/music/sfx/sfx_08_73.asm new file mode 100644 index 00000000..2a241c02 --- /dev/null +++ b/music/sfx/sfx_08_73.asm @@ -0,0 +1,49 @@ +SFX_08_73_Ch1: ; 20887 (8:4887) + duty 2 + note D_, 7 + unknownmusic0xf1 + note C_, 1 + note C_, 6 + note D_, 7 + unknownmusic0xf1 + note G#, 1 + note C_, 6 + note D_, 7 + unknownmusic0xf1 + note C_, 1 + note C_, 7 + note D_, 7 + unknownmusic0xf1 + note G#, 1 + note C_, 7 + note D_, 9 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + endchannel + + +SFX_08_73_Ch2: ; 2089e (8:489e) + duty 3 + note D_, 7 + octave 7 + note C#, 1 + note C_, 6 + note D_, 7 + octave 7 + note A_, 1 + note C_, 6 + note D_, 7 + octave 7 + note C#, 1 + note C_, 7 + note D_, 7 + octave 7 + note A_, 1 + note C_, 7 + note D_, 9 + octave 7 + note C#, 1 + note C_, 8 + endchannel +; 0x208b5 \ No newline at end of file diff --git a/music/sfx/sfx_08_74.asm b/music/sfx/sfx_08_74.asm new file mode 100644 index 00000000..0f9237fd --- /dev/null +++ b/music/sfx/sfx_08_74.asm @@ -0,0 +1,38 @@ +SFX_08_74_Ch1: ; 208b5 (8:48b5) + dutycycle 237 + note D_, 9 + endchannel + unknownmusic0xf8 + note C_, 4 + note D_, 16 + endchannel + note C_, 1 + note C_, 5 + note D_, 16 + unknownmusic0xf3 + note C_, 1 + note C_, 5 + endchannel + + +SFX_08_74_Ch2: ; 208c4 (8:48c4) + dutycycle 180 + note D_, 9 + unknownmusic0xef + rest 1 + note C_, 4 + note D_, 16 + unknownmusic0xef + rest 1 + note C_, 4 + note D_, 16 + octave 5 + rest 1 + note C_, 4 + endchannel + + +SFX_08_74_Ch3: ; 208d3 (8:48d3) + note D_, 5 + endchannel +; 0x208d5 \ No newline at end of file diff --git a/music/sfx/sfx_08_75.asm b/music/sfx/sfx_08_75.asm new file mode 100644 index 00000000..5bb7ada6 --- /dev/null +++ b/music/sfx/sfx_08_75.asm @@ -0,0 +1,30 @@ +SFX_08_75_Ch1: ; 208e0 (8:48e0) + unknownmusic0xf8 + vibrato 10, 2, 4 + duty 2 + notetype 10, 8, 7 + octave 5 + note G#, 8 + octave 6 + note F#, 4 + note E_, 4 + octave 5 + note G#, 8 + endchannel + + +SFX_08_75_Ch2: ; 208f0 (8:48f0) + unknownmusic0xf8 + vibrato 10, 2, 3 + duty 2 + notetype 11, 6, 7 + octave 5 + note G#, 8 + notetype 10, 6, 7 + octave 6 + note F#, 4 + note E_, 4 + octave 5 + note G#, 8 + endchannel +; 0x20902 \ No newline at end of file diff --git a/music/sfx/sfx_08_76.asm b/music/sfx/sfx_08_76.asm new file mode 100644 index 00000000..34de1baf --- /dev/null +++ b/music/sfx/sfx_08_76.asm @@ -0,0 +1,132 @@ +SFX_08_76_Ch1: ; 20902 (8:4902) + duty 0 + note D_, 3 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note A_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note A#, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note B_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + rest 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + notetype 0, 0, 7 + +SFX_08_76_branch_20930: + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + octave 8 + note C_, 8 + loopchannel 12, SFX_08_76_branch_20930 + note D_, 16 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + endchannel + + +SFX_08_76_Ch2: ; 20941 (8:4941) + dutycycle 179 + note D_, 3 + unknownmusic0xf1 + note G#, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note A_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note A#, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note B_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + rest 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + notetype 1, 0, 7 + note D_, 3 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 3 + unknownmusic0xf1 + octave 7 + note C_, 8 + loopchannel 12, SFX_08_76_branch_20930 + note D_, 16 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + endchannel + + +SFX_08_76_Ch3: ; 20980 (8:4980) + note D_, 2 + notetype 1, 4, 9 + note D_, 2 + notetype 1, 2, 9 + loopchannel 26, SFX_08_76_Ch3 + endchannel +; 0x2098b \ No newline at end of file diff --git a/music/sfx/sfx_08_77.asm b/music/sfx/sfx_08_77.asm new file mode 100644 index 00000000..fbadb06d --- /dev/null +++ b/music/sfx/sfx_08_77.asm @@ -0,0 +1,24 @@ +SFX_08_77_Ch1: ; 20412 (8:4412) + duty 0 + note D_, 1 + notetype 2, 0, 0 + note C_, 8 + note D_, 1 + notetype 2, 4, 0 + note C_, 8 + note D_, 1 + notetype 2, 8, 0 + note C_, 8 + note D_, 1 + notetype 2, 12, 0 + note C_, 8 + note D_, 11 + octave 7 + octave 8 + note C_, 8 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x2042d \ No newline at end of file diff --git a/music/sfx/sfx_1f_01.asm b/music/sfx/sfx_1f_01.asm new file mode 100644 index 00000000..01a33b48 --- /dev/null +++ b/music/sfx/sfx_1f_01.asm @@ -0,0 +1,6 @@ +SFX_1f_01_Ch1: ; 7c2fd (1f:42fd) + note D_, 1 + rest 2 + note D#, 4 + endchannel +; 0x7c301 \ No newline at end of file diff --git a/music/sfx/sfx_1f_02.asm b/music/sfx/sfx_1f_02.asm new file mode 100644 index 00000000..4668a734 --- /dev/null +++ b/music/sfx/sfx_1f_02.asm @@ -0,0 +1,6 @@ +SFX_1f_02_Ch1: ; 7c301 (1f:4301) + note D_, 1 + note B_, 2 + note D#, 4 + endchannel +; 0x7c305 \ No newline at end of file diff --git a/music/sfx/sfx_1f_03.asm b/music/sfx/sfx_1f_03.asm new file mode 100644 index 00000000..b211efd1 --- /dev/null +++ b/music/sfx/sfx_1f_03.asm @@ -0,0 +1,6 @@ +SFX_1f_03_Ch1: ; 7c305 (1f:4305) + note D_, 1 + note A#, 2 + note D#, 4 + endchannel +; 0x7c309 \ No newline at end of file diff --git a/music/sfx/sfx_1f_04.asm b/music/sfx/sfx_1f_04.asm new file mode 100644 index 00000000..96989642 --- /dev/null +++ b/music/sfx/sfx_1f_04.asm @@ -0,0 +1,6 @@ +SFX_1f_04_Ch1: ; 7c309 (1f:4309) + note D_, 1 + note G#, 2 + note D#, 4 + endchannel +; 0x7c30d \ No newline at end of file diff --git a/music/sfx/sfx_1f_05.asm b/music/sfx/sfx_1f_05.asm new file mode 100644 index 00000000..165fc496 --- /dev/null +++ b/music/sfx/sfx_1f_05.asm @@ -0,0 +1,21 @@ +SFX_1f_05_Ch1: ; 7c30d (1f:430d) + note D_, 8 + note G#, 5 + note D#, 8 + note D_, 7 + note G#, 5 + note D#, 7 + note D_, 6 + note G#, 4 + note D#, 6 + note D_, 5 + note G#, 4 + note D#, 5 + note D_, 4 + note G#, 3 + note D#, 4 + note D_, 3 + note G#, 2 + note D#, 3 + endchannel +; 0x7c320 \ No newline at end of file diff --git a/music/sfx/sfx_1f_06.asm b/music/sfx/sfx_1f_06.asm new file mode 100644 index 00000000..84860cbd --- /dev/null +++ b/music/sfx/sfx_1f_06.asm @@ -0,0 +1,6 @@ +SFX_1f_06_Ch1: ; 7c320 (1f:4320) + note D_, 1 + note F_, 2 + note D_, 11 + endchannel +; 0x7c324 \ No newline at end of file diff --git a/music/sfx/sfx_1f_07.asm b/music/sfx/sfx_1f_07.asm new file mode 100644 index 00000000..5301647d --- /dev/null +++ b/music/sfx/sfx_1f_07.asm @@ -0,0 +1,9 @@ +SFX_1f_07_Ch1: ; 7c324 (1f:4324) + note D_, 2 + note E_, 2 + note D_, 12 + note D_, 1 + note F#, 2 + note D_, 11 + endchannel +; 0x7c32b \ No newline at end of file diff --git a/music/sfx/sfx_1f_08.asm b/music/sfx/sfx_1f_08.asm new file mode 100644 index 00000000..839ea921 --- /dev/null +++ b/music/sfx/sfx_1f_08.asm @@ -0,0 +1,6 @@ +SFX_1f_08_Ch1: ; 7c32b (1f:432b) + note D_, 1 + note G#, 2 + note C#, 1 + endchannel +; 0x7c32f \ No newline at end of file diff --git a/music/sfx/sfx_1f_09.asm b/music/sfx/sfx_1f_09.asm new file mode 100644 index 00000000..dd12e72e --- /dev/null +++ b/music/sfx/sfx_1f_09.asm @@ -0,0 +1,6 @@ +SFX_1f_09_Ch1: ; 7c32f (1f:432f) + note D_, 1 + note G#, 3 + note D_, 4 + endchannel +; 0x7c333 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0a.asm b/music/sfx/sfx_1f_0a.asm new file mode 100644 index 00000000..2351dea5 --- /dev/null +++ b/music/sfx/sfx_1f_0a.asm @@ -0,0 +1,6 @@ +SFX_1f_0a_Ch1: ; 7c333 (1f:4333) + note D_, 1 + note G#, 3 + note D_, 6 + endchannel +; 0x7c337 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0b.asm b/music/sfx/sfx_1f_0b.asm new file mode 100644 index 00000000..8aab75b1 --- /dev/null +++ b/music/sfx/sfx_1f_0b.asm @@ -0,0 +1,6 @@ +SFX_1f_0b_Ch1: ; 7c337 (1f:4337) + note D_, 1 + note G#, 3 + note D_, 7 + endchannel +; 0x7c33b \ No newline at end of file diff --git a/music/sfx/sfx_1f_0c.asm b/music/sfx/sfx_1f_0c.asm new file mode 100644 index 00000000..aa065f6a --- /dev/null +++ b/music/sfx/sfx_1f_0c.asm @@ -0,0 +1,6 @@ +SFX_1f_0c_Ch1: ; 7c33b (1f:433b) + note D_, 1 + note A#, 2 + note C#, 1 + endchannel +; 0x7c33f \ No newline at end of file diff --git a/music/sfx/sfx_1f_0d.asm b/music/sfx/sfx_1f_0d.asm new file mode 100644 index 00000000..16cde324 --- /dev/null +++ b/music/sfx/sfx_1f_0d.asm @@ -0,0 +1,6 @@ +SFX_1f_0d_Ch1: ; 7c33f (1f:433f) + note D_, 1 + note A#, 3 + note C#, 2 + endchannel +; 0x7c343 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0e.asm b/music/sfx/sfx_1f_0e.asm new file mode 100644 index 00000000..60dddf0f --- /dev/null +++ b/music/sfx/sfx_1f_0e.asm @@ -0,0 +1,6 @@ +SFX_1f_0e_Ch1: ; 7c343 (1f:4343) + note D_, 1 + note A#, 3 + note F_, 1 + endchannel +; 0x7c347 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0f.asm b/music/sfx/sfx_1f_0f.asm new file mode 100644 index 00000000..79531285 --- /dev/null +++ b/music/sfx/sfx_1f_0f.asm @@ -0,0 +1,9 @@ +SFX_1f_0f_Ch1: ; 7c347 (1f:4347) + note D_, 1 + note A#, 2 + note C#, 9 + note D_, 1 + note D#, 2 + note D#, 4 + endchannel +; 0x7c34e \ No newline at end of file diff --git a/music/sfx/sfx_1f_10.asm b/music/sfx/sfx_1f_10.asm new file mode 100644 index 00000000..be08cea8 --- /dev/null +++ b/music/sfx/sfx_1f_10.asm @@ -0,0 +1,9 @@ +SFX_1f_10_Ch1: ; 7c34e (1f:434e) + note D_, 3 + note A_, 2 + note D_, 9 + note D_, 1 + note G_, 2 + note C#, 9 + endchannel +; 0x7c355 \ No newline at end of file diff --git a/music/sfx/sfx_1f_11.asm b/music/sfx/sfx_1f_11.asm new file mode 100644 index 00000000..ebdd7fe6 --- /dev/null +++ b/music/sfx/sfx_1f_11.asm @@ -0,0 +1,6 @@ +SFX_1f_11_Ch1: ; 7c355 (1f:4355) + note D_, 1 + note A_, 2 + note D_, 3 + endchannel +; 0x7c359 \ No newline at end of file diff --git a/music/sfx/sfx_1f_12.asm b/music/sfx/sfx_1f_12.asm new file mode 100644 index 00000000..fb21aaf3 --- /dev/null +++ b/music/sfx/sfx_1f_12.asm @@ -0,0 +1,6 @@ +SFX_1f_12_Ch1: ; 7c359 (1f:4359) + note D_, 1 + note G_, 2 + note D_, 3 + endchannel +; 0x7c35d \ No newline at end of file diff --git a/music/sfx/sfx_1f_13.asm b/music/sfx/sfx_1f_13.asm new file mode 100644 index 00000000..1037500d --- /dev/null +++ b/music/sfx/sfx_1f_13.asm @@ -0,0 +1,6 @@ +SFX_1f_13_Ch1: ; 7c35d (1f:435d) + note D_, 1 + note F#, 2 + note D_, 3 + endchannel +; 0x7c361 \ No newline at end of file diff --git a/music/sfx/sfx_1f_14.asm b/music/sfx/sfx_1f_14.asm new file mode 100644 index 00000000..06bfb1e9 --- /dev/null +++ b/music/sfx/sfx_1f_14.asm @@ -0,0 +1,46 @@ +SFX_1f_14_Ch1: ; 7c9fc (1f:49fc) + dutycycle 245 + note D_, 5 + unknownmusic0xf3 + note C#, 9 + note C_, 8 + note D_, 16 + octave 3 + note A_, 9 + note C_, 8 + note D_, 9 + note A_, 2 + note F_, 9 + note C_, 8 + endchannel + + +SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b) + dutycycle 160 + note D_, 6 + note B_, 4 + note C_, 9 + note C_, 8 + note D_, 16 + rest 6 + note G#, 9 + note C_, 8 + note D_, 9 + note G_, 2 + note E_, 9 + note C_, 8 + endchannel + + +SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a) + note D_, 4 + note A#, 2 + note C#, 13 + note D_, 15 + note A_, 5 + note D_, 13 + note D_, 9 + note G#, 2 + note C#, 13 + endchannel +; 0x7ca24 \ No newline at end of file diff --git a/music/sfx/sfx_1f_15.asm b/music/sfx/sfx_1f_15.asm new file mode 100644 index 00000000..d91547db --- /dev/null +++ b/music/sfx/sfx_1f_15.asm @@ -0,0 +1,55 @@ +SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c) + dutycycle 160 + note D_, 5 + unknownmusic0xf3 + note C_, 1 + note C_, 7 + note D_, 9 + notetype 5, 6, 0 + note C_, 8 + note D_, 4 + octave 6 + note D_, 1 + note C_, 8 + note D_, 9 + notetype 1, 1, 0 + note C_, 8 + endchannel + + +SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f) + dutycycle 90 + note D_, 6 + note B_, 4 + unknownmusic0xf1 + note C_, 7 + note D_, 8 + rest 6 + note F_, 3 + note C_, 8 + note D_, 4 + note A#, 3 + note C#, 2 + note C_, 8 + note D_, 9 + note B_, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_1f_15_Ch3: ; 7cc32 (1f:4c32) + note D_, 4 + note A#, 3 + note D#, 13 + note D_, 13 + note A_, 5 + note D_, 13 + note D_, 4 + note G#, 3 + note C#, 13 + note D_, 9 + note G_, 2 + note D_, 13 + endchannel +; 0x7cc3f \ No newline at end of file diff --git a/music/sfx/sfx_1f_16.asm b/music/sfx/sfx_1f_16.asm new file mode 100644 index 00000000..97914c47 --- /dev/null +++ b/music/sfx/sfx_1f_16.asm @@ -0,0 +1,35 @@ +SFX_1f_16_Ch1: ; 7cb81 (1f:4b81) + duty 0 + note D_, 9 + unknownmusic0xf5 + note G#, 1 + note C_, 5 + note D_, 3 + octave 7 + octave 8 + note C_, 6 + note D_, 9 + notetype 1, 13, 12 + note C_, 6 + endchannel + + +SFX_1f_16_Ch2: ; 7cb90 (1f:4b90) + dutycycle 165 + note D_, 8 + note A_, 6 + note E_, 2 + note C_, 5 + note D_, 3 + note G#, 2 + note D_, 2 + note C_, 6 + note D_, 9 + note F#, 2 + note C#, 11 + note C_, 6 + + +SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e) + endchannel +; 0x7cb9f \ No newline at end of file diff --git a/music/sfx/sfx_1f_17.asm b/music/sfx/sfx_1f_17.asm new file mode 100644 index 00000000..298f9026 --- /dev/null +++ b/music/sfx/sfx_1f_17.asm @@ -0,0 +1,78 @@ +SFX_1f_17_Ch1: ; 7c91b (1f:491b) + dutycycle 240 + note D_, 5 + unknownmusic0xf7 + note C_, 9 + note C_, 7 + note D_, 7 + octave 2 + note C_, 1 + note C_, 7 + note D_, 7 + notetype 7, 15, 0 + note C_, 6 + note D_, 7 + rest 5 + octave 8 + note C_, 6 + note D_, 6 + notetype 3, 12, 0 + note C_, 6 + note D_, 5 + notetype 3, 10, 0 + note C_, 6 + note D_, 9 + octave 7 + note G#, 1 + note C_, 6 + endchannel + + +SFX_1f_17_Ch2: ; 7c93a (1f:493a) + dutycycle 10 + note D_, 5 + rest 8 + note C_, 5 + note C_, 6 + note D_, 7 + note A#, 7 + note C_, 3 + note C_, 6 + note D_, 7 + note A_, 8 + unknownmusic0xf1 + note C_, 5 + note D_, 5 + note B_, 5 + octave 7 + note C_, 5 + note D_, 6 + note A#, 4 + rest 3 + note C_, 5 + note D_, 5 + note B_, 4 + note A#, 4 + note C_, 5 + note D_, 9 + rest 2 + note G#, 3 + note C_, 5 + endchannel + + +SFX_1f_17_Ch3: ; 7c959 (1f:4959) + note D_, 13 + octave 4 + note E_, 13 + note D_, 11 + rest 8 + note F_, 13 + note D_, 13 + note B_, 7 + note E_, 13 + note D_, 16 + note A#, 3 + note F_, 13 + endchannel +; 0x7c966 \ No newline at end of file diff --git a/music/sfx/sfx_1f_18.asm b/music/sfx/sfx_1f_18.asm new file mode 100644 index 00000000..26169d52 --- /dev/null +++ b/music/sfx/sfx_1f_18.asm @@ -0,0 +1,81 @@ +SFX_1f_18_Ch1: ; 7ccca (1f:4cca) + dutycycle 240 + note D_, 5 + unknownmusic0xf7 + note A#, 1 + note C_, 7 + note D_, 9 + octave 2 + note A#, 5 + note C_, 7 + note D_, 5 + notetype 6, 10, 0 + note C_, 7 + note D_, 13 + notetype 3, 2, 0 + note C_, 7 + note D_, 9 + rest 4 + note D_, 5 + note C_, 7 + note D_, 5 + rest 3 + note D_, 1 + note C_, 7 + note D_, 9 + note B_, 2 + note C#, 1 + note C_, 7 + endchannel + + +SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9) + dutycycle 90 + note D_, 5 + octave 1 + note C_, 2 + note C_, 7 + note D_, 9 + notetype 6, 0, 3 + note C_, 7 + note D_, 5 + rest 7 + note C_, 2 + note C_, 7 + note D_, 13 + rest 4 + note G#, 2 + note C_, 6 + note D_, 9 + note B_, 4 + note G#, 4 + note C_, 6 + note D_, 5 + note B_, 3 + note G#, 3 + note C_, 6 + note D_, 9 + note A#, 2 + note G_, 2 + note C_, 6 + endchannel + + +SFX_1f_18_Ch3: ; 7cd08 (1f:4d08) + note D_, 8 + notetype 6, 5, 12 + note D_, 9 + octave 2 + note E_, 13 + note D_, 5 + notetype 4, 5, 12 + note D_, 5 + notetype 4, 4, 12 + note D_, 8 + rest 4 + note E_, 13 + note D_, 9 + note A#, 2 + note F_, 13 + endchannel +; 0x7cd1b \ No newline at end of file diff --git a/music/sfx/sfx_1f_19.asm b/music/sfx/sfx_1f_19.asm new file mode 100644 index 00000000..493796d2 --- /dev/null +++ b/music/sfx/sfx_1f_19.asm @@ -0,0 +1,42 @@ +SFX_1f_19_Ch1: ; 7caaa (1f:4aaa) + dutycycle 10 + note D_, 7 + octave 6 + note C_, 1 + note C_, 6 + note D_, 7 + octave 5 + note G#, 1 + note C_, 6 + note D_, 7 + notetype 3, 7, 0 + note C_, 6 + note D_, 9 + note A#, 2 + note F#, 1 + note C_, 6 + endchannel + + +SFX_1f_19_Ch2: ; 7cabd (1f:4abd) + dutycycle 245 + note D_, 7 + octave 6 + note G#, 3 + note C_, 5 + note D_, 7 + notetype 3, 0, 1 + note C_, 6 + note D_, 7 + note B_, 3 + octave 6 + note C_, 5 + note D_, 9 + note G#, 2 + rest 2 + note C_, 5 + + +SFX_1f_19_Ch3: ; 7cacf (1f:4acf) + endchannel +; 0x7cad0 \ No newline at end of file diff --git a/music/sfx/sfx_1f_1a.asm b/music/sfx/sfx_1f_1a.asm new file mode 100644 index 00000000..08e1a6dc --- /dev/null +++ b/music/sfx/sfx_1f_1a.asm @@ -0,0 +1,51 @@ +SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54) + dutycycle 250 + note D_, 7 + note G#, 4 + note E_, 8 + note C_, 3 + note D_, 16 + note F#, 3 + note D_, 7 + note C_, 3 + note D_, 5 + note F_, 3 + note E_, 6 + note C_, 3 + note D_, 10 + note F#, 4 + note C_, 7 + note C_, 3 + note D_, 16 + note G#, 3 + note D_, 6 + note C_, 3 + note D_, 16 + note E_, 3 + note C_, 8 + note C_, 3 + + +SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e) + endchannel + + +SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f) + note D_, 9 + notetype 4, 8, 12 + note D_, 5 + octave 6 + note A_, 13 + note D_, 16 + rest 7 + note G#, 13 + note D_, 9 + octave 4 + note A#, 13 + note D_, 16 + notetype 7, 9, 12 + note D_, 16 + unknownmusic0xf2 + note A#, 13 + endchannel +; 0x7ca82 \ No newline at end of file diff --git a/music/sfx/sfx_1f_1b.asm b/music/sfx/sfx_1f_1b.asm new file mode 100644 index 00000000..1b7e5aab --- /dev/null +++ b/music/sfx/sfx_1f_1b.asm @@ -0,0 +1,45 @@ +SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82) + dutycycle 240 + note D_, 5 + unknownmusic0xf3 + octave 8 + note C_, 7 + note D_, 16 + octave 4 + note E_, 1 + note C_, 7 + note D_, 9 + rest 2 + note D_, 1 + note C_, 7 + endchannel + + +SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91) + dutycycle 10 + note D_, 4 + rest 4 + note G#, 4 + note C_, 7 + note D_, 15 + note B_, 5 + note C_, 3 + note C_, 7 + note D_, 9 + note A#, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0) + note D_, 5 + notetype 3, 5, 12 + note D_, 16 + octave 2 + note E_, 13 + note D_, 9 + note B_, 2 + note F_, 13 + endchannel +; 0x7caaa \ No newline at end of file diff --git a/music/sfx/sfx_1f_1c.asm b/music/sfx/sfx_1f_1c.asm new file mode 100644 index 00000000..64564a43 --- /dev/null +++ b/music/sfx/sfx_1f_1c.asm @@ -0,0 +1,51 @@ +SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a) + dutycycle 240 + note D_, 16 + unknownmusic0xf6 + note F#, 6 + note C_, 6 + note D_, 11 + octave 4 + note G_, 13 + note C_, 6 + note D_, 4 + rest 3 + note F_, 13 + note C_, 6 + note D_, 16 + note B_, 3 + note D#, 13 + note C_, 6 + endchannel + + +SFX_1f_1c_Ch2: ; 7ccad (1f:4cad) + dutycycle 90 + note D_, 15 + notetype 6, 0, 3 + note C_, 6 + note D_, 10 + note B_, 5 + note C#, 12 + note C_, 6 + note D_, 5 + note A_, 3 + unknownmusic0xfa + note C_, 5 + note D_, 16 + note A#, 3 + notetype 11, 0, 4 + endchannel + + +SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0) + note D_, 13 + octave 2 + note E_, 13 + note D_, 12 + notetype 7, 5, 12 + note D_, 16 + rest 3 + note E_, 13 + endchannel +; 0x7ccca \ No newline at end of file diff --git a/music/sfx/sfx_1f_1d.asm b/music/sfx/sfx_1f_1d.asm new file mode 100644 index 00000000..9c655931 --- /dev/null +++ b/music/sfx/sfx_1f_1d.asm @@ -0,0 +1,83 @@ +SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + note A#, 1 + note C_, 8 + note D_, 7 + octave 2 + note A#, 4 + note C_, 8 + note D_, 11 + unknownmusic0xf4 + note A#, 1 + note C_, 8 + dutycycle 165 + note D_, 11 + unknownmusic0xf6 + notetype 8, 0, 7 + note D_, 5 + octave 5 + notetype 7, 0, 7 + note D_, 16 + unknownmusic0xf2 + notetype 8, 0, 7 + endchannel + + +SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1) + dutycycle 5 + note D_, 3 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 16 + note A#, 8 + note A#, 2 + note C_, 7 + note D_, 7 + note G#, 7 + note A#, 3 + note C_, 7 + note D_, 11 + note G_, 5 + note A#, 2 + note C_, 7 + dutycycle 95 + note D_, 11 + note G_, 7 + notetype 6, 0, 6 + note D_, 5 + note G#, 4 + notetype 9, 0, 6 + note D_, 16 + note A#, 3 + notetype 7, 0, 6 + endchannel + + +SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2) + note D_, 3 + unknownmusic0xf2 + note D#, 13 + note D_, 9 + octave 4 + note D#, 15 + note D_, 16 + notetype 7, 3, 12 + note D_, 7 + rest 6 + note D#, 12 + note D_, 7 + octave 4 + note D#, 14 + note D_, 9 + note B_, 7 + note D#, 13 + note D_, 7 + notetype 4, 3, 13 + note D_, 9 + rest 2 + note D#, 12 + endchannel +; 0x7c7fb \ No newline at end of file diff --git a/music/sfx/sfx_1f_1e.asm b/music/sfx/sfx_1f_1e.asm new file mode 100644 index 00000000..9b3c96bc --- /dev/null +++ b/music/sfx/sfx_1f_1e.asm @@ -0,0 +1,94 @@ +SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f) + dutycycle 240 + note D_, 9 + unknownmusic0xf7 + octave 8 + note C_, 7 + note D_, 7 + octave 2 + octave 3 + note C_, 7 + note D_, 4 + unknownmusic0xf4 + octave 8 + note C_, 7 + note D_, 4 + unknownmusic0xf6 + notetype 0, 0, 6 + note D_, 4 + octave 5 + rest 1 + note C_, 7 + note D_, 5 + unknownmusic0xf2 + note B_, 1 + note C_, 7 + note D_, 16 + note A#, 3 + rest 9 + note C_, 7 + endchannel + + +SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e) + dutycycle 5 + note D_, 4 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 9 + note A#, 8 + note A#, 2 + note C_, 7 + note D_, 7 + note G#, 7 + note A#, 4 + note C_, 7 + note D_, 4 + note G_, 5 + note A#, 2 + note C_, 7 + note D_, 4 + note G_, 7 + note A_, 2 + note C_, 7 + note D_, 4 + note G#, 4 + note G#, 3 + note C_, 7 + note D_, 5 + note A#, 3 + note G_, 2 + note C_, 7 + note D_, 16 + note G_, 3 + note G#, 10 + note C_, 7 + endchannel + + +SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81) + note D_, 3 + unknownmusic0xf2 + note D#, 13 + note D_, 9 + octave 4 + note D#, 15 + note D_, 9 + notetype 7, 3, 12 + note D_, 6 + rest 6 + note D#, 12 + note D_, 4 + notetype 4, 2, 12 + note D_, 3 + note B_, 7 + note D#, 13 + note D_, 4 + note A#, 5 + note D_, 13 + note D_, 9 + note A_, 2 + note D#, 13 + endchannel +; 0x7cc9a \ No newline at end of file diff --git a/music/sfx/sfx_1f_1f.asm b/music/sfx/sfx_1f_1f.asm new file mode 100644 index 00000000..d04cb69d --- /dev/null +++ b/music/sfx/sfx_1f_1f.asm @@ -0,0 +1,98 @@ +SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0) + dutycycle 204 + note D_, 5 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 5 + octave 7 + note G#, 1 + note C_, 8 + note D_, 5 + notetype 1, 4, 0 + note C_, 8 + note D_, 5 + octave 7 + note E_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + note D_, 5 + notetype 1, 0, 0 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 5 + notetype 1, 8, 2 + note C_, 8 + note D_, 5 + rest 2 + note E_, 3 + note C_, 8 + note D_, 9 + note B_, 2 + note E_, 2 + note C_, 8 + endchannel + + +SFX_1f_1f_Ch2: ; 7cafb (1f:4afb) + dutycycle 68 + note D_, 13 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + unknownmusic0xf1 + note C_, 2 + note C_, 8 + note D_, 5 + octave 7 + note G#, 3 + note C_, 8 + note D_, 5 + notetype 1, 4, 1 + note C_, 8 + note D_, 5 + octave 7 + note E_, 2 + note C_, 8 + note D_, 5 + unknownmusic0xf1 + note G#, 3 + note C_, 8 + note D_, 9 + notetype 1, 0, 1 + note C_, 8 + endchannel + + +SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a) + note D_, 16 + note C_, 9 + note C_, 1 + note D_, 5 + note C_, 9 + note C_, 1 + note D_, 5 + notetype 1, 4, 12 + note D_, 5 + note B_, 2 + note D_, 13 + note D_, 5 + notetype 1, 3, 12 + note D_, 5 + note B_, 2 + note D#, 13 + note D_, 5 + rest 2 + note D_, 13 + note D_, 9 + note A#, 2 + note E_, 13 + endchannel +; 0x7cb33 \ No newline at end of file diff --git a/music/sfx/sfx_1f_20.asm b/music/sfx/sfx_1f_20.asm new file mode 100644 index 00000000..dc334861 --- /dev/null +++ b/music/sfx/sfx_1f_20.asm @@ -0,0 +1,80 @@ +SFX_1f_20_Ch1: ; 7cb33 (1f:4b33) + dutycycle 204 + note D_, 9 + unknownmusic0xf5 + note C_, 1 + note C_, 7 + note D_, 3 + notetype 2, 3, 8 + note C_, 7 + note D_, 3 + rest 3 + note D#, 1 + note C_, 7 + note D_, 3 + rest 3 + note D_, 9 + note C_, 7 + note D_, 3 + note B_, 3 + note D_, 1 + note C_, 7 + note D_, 3 + note B_, 3 + note C#, 1 + note C_, 7 + note D_, 3 + note A#, 3 + note C#, 9 + note C_, 7 + note D_, 3 + note B_, 3 + note C#, 1 + note C_, 7 + note D_, 9 + rest 2 + note D_, 1 + note C_, 7 + endchannel + + +SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a) + dutycycle 68 + note D_, 13 + rest 4 + rest 1 + note C_, 6 + note D_, 4 + note B_, 2 + unknownmusic0xf9 + note C_, 6 + note D_, 3 + note A#, 2 + unknownmusic0xf1 + note C_, 6 + note D_, 3 + note A#, 2 + unknownmusic0xe9 + note C_, 6 + note D_, 3 + note A_, 2 + octave 7 + note C_, 6 + note D_, 3 + note A_, 2 + notetype 9, 0, 5 + note D_, 3 + note G#, 2 + notetype 1, 0, 5 + note D_, 3 + note A_, 2 + notetype 9, 0, 5 + note D_, 9 + note A_, 2 + octave 7 + note C_, 6 + + +SFX_1f_20_Ch3: ; 7cb80 (1f:4b80) + endchannel +; 0x7cb81 \ No newline at end of file diff --git a/music/sfx/sfx_1f_21.asm b/music/sfx/sfx_1f_21.asm new file mode 100644 index 00000000..8c43c389 --- /dev/null +++ b/music/sfx/sfx_1f_21.asm @@ -0,0 +1,106 @@ +SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f) + dutycycle 136 + note D_, 6 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note D_, 10 + notetype 1, 6, 0 + note C_, 7 + note D_, 6 + octave 6 + note C#, 3 + note C_, 7 + note D_, 10 + rest 2 + note D_, 3 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 1 + note C_, 7 + note D_, 7 + notetype 1, 2, 0 + note C_, 7 + loopchannel 2, SFX_1f_21_Ch1 + endchannel + + +SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe) + dutycycle 64 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 6 + unknownmusic0xf2 + note F_, 2 + note C_, 7 + note D_, 10 + notetype 1, 6, 1 + note C_, 7 + note D_, 6 + octave 6 + note C#, 5 + note C_, 7 + note D_, 9 + rest 2 + note D_, 5 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 2 + note C_, 7 + note D_, 13 + notetype 1, 2, 1 + note C_, 7 + note D_, 6 + octave 6 + note C#, 5 + note C_, 7 + note D_, 9 + rest 2 + note D_, 5 + note C_, 7 + note D_, 6 + unknownmusic0xf2 + note C#, 2 + note C_, 7 + note D_, 5 + notetype 1, 2, 1 + note C_, 7 + endchannel + + +SFX_1f_21_Ch3: ; 7cbed (1f:4bed) + note D_, 7 + notetype 2, 1, 12 + note D_, 10 + note B_, 2 + note D_, 13 + note D_, 9 + rest 3 + note D_, 13 + note D_, 10 + note B_, 2 + note D#, 13 + note D_, 7 + rest 3 + note D_, 13 + note D_, 10 + note A#, 3 + note D#, 13 + note D_, 8 + rest 3 + note D_, 13 + note D_, 6 + note A#, 2 + note D#, 13 + note D_, 10 + rest 3 + note D_, 13 + note D_, 5 + note A#, 2 + note D#, 13 + endchannel +; 0x7cc0c \ No newline at end of file diff --git a/music/sfx/sfx_1f_22.asm b/music/sfx/sfx_1f_22.asm new file mode 100644 index 00000000..02e35323 --- /dev/null +++ b/music/sfx/sfx_1f_22.asm @@ -0,0 +1,54 @@ +SFX_1f_22_Ch1: ; 7ca24 (1f:4a24) + dutycycle 165 + note D_, 5 + octave 7 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf2 + note G#, 1 + note C_, 8 + note D_, 3 + note A_, 3 + note E_, 1 + note C_, 8 + note D_, 9 + octave 7 + note C_, 1 + note C_, 7 + endchannel + + +SFX_1f_22_Ch2: ; 7ca37 (1f:4a37) + dutycycle 10 + note D_, 5 + note B_, 2 + octave 7 + note C_, 7 + note D_, 4 + rest 3 + octave 7 + note C_, 7 + note D_, 4 + note F#, 3 + note G#, 2 + note C_, 7 + note D_, 9 + note B_, 2 + octave 7 + note C_, 6 + endchannel + + +SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a) + note D_, 3 + note F#, 2 + note D#, 3 + note D_, 3 + note F#, 2 + note D_, 2 + note D_, 9 + note F#, 2 + note C#, 2 + endchannel +; 0x7ca54 \ No newline at end of file diff --git a/music/sfx/sfx_1f_23.asm b/music/sfx/sfx_1f_23.asm new file mode 100644 index 00000000..1fcdcb8d --- /dev/null +++ b/music/sfx/sfx_1f_23.asm @@ -0,0 +1,75 @@ +SFX_1f_23_Ch1: ; 7c966 (1f:4966) + dutycycle 241 + note D_, 5 + unknownmusic0xf7 + rest 1 + note C_, 8 + note D_, 13 + octave 2 + rest 3 + note C_, 8 + note D_, 7 + note B_, 6 + note G#, 1 + note C_, 7 + note D_, 5 + rest 5 + note G_, 1 + note C_, 7 + note D_, 5 + note B_, 6 + note F#, 1 + note C_, 7 + note D_, 9 + rest 2 + note E_, 1 + note C_, 7 + endchannel + + +SFX_1f_23_Ch2: ; 7c981 (1f:4981) + dutycycle 204 + note D_, 4 + rest 8 + note G#, 2 + note C_, 8 + note D_, 13 + note B_, 7 + note G#, 1 + note C_, 8 + note D_, 7 + note A#, 6 + note E_, 2 + note C_, 7 + note D_, 5 + rest 5 + note D#, 3 + note C_, 7 + note D_, 7 + note B_, 6 + note D_, 2 + note C_, 7 + note D_, 9 + note A#, 2 + note C_, 3 + note C_, 7 + endchannel + + +SFX_1f_23_Ch3: ; 7c99c (1f:499c) + note D_, 4 + octave 4 + note D#, 13 + note D_, 13 + notetype 6, 2, 12 + note D_, 5 + octave 4 + note D#, 13 + note D_, 9 + note B_, 8 + note F_, 13 + note D_, 16 + rest 3 + note F_, 14 + endchannel +; 0x7c9ac \ No newline at end of file diff --git a/music/sfx/sfx_1f_24.asm b/music/sfx/sfx_1f_24.asm new file mode 100644 index 00000000..0b08b05d --- /dev/null +++ b/music/sfx/sfx_1f_24.asm @@ -0,0 +1,83 @@ +SFX_1f_24_Ch1: ; 7c9ac (1f:49ac) + dutycycle 201 + note D_, 9 + unknownmusic0xf7 + note G#, 1 + note C_, 7 + note D_, 3 + unknownmusic0xf7 + note F#, 1 + note C_, 7 + note D_, 2 + octave 1 + note E_, 1 + note C_, 7 + note D_, 2 + octave 1 + note D_, 1 + note C_, 7 + note D_, 16 + notetype 1, 0, 0 + note C_, 7 + note D_, 5 + rest 8 + note E_, 1 + note C_, 8 + note D_, 5 + note A#, 8 + note D#, 1 + note C_, 8 + note D_, 16 + note A_, 2 + note D_, 1 + note C_, 8 + endchannel + + +SFX_1f_24_Ch2: ; 7c9cf (1f:49cf) + dutycycle 121 + note D_, 11 + octave 1 + note G#, 3 + note C_, 7 + note D_, 3 + octave 1 + note F#, 3 + note C_, 7 + note D_, 2 + notetype 7, 4, 2 + note C_, 7 + note D_, 2 + notetype 7, 2, 2 + note C_, 7 + note D_, 16 + rest 2 + note C_, 3 + note C_, 7 + note D_, 5 + note B_, 8 + note E_, 3 + note C_, 8 + note D_, 3 + note A_, 8 + note D#, 3 + note C_, 8 + note D_, 16 + note G#, 2 + note D_, 3 + note C_, 8 + endchannel + + +SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2) + note D_, 5 + note G_, 5 + note D_, 2 + note D_, 5 + note G_, 5 + note C#, 1 + note D_, 5 + note G_, 2 + note D_, 1 + endchannel +; 0x7c9fc \ No newline at end of file diff --git a/music/sfx/sfx_1f_25.asm b/music/sfx/sfx_1f_25.asm new file mode 100644 index 00000000..b2794a5d --- /dev/null +++ b/music/sfx/sfx_1f_25.asm @@ -0,0 +1,87 @@ +SFX_1f_25_Ch1: ; 7c888 (1f:4888) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + note A#, 1 + note C_, 8 + note D_, 9 + octave 2 + note A#, 5 + note C_, 8 + note D_, 5 + notetype 6, 10, 0 + note C_, 8 + note D_, 16 + notetype 3, 2, 0 + note C_, 8 + note D_, 9 + rest 4 + note D_, 4 + note C_, 8 + note D_, 3 + rest 3 + note D_, 9 + note C_, 8 + note D_, 9 + note B_, 2 + note D#, 1 + note C_, 8 + endchannel + + +SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7) + dutycycle 10 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 7 + note A#, 8 + note E_, 2 + note C_, 8 + note D_, 9 + note G#, 7 + note E_, 4 + note C_, 8 + note D_, 5 + note G_, 7 + note E_, 2 + note C_, 8 + note D_, 14 + note G#, 4 + rest 3 + note C_, 7 + note D_, 8 + note G_, 4 + rest 2 + note C_, 7 + note D_, 4 + note G#, 3 + rest 13 + note C_, 7 + note D_, 9 + note G_, 2 + notetype 8, 0, 6 + endchannel + + +SFX_1f_25_Ch3: ; 7c8ca (1f:48ca) + note D_, 3 + unknownmusic0xf2 + note E_, 13 + note D_, 7 + octave 2 + note D#, 11 + note D_, 5 + notetype 7, 3, 10 + note D_, 7 + notetype 6, 2, 12 + note D_, 9 + octave 3 + note D#, 13 + note D_, 13 + notetype 2, 3, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x7c8e0 \ No newline at end of file diff --git a/music/sfx/sfx_1f_26.asm b/music/sfx/sfx_1f_26.asm new file mode 100644 index 00000000..5de1922b --- /dev/null +++ b/music/sfx/sfx_1f_26.asm @@ -0,0 +1,52 @@ +SFX_1f_26_Ch1: ; 7cda0 (1f:4da0) + dutycycle 165 + note D_, 13 + unknownmusic0xf2 + note E_, 1 + note C_, 5 + note D_, 16 + octave 5 + note A#, 1 + note C_, 5 + note D_, 5 + notetype 2, 9, 0 + note C_, 5 + note D_, 9 + notetype 1, 8, 0 + note C_, 5 + endchannel + + +SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3) + dutycycle 238 + note D_, 12 + notetype 2, 3, 8 + note C_, 5 + note D_, 15 + rest 7 + note A_, 9 + note C_, 5 + note D_, 4 + note B_, 3 + note G#, 9 + note C_, 5 + note D_, 9 + note B_, 2 + note G_, 9 + note C_, 5 + endchannel + + +SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6) + note D_, 11 + octave 2 + note F#, 13 + note D_, 16 + notetype 2, 5, 12 + note D_, 4 + rest 3 + note F#, 13 + note D_, 9 + notetype 1, 5, 12 + endchannel +; 0x7cdd3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_27.asm b/music/sfx/sfx_1f_27.asm new file mode 100644 index 00000000..fc1630c0 --- /dev/null +++ b/music/sfx/sfx_1f_27.asm @@ -0,0 +1,74 @@ +SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3) + dutycycle 51 + note D_, 16 + unknownmusic0xf6 + rest 1 + note C_, 6 + note D_, 9 + octave 5 + note B_, 13 + note C_, 6 + note D_, 7 + notetype 2, 13, 0 + note C_, 6 + note D_, 7 + note B_, 3 + octave 8 + note C_, 6 + note D_, 7 + rest 3 + stereopanning 5 + note D_, 9 + note B_, 2 + note C_, 1 + note C_, 7 + endchannel + + +SFX_1f_27_Ch2: ; 7cdee (1f:4dee) + dutycycle 153 + note D_, 15 + rest 7 + note B_, 2 + note C_, 5 + note D_, 8 + rest 4 + note A#, 14 + note C_, 5 + note D_, 6 + note B_, 3 + rest 2 + note C_, 5 + note D_, 9 + note A_, 3 + notetype 1, 0, 4 + note D_, 7 + note A#, 3 + octave 7 + note C_, 5 + note D_, 9 + note A_, 2 + unknownmusic0xf1 + note C_, 5 + endchannel + + +SFX_1f_27_Ch3: ; 7ce09 (1f:4e09) + note D_, 11 + octave 2 + note F_, 13 + note D_, 11 + notetype 6, 6, 12 + note D_, 5 + rest 3 + note E_, 13 + note D_, 7 + notetype 3, 5, 12 + note D_, 9 + note B_, 4 + note E_, 13 + note D_, 9 + note A#, 2 + note F_, 13 + endchannel +; 0x7ce1c \ No newline at end of file diff --git a/music/sfx/sfx_1f_28.asm b/music/sfx/sfx_1f_28.asm new file mode 100644 index 00000000..f5ea35b6 --- /dev/null +++ b/music/sfx/sfx_1f_28.asm @@ -0,0 +1,44 @@ +SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c) + dutycycle 240 + note D_, 9 + octave 4 + note A_, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf5 + rest 1 + note C_, 8 + note D_, 9 + notetype 1, 13, 8 + note C_, 8 + endchannel + + +SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b) + dutycycle 165 + note D_, 11 + rest 5 + note G_, 2 + note C_, 8 + note D_, 16 + note B_, 7 + note A#, 3 + note C_, 8 + note D_, 9 + note A#, 2 + note B_, 8 + note C_, 8 + endchannel + + +SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a) + note D_, 9 + octave 4 + note E_, 13 + note D_, 15 + rest 5 + note D#, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x7ce44 \ No newline at end of file diff --git a/music/sfx/sfx_1f_29.asm b/music/sfx/sfx_1f_29.asm new file mode 100644 index 00000000..2413f6f5 --- /dev/null +++ b/music/sfx/sfx_1f_29.asm @@ -0,0 +1,76 @@ +SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa) + dutycycle 240 + note D_, 5 + unknownmusic0xf3 + note G#, 1 + note C_, 8 + note D_, 16 + octave 1 + note C_, 1 + note C_, 8 + note D_, 9 + notetype 3, 1, 0 + note C_, 8 + note D_, 5 + rest 3 + note C_, 1 + note C_, 8 + note D_, 5 + notetype 2, 15, 0 + note C_, 7 + note D_, 9 + rest 2 + octave 8 + note C_, 7 + endchannel + + +SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5) + dutycycle 90 + note D_, 7 + rest 4 + note C_, 2 + note C_, 8 + note D_, 15 + note B_, 8 + note G#, 2 + note C_, 7 + note D_, 8 + note B_, 4 + note A_, 3 + note C_, 7 + note D_, 4 + note A#, 3 + note G#, 2 + note C_, 7 + note D_, 5 + note B_, 3 + note G_, 3 + note C_, 7 + note D_, 9 + note A#, 2 + note F#, 2 + note C_, 7 + endchannel + + +SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0) + note D_, 7 + octave 5 + note F_, 13 + note D_, 15 + notetype 6, 4, 12 + note D_, 7 + rest 7 + note D#, 13 + note D_, 4 + note B_, 4 + note E_, 13 + note D_, 4 + note A#, 3 + note F_, 13 + note D_, 9 + note B_, 2 + note F#, 13 + endchannel +; 0x7cef3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_2a.asm b/music/sfx/sfx_1f_2a.asm new file mode 100644 index 00000000..6c4af622 --- /dev/null +++ b/music/sfx/sfx_1f_2a.asm @@ -0,0 +1,44 @@ +SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d) + dutycycle 240 + note D_, 16 + notetype 7, 8, 0 + note C_, 8 + note D_, 5 + octave 2 + note A#, 1 + note C_, 8 + note D_, 16 + notetype 2, 4, 0 + note C_, 8 + endchannel + + +SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c) + dutycycle 90 + note D_, 16 + rest 8 + note F_, 4 + note C_, 8 + note D_, 6 + note B_, 7 + note G_, 3 + note C_, 8 + note D_, 16 + rest 3 + note C#, 2 + note C_, 8 + endchannel + + +SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b) + note D_, 14 + unknownmusic0xf6 + note E_, 13 + note D_, 5 + octave 2 + note D#, 13 + note D_, 16 + unknownmusic0xf2 + note E_, 13 + endchannel +; 0x7cd65 \ No newline at end of file diff --git a/music/sfx/sfx_1f_2b.asm b/music/sfx/sfx_1f_2b.asm new file mode 100644 index 00000000..ee606da1 --- /dev/null +++ b/music/sfx/sfx_1f_2b.asm @@ -0,0 +1,56 @@ +SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3) + dutycycle 15 + note D_, 16 + unknownmusic0xf7 + note C_, 1 + note C_, 6 + note D_, 16 + octave 1 + note C_, 9 + note C_, 6 + note D_, 9 + note B_, 5 + note G#, 1 + note C_, 5 + note D_, 16 + note A#, 3 + note F#, 1 + note C_, 5 + endchannel + + +SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06) + dutycycle 68 + note D_, 15 + notetype 7, 8, 1 + note C_, 5 + note D_, 15 + rest 8 + note G#, 10 + note C_, 5 + note D_, 11 + note B_, 5 + note C_, 2 + note C_, 5 + note D_, 16 + rest 3 + octave 7 + note C_, 4 + endchannel + + +SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19) + note D_, 15 + unknownmusic0xf7 + note G_, 13 + note D_, 13 + unknownmusic0xf6 + note F#, 13 + note D_, 10 + octave 4 + note G_, 13 + note D_, 16 + octave 6 + note F#, 13 + endchannel +; 0x7cf26 \ No newline at end of file diff --git a/music/sfx/sfx_1f_2c.asm b/music/sfx/sfx_1f_2c.asm new file mode 100644 index 00000000..d0ba9bdb --- /dev/null +++ b/music/sfx/sfx_1f_2c.asm @@ -0,0 +1,90 @@ +SFX_1f_2c_Ch1: ; 7d003 (1f:5003) + dutycycle 80 + note D_, 11 + unknownmusic0xf5 + note G#, 1 + note C_, 7 + note D_, 4 + octave 6 + note A#, 1 + note C_, 7 + note D_, 4 + unknownmusic0xf2 + rest 1 + note C_, 7 + note D_, 4 + octave 6 + octave 8 + note C_, 7 + note D_, 4 + notetype 2, 0, 0 + note C_, 8 + note D_, 4 + rest 3 + octave 8 + note C_, 7 + note D_, 4 + notetype 2, 12, 0 + note C_, 7 + note D_, 9 + rest 2 + note A#, 1 + note C_, 7 + endchannel + + +SFX_1f_2c_Ch2: ; 7d026 (1f:5026) + dutycycle 15 + note D_, 10 + notetype 5, 3, 1 + note C_, 7 + note D_, 4 + notetype 2, 5, 2 + note C_, 7 + note D_, 4 + octave 6 + note G_, 2 + note C_, 7 + note D_, 4 + note B_, 3 + note A_, 2 + note C_, 7 + note D_, 4 + rest 3 + note B_, 3 + note C_, 7 + note D_, 4 + note B_, 3 + note A_, 2 + note C_, 7 + note D_, 4 + rest 3 + note G_, 2 + note C_, 7 + note D_, 9 + note B_, 2 + note F_, 2 + note C_, 7 + endchannel + + +SFX_1f_2c_Ch3: ; 7d049 (1f:5049) + note D_, 7 + octave 5 + note E_, 13 + note D_, 5 + rest 4 + note D#, 13 + note D_, 6 + notetype 4, 3, 12 + note D_, 5 + rest 5 + note D_, 13 + note D_, 7 + note B_, 5 + note D#, 13 + note D_, 9 + rest 2 + note D_, 13 + endchannel +; 0x7d05c \ No newline at end of file diff --git a/music/sfx/sfx_1f_2d.asm b/music/sfx/sfx_1f_2d.asm new file mode 100644 index 00000000..a639cdc4 --- /dev/null +++ b/music/sfx/sfx_1f_2d.asm @@ -0,0 +1,38 @@ +SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b) + dutycycle 27 + note D_, 8 + notetype 2, 4, 0 + note C_, 8 + note D_, 16 + octave 3 + note F#, 1 + note C_, 8 + note D_, 16 + rest 2 + note D#, 1 + note C_, 8 + endchannel + + +SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a) + dutycycle 129 + note D_, 3 + rest 3 + note C_, 2 + note C_, 8 + note D_, 5 + rest 3 + note C_, 9 + note C_, 8 + note D_, 16 + notetype 7, 4, 1 + note C_, 8 + note D_, 16 + note A#, 3 + note C_, 2 + note C_, 8 + + +SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c) + endchannel +; 0x7cd3d \ No newline at end of file diff --git a/music/sfx/sfx_1f_2e.asm b/music/sfx/sfx_1f_2e.asm new file mode 100644 index 00000000..88c64279 --- /dev/null +++ b/music/sfx/sfx_1f_2e.asm @@ -0,0 +1,74 @@ +SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + note E_, 1 + note C_, 8 + note D_, 13 + octave 2 + note E_, 5 + note C_, 8 + note D_, 7 + notetype 5, 5, 0 + note C_, 8 + note D_, 5 + rest 4 + note F#, 1 + note C_, 8 + note D_, 4 + rest 4 + note G#, 1 + note C_, 8 + note D_, 9 + notetype 1, 10, 0 + note C_, 8 + endchannel + + +SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f) + dutycycle 10 + note D_, 7 + rest 8 + note C_, 2 + note C_, 8 + note D_, 12 + note B_, 7 + note C_, 3 + note C_, 8 + note D_, 7 + note A#, 6 + note C#, 2 + note C_, 8 + note D_, 5 + note A_, 4 + note D_, 2 + note C_, 8 + note D_, 4 + note A#, 4 + note E_, 2 + note C_, 8 + note D_, 9 + note A_, 2 + note F#, 3 + note C_, 8 + endchannel + + +SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa) + note D_, 4 + octave 6 + note D#, 13 + note D_, 9 + notetype 6, 4, 12 + note D_, 6 + notetype 4, 3, 12 + note D_, 13 + rest 8 + note E_, 13 + note D_, 3 + octave 6 + note D#, 13 + note D_, 9 + notetype 1, 2, 12 + endchannel +; 0x7cfbd \ No newline at end of file diff --git a/music/sfx/sfx_1f_2f.asm b/music/sfx/sfx_1f_2f.asm new file mode 100644 index 00000000..100947ae --- /dev/null +++ b/music/sfx/sfx_1f_2f.asm @@ -0,0 +1,61 @@ +SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65) + dutycycle 240 + note D_, 7 + unknownmusic0xf7 + rest 1 + note C_, 7 + note D_, 16 + octave 1 + note C_, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf4 + stereopanning 6 + note D_, 5 + octave 4 + octave 8 + note C_, 7 + note D_, 9 + notetype 1, 13, 0 + note C_, 7 + endchannel + + +SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c) + dutycycle 10 + note D_, 8 + octave 2 + note G#, 2 + note C_, 7 + note D_, 15 + notetype 5, 12, 1 + note C_, 7 + note D_, 5 + rest 5 + note B_, 2 + note C_, 7 + note D_, 5 + notetype 4, 10, 1 + note C_, 7 + note D_, 9 + rest 2 + note A_, 2 + note C_, 7 + endchannel + + +SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93) + note D_, 11 + note A#, 7 + note D#, 13 + note D_, 15 + note A_, 5 + note D_, 13 + note D_, 6 + note A#, 4 + note D#, 13 + note D_, 9 + note A_, 2 + note D_, 13 + endchannel +; 0x7cda0 \ No newline at end of file diff --git a/music/sfx/sfx_1f_30.asm b/music/sfx/sfx_1f_30.asm new file mode 100644 index 00000000..3b9c4a27 --- /dev/null +++ b/music/sfx/sfx_1f_30.asm @@ -0,0 +1,80 @@ +SFX_1f_30_Ch1: ; 7cf26 (1f:4f26) + dutycycle 245 + note D_, 8 + notetype 6, 14, 1 + note C_, 8 + note D_, 7 + rest 7 + octave 6 + note C_, 8 + note D_, 10 + notetype 6, 14, 1 + note C_, 8 + note D_, 8 + rest 7 + octave 8 + note C_, 8 + note D_, 6 + note B_, 7 + octave 6 + note C_, 8 + note D_, 8 + rest 7 + octave 7 + note C_, 8 + note D_, 7 + note B_, 7 + octave 8 + note C_, 8 + note D_, 9 + note A#, 2 + notetype 15, 0, 7 + endchannel + + +SFX_1f_30_Ch2: ; 7cf49 (1f:4f49) + dutycycle 68 + note D_, 7 + rest 4 + rest 10 + note C_, 8 + note D_, 7 + note B_, 4 + rest 8 + note C_, 8 + note D_, 11 + rest 5 + rest 4 + note C_, 8 + note D_, 9 + note B_, 5 + rest 8 + note C_, 8 + note D_, 7 + rest 4 + rest 10 + note C_, 8 + note D_, 16 + note A#, 3 + rest 6 + note C_, 8 + endchannel + + +SFX_1f_30_Ch3: ; 7cf64 (1f:4f64) + note D_, 14 + note C#, 10 + note G_, 13 + note D_, 14 + unknownmusic0xf7 + note G#, 13 + note D_, 13 + notetype 6, 7, 12 + note D_, 9 + rest 5 + note F#, 13 + note D_, 16 + note B_, 4 + note F_, 13 + endchannel +; 0x7cf74 \ No newline at end of file diff --git a/music/sfx/sfx_1f_31.asm b/music/sfx/sfx_1f_31.asm new file mode 100644 index 00000000..f017713b --- /dev/null +++ b/music/sfx/sfx_1f_31.asm @@ -0,0 +1,72 @@ +SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd) + dutycycle 244 + note D_, 16 + stereopanning 5 + note C_, 8 + note D_, 11 + octave 8 + note C_, 1 + note C_, 8 + note D_, 7 + note B_, 5 + note C#, 1 + note C_, 8 + note D_, 5 + notetype 3, 0, 0 + note C_, 8 + note D_, 7 + note B_, 3 + note D_, 1 + note C_, 7 + note D_, 9 + note A#, 2 + note D_, 5 + note C_, 7 + endchannel + + +SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8) + dutycycle 34 + note D_, 16 + note B_, 1 + rest 4 + note C_, 7 + note D_, 11 + note A#, 1 + rest 2 + note C_, 7 + note D_, 7 + note G#, 5 + notetype 2, 0, 6 + note D_, 5 + note A_, 4 + rest 2 + note C_, 7 + note D_, 7 + note G#, 3 + octave 7 + note C_, 6 + note D_, 9 + note F#, 2 + unknownmusic0xe8 + note C_, 6 + endchannel + + +SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3) + note D_, 7 + octave 2 + note E_, 13 + note D_, 16 + notetype 6, 3, 12 + note D_, 11 + rest 6 + note E_, 11 + note D_, 2 + note B_, 3 + note F_, 12 + note D_, 16 + rest 3 + note E_, 13 + endchannel +; 0x7d003 \ No newline at end of file diff --git a/music/sfx/sfx_1f_32.asm b/music/sfx/sfx_1f_32.asm new file mode 100644 index 00000000..4bf6410d --- /dev/null +++ b/music/sfx/sfx_1f_32.asm @@ -0,0 +1,105 @@ +SFX_1f_32_Ch1: ; 7ce44 (1f:4e44) + dutycycle 240 + note D_, 7 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note D_, 7 + octave 6 + note E_, 1 + note C_, 7 + note D_, 7 + notetype 2, 8, 0 + note C_, 7 + note D_, 7 + octave 6 + rest 1 + note C_, 7 + note D_, 7 + notetype 2, 0, 0 + note C_, 8 + note D_, 7 + rest 3 + note E_, 1 + note C_, 8 + note D_, 7 + note B_, 3 + note G#, 1 + note C_, 8 + note D_, 9 + note A#, 2 + rest 1 + note C_, 8 + endchannel + + +SFX_1f_32_Ch2: ; 7ce67 (1f:4e67) + dutycycle 17 + note D_, 4 + note C_, 9 + note C_, 2 + note C_, 1 + note D_, 7 + rest 3 + rest 2 + note C_, 6 + note D_, 7 + note B_, 3 + note C_, 3 + note C_, 7 + note D_, 7 + note A#, 3 + note E_, 2 + note C_, 7 + note D_, 7 + note B_, 3 + note G#, 3 + note C_, 7 + note D_, 7 + note A#, 3 + rest 3 + note C_, 7 + note D_, 7 + note A_, 3 + note C_, 2 + note C_, 8 + note D_, 7 + note A#, 3 + note E_, 3 + note C_, 8 + note D_, 9 + note G#, 2 + note G#, 2 + note C_, 8 + endchannel + + +SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e) + note D_, 7 + note C_, 9 + note C_, 2 + note D_, 6 + octave 6 + note F_, 13 + note D_, 6 + rest 3 + note E_, 13 + note D_, 6 + notetype 2, 3, 12 + note D_, 6 + note B_, 3 + note D_, 13 + note D_, 6 + rest 3 + note C#, 13 + note D_, 6 + note A#, 3 + note C#, 12 + note D_, 6 + note A_, 3 + note C#, 11 + note D_, 9 + note G#, 2 + note C#, 9 + endchannel +; 0x7ceaa \ No newline at end of file diff --git a/music/sfx/sfx_1f_33.asm b/music/sfx/sfx_1f_33.asm new file mode 100644 index 00000000..7a91a221 --- /dev/null +++ b/music/sfx/sfx_1f_33.asm @@ -0,0 +1,54 @@ +SFX_1f_33_Ch1: ; 7d05c (1f:505c) + dutycycle 165 + note D_, 4 + unknownmusic0xf4 + note E_, 2 + note C_, 7 + note D_, 14 + notetype 6, 2, 1 + note C_, 8 + note D_, 9 + unknownmusic0xf4 + note C#, 10 + note C_, 8 + note D_, 9 + rest 2 + note C#, 11 + note C_, 8 + endchannel + + +SFX_1f_33_Ch2: ; 7d06f (1f:506f) + dutycycle 204 + note D_, 5 + unknownmusic0xf4 + note G#, 1 + note C_, 6 + note D_, 15 + octave 2 + octave 8 + note C_, 7 + note D_, 9 + notetype 5, 13, 8 + note C_, 7 + note D_, 9 + notetype 1, 13, 12 + note C_, 7 + endchannel + + +SFX_1f_33_Ch3: ; 7d082 (1f:5082) + note D_, 6 + rest 5 + note E_, 7 + note D_, 14 + note A#, 6 + note E_, 5 + note D_, 9 + rest 5 + note E_, 6 + note D_, 9 + note B_, 2 + note E_, 5 + endchannel +; 0x7d08f \ No newline at end of file diff --git a/music/sfx/sfx_1f_34.asm b/music/sfx/sfx_1f_34.asm new file mode 100644 index 00000000..3ad8af7c --- /dev/null +++ b/music/sfx/sfx_1f_34.asm @@ -0,0 +1,53 @@ +SFX_1f_34_Ch1: ; 7d08f (1f:508f) + dutycycle 240 + note D_, 14 + unknownmusic0xf1 + note C#, 2 + note C_, 6 + note D_, 14 + octave 7 + note C#, 6 + note C_, 6 + note D_, 14 + octave 7 + note C#, 2 + note C_, 6 + note D_, 9 + notetype 1, 1, 1 + note C_, 6 + endchannel + + +SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2) + dutycycle 21 + note D_, 13 + octave 7 + note C_, 13 + note C_, 6 + note D_, 13 + notetype 1, 1, 0 + note C_, 6 + note D_, 15 + rest 2 + note C_, 13 + note C_, 6 + note D_, 9 + rest 2 + note C_, 11 + note C_, 6 + endchannel + + +SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5) + note D_, 15 + unknownmusic0xf2 + note F#, 6 + note D_, 14 + octave 6 + note F_, 6 + note D_, 15 + notetype 2, 5, 6 + note D_, 9 + notetype 1, 6, 6 + endchannel +; 0x7d0c2 \ No newline at end of file diff --git a/music/sfx/sfx_1f_35.asm b/music/sfx/sfx_1f_35.asm new file mode 100644 index 00000000..d0801f8b --- /dev/null +++ b/music/sfx/sfx_1f_35.asm @@ -0,0 +1,71 @@ +SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2) + dutycycle 27 + note D_, 4 + unknownmusic0xf3 + note F#, 5 + note C_, 6 + note D_, 3 + octave 6 + note E_, 5 + note C_, 6 + note D_, 6 + notetype 1, 2, 2 + note C_, 6 + note D_, 3 + note B_, 3 + note G#, 5 + note C_, 5 + note D_, 9 + notetype 1, 10, 2 + note C_, 5 + note D_, 4 + unknownmusic0xf3 + note D_, 5 + note C_, 6 + note D_, 5 + octave 4 + octave 4 + note C_, 5 + note D_, 9 + notetype 1, 0, 2 + note C_, 6 + endchannel + + +SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5) + dutycycle 204 + note D_, 4 + notetype 3, 6, 0 + note C_, 6 + note D_, 3 + rest 3 + note E_, 1 + note C_, 6 + note D_, 6 + rest 2 + note D_, 1 + note C_, 6 + note D_, 3 + note A_, 3 + note G#, 1 + note C_, 5 + note D_, 9 + rest 2 + note A#, 1 + note C_, 5 + note D_, 4 + notetype 3, 2, 0 + note C_, 6 + note D_, 4 + rest 5 + octave 8 + note C_, 5 + note D_, 9 + rest 2 + note C_, 1 + note C_, 6 + + +SFX_1f_35_Ch3: ; 7d107 (1f:5107) + endchannel +; 0x7d108 \ No newline at end of file diff --git a/music/sfx/sfx_1f_36.asm b/music/sfx/sfx_1f_36.asm new file mode 100644 index 00000000..a72175f2 --- /dev/null +++ b/music/sfx/sfx_1f_36.asm @@ -0,0 +1,56 @@ +SFX_1f_36_Ch1: ; 7d108 (1f:5108) + dutycycle 17 + note D_, 3 + note D#, 14 + note G#, 2 + note C_, 4 + note D_, 8 + unknownmusic0xf5 + note C_, 2 + note C_, 7 + note D_, 2 + rest 3 + note G#, 2 + note C_, 5 + note D_, 9 + note A_, 2 + note G#, 2 + note C_, 4 + endchannel + + +SFX_1f_36_Ch2: ; 7d11b (1f:511b) + dutycycle 238 + note D_, 3 + note D#, 15 + note B_, 1 + note C_, 6 + note D_, 8 + notetype 5, 5, 13 + note C_, 8 + note D_, 2 + note B_, 3 + note B_, 1 + note C_, 7 + note D_, 9 + note F#, 2 + note B_, 1 + note C_, 6 + endchannel + + +SFX_1f_36_Ch3: ; 7d12e (1f:512e) + note D_, 3 + note A_, 3 + note E_, 10 + note D_, 8 + note B_, 6 + note D_, 10 + note D_, 2 + note A#, 3 + note D#, 10 + note D_, 9 + note A_, 2 + note E_, 10 + endchannel +; 0x7d13b \ No newline at end of file diff --git a/music/sfx/sfx_1f_37.asm b/music/sfx/sfx_1f_37.asm new file mode 100644 index 00000000..d7458c8e --- /dev/null +++ b/music/sfx/sfx_1f_37.asm @@ -0,0 +1,59 @@ +SFX_1f_37_Ch1: ; 7c7fb (1f:47fb) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + rest 1 + note C_, 8 + note D_, 7 + octave 4 + rest 2 + note C_, 8 + note D_, 11 + unknownmusic0xf6 + rest 1 + note C_, 8 + note D_, 5 + notetype 3, 12, 2 + note C_, 8 + note D_, 9 + rest 2 + rest 1 + note C_, 8 + endchannel + + +SFX_1f_37_Ch2: ; 7c812 (1f:4812) + dutycycle 95 + note D_, 16 + note A_, 8 + note G#, 2 + note C_, 8 + note D_, 7 + note G#, 5 + note G#, 1 + note C_, 8 + note D_, 11 + note A_, 7 + note G#, 2 + note C_, 8 + note D_, 16 + note G#, 4 + note G#, 2 + note C_, 8 + endchannel + + +SFX_1f_37_Ch3: ; 7c825 (1f:4825) + note D_, 4 + unknownmusic0xf2 + note D#, 13 + note D_, 14 + octave 2 + note D_, 13 + note D_, 16 + notetype 7, 3, 12 + note D_, 9 + rest 2 + note D_, 13 + endchannel +; 0x7c832 \ No newline at end of file diff --git a/music/sfx/sfx_1f_38.asm b/music/sfx/sfx_1f_38.asm new file mode 100644 index 00000000..d5c30644 --- /dev/null +++ b/music/sfx/sfx_1f_38.asm @@ -0,0 +1,88 @@ +SFX_1f_38_Ch1: ; 7c832 (1f:4832) + dutycycle 240 + note D_, 16 + unknownmusic0xf7 + note G#, 1 + note C_, 7 + note D_, 11 + octave 2 + note G#, 5 + note C_, 7 + note D_, 16 + notetype 7, 9, 0 + note C_, 7 + note D_, 9 + notetype 5, 9, 0 + note C_, 7 + note D_, 7 + rest 5 + note G#, 9 + note C_, 7 + note D_, 6 + notetype 3, 7, 0 + note C_, 7 + note D_, 5 + notetype 3, 6, 0 + note C_, 7 + note D_, 9 + rest 2 + note E_, 1 + note C_, 7 + endchannel + + +SFX_1f_38_Ch2: ; 7c855 (1f:4855) + dutycycle 5 + note D_, 16 + note B_, 8 + note E_, 2 + note C_, 7 + note D_, 11 + note A_, 7 + note E_, 3 + note C_, 7 + note D_, 16 + note A#, 8 + note F_, 2 + note C_, 7 + note D_, 9 + note A#, 6 + note F_, 2 + note C_, 7 + note D_, 7 + note A_, 5 + note E_, 8 + note C_, 7 + note D_, 6 + note A#, 4 + note D#, 2 + note C_, 7 + note D_, 5 + note A_, 4 + note D_, 3 + note C_, 7 + note D_, 9 + note G_, 2 + note C_, 2 + note C_, 7 + endchannel + + +SFX_1f_38_Ch3: ; 7c878 (1f:4878) + note D_, 16 + octave 4 + note D#, 13 + note D_, 11 + rest 8 + note E_, 13 + note D_, 11 + rest 8 + note D#, 13 + note D_, 13 + note B_, 8 + note E_, 13 + note D_, 16 + note A#, 3 + note F_, 13 + endchannel +; 0x7c888 \ No newline at end of file diff --git a/music/sfx/sfx_1f_39.asm b/music/sfx/sfx_1f_39.asm new file mode 100644 index 00000000..aa743526 --- /dev/null +++ b/music/sfx/sfx_1f_39.asm @@ -0,0 +1,63 @@ +SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0) + dutycycle 165 + note D_, 7 + unknownmusic0xf4 + note E_, 1 + note C_, 8 + note D_, 16 + octave 5 + note D#, 1 + note C_, 8 + note D_, 5 + unknownmusic0xf4 + note E_, 1 + note C_, 8 + note D_, 6 + note B_, 4 + note E_, 9 + note C_, 8 + note D_, 9 + notetype 1, 5, 0 + note C_, 8 + endchannel + + +SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7) + dutycycle 119 + note D_, 7 + rest 4 + note C#, 3 + note C_, 8 + note D_, 16 + note B_, 4 + note C_, 5 + note C_, 8 + note D_, 4 + rest 4 + note C#, 3 + note C_, 8 + note D_, 5 + rest 4 + note D_, 2 + note C_, 8 + note D_, 9 + note B_, 2 + note D#, 3 + note C_, 8 + endchannel + + +SFX_1f_39_Ch3: ; 7c90e (1f:490e) + note D_, 9 + notetype 6, 2, 12 + note D_, 13 + rest 7 + note D#, 13 + note D_, 11 + note B_, 7 + note D_, 13 + note D_, 9 + note A_, 2 + note C#, 13 + endchannel +; 0x7c91b \ No newline at end of file diff --git a/music/sfx/sfx_1f_3a.asm b/music/sfx/sfx_1f_3a.asm new file mode 100644 index 00000000..79c8d05e --- /dev/null +++ b/music/sfx/sfx_1f_3a.asm @@ -0,0 +1,48 @@ +SFX_1f_3a_Ch1: ; 7e850 (1f:6850) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + vibrato 6, 2, 6 + duty 2 + unknownmusic0xe8 + notetype 4, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note G#, 2 + notetype 12, 11, 3 + octave 4 + note E_, 4 + endchannel + + +SFX_1f_3a_Ch2: ; 7e867 (1f:6867) + unknownmusic0xf8 + vibrato 8, 2, 7 + duty 2 + notetype 4, 12, 1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + notetype 12, 12, 3 + note B_, 4 + endchannel + + +SFX_1f_3a_Ch3: ; 7e877 (1f:6877) + unknownmusic0xf8 + notetype 4, 1, 0 + octave 4 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + notetype 12, 1, 0 + octave 4 + note B_, 2 + rest 2 + endchannel +; 0x7e887 \ No newline at end of file diff --git a/music/sfx/sfx_1f_3b.asm b/music/sfx/sfx_1f_3b.asm new file mode 100644 index 00000000..b3bc0995 --- /dev/null +++ b/music/sfx/sfx_1f_3b.asm @@ -0,0 +1,70 @@ +SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 5, 11, 4 + octave 4 + note D_, 4 + note C_, 4 + octave 3 + note A_, 8 + notetype 5, 11, 2 + octave 4 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 + octave 3 + note A#, 2 + notetype 5, 11, 4 + octave 4 + note C_, 8 + endchannel + + +SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) + unknownmusic0xf8 + vibrato 8, 2, 7 + duty 2 + notetype 5, 12, 5 + octave 4 + note A_, 4 + note F_, 4 + note C_, 8 + notetype 5, 12, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + notetype 5, 12, 4 + note A_, 8 + endchannel + + +SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 5 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note A_, 8 + endchannel +; 0x7ee74 \ No newline at end of file diff --git a/music/sfx/sfx_1f_3c.asm b/music/sfx/sfx_1f_3c.asm new file mode 100644 index 00000000..f12b718c --- /dev/null +++ b/music/sfx/sfx_1f_3c.asm @@ -0,0 +1,18 @@ +SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3) + duty 2 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 3 + note C#, 1 + note D_, 3 + note D_, 9 + octave 6 + note C_, 1 + note C_, 3 + note C#, 1 + note C_, 9 + endchannel +; 0x7c404 \ No newline at end of file diff --git a/music/sfx/sfx_1f_3d.asm b/music/sfx/sfx_1f_3d.asm new file mode 100644 index 00000000..bd1d9407 --- /dev/null +++ b/music/sfx/sfx_1f_3d.asm @@ -0,0 +1,15 @@ +SFX_1f_3d_Ch1: ; 7c490 (1f:4490) + duty 2 + note C#, 1 + note C#, 8 + note D_, 16 + stereopanning 240 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x7c49f \ No newline at end of file diff --git a/music/sfx/sfx_1f_3e.asm b/music/sfx/sfx_1f_3e.asm new file mode 100644 index 00000000..ea9a7423 --- /dev/null +++ b/music/sfx/sfx_1f_3e.asm @@ -0,0 +1,22 @@ +SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2) + duty 2 + note C#, 1 + note C#, 5 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note C#, 1 + note C#, 8 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x7c4c7 \ No newline at end of file diff --git a/music/sfx/sfx_1f_3f.asm b/music/sfx/sfx_1f_3f.asm new file mode 100644 index 00000000..70dc34bb --- /dev/null +++ b/music/sfx/sfx_1f_3f.asm @@ -0,0 +1,9 @@ +SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3) + note D_, 2 + octave 6 + note D#, 4 + note D_, 9 + octave 7 + note D_, 3 + endchannel +; 0x7c3ca \ No newline at end of file diff --git a/music/sfx/sfx_1f_40.asm b/music/sfx/sfx_1f_40.asm new file mode 100644 index 00000000..62dd00c7 --- /dev/null +++ b/music/sfx/sfx_1f_40.asm @@ -0,0 +1,18 @@ +SFX_1f_40_Ch1: ; 7c44b (1f:444b) + duty 2 + note D_, 1 + note A_, 2 + rest 1 + note C_, 8 + note D_, 1 + note G#, 2 + notetype 0, 0, 7 + note D_, 1 + note A_, 2 + rest 1 + note C_, 8 + note D_, 13 + note A#, 2 + notetype 0, 0, 7 + endchannel +; 0x7c45e \ No newline at end of file diff --git a/music/sfx/sfx_1f_41.asm b/music/sfx/sfx_1f_41.asm new file mode 100644 index 00000000..e67c1822 --- /dev/null +++ b/music/sfx/sfx_1f_41.asm @@ -0,0 +1,78 @@ +SFX_1f_41_Ch1: ; 7edda (1f:6dda) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + notetype 5, 11, 1 + octave 3 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 4 + note E_, 4 + octave 3 + note F_, 4 + endchannel + + +SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) + unknownmusic0xf8 + duty 2 + notetype 5, 12, 2 + octave 5 + note F_, 2 + note E_, 1 + rest 1 + note D_, 2 + note C_, 1 + rest 1 + octave 4 + note A#, 2 + octave 5 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 + endchannel + + +SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 5 + note C_, 1 + rest 1 + octave 4 + note F_, 2 + octave 5 + note C_, 1 + rest 1 + octave 4 + note A#, 1 + rest 1 + note A_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + octave 5 + note F_, 1 + rest 3 + note C_, 1 + rest 3 + octave 4 + note F_, 2 + rest 2 + endchannel +; 0x7ee28 \ No newline at end of file diff --git a/music/sfx/sfx_1f_42.asm b/music/sfx/sfx_1f_42.asm new file mode 100644 index 00000000..cc272f6a --- /dev/null +++ b/music/sfx/sfx_1f_42.asm @@ -0,0 +1,60 @@ +SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) + unknownmusic0xf8 + tempo 1, 0 + stereopanning 119 + duty 2 + unknownmusic0xe8 + notetype 5, 10, 4 + octave 3 + note A#, 4 + notetype 5, 11, 1 + octave 4 + note C_, 2 + note C_, 1 + note C_, 1 + notetype 5, 10, 4 + note D#, 4 + notetype 5, 11, 1 + note F_, 2 + note F_, 1 + note F_, 1 + notetype 5, 11, 4 + note A#, 8 + endchannel + + +SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) + unknownmusic0xf8 + vibrato 4, 2, 3 + duty 2 + notetype 5, 13, 1 + octave 4 + note G_, 2 + note G_, 1 + note G_, 1 + notetype 5, 12, 4 + note D#, 4 + notetype 5, 13, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + notetype 5, 12, 4 + octave 5 + note D#, 8 + endchannel + + +SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) + unknownmusic0xf8 + notetype 5, 1, 0 + octave 4 + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 + endchannel +; 0x7eeb9 \ No newline at end of file diff --git a/music/sfx/sfx_1f_43.asm b/music/sfx/sfx_1f_43.asm new file mode 100644 index 00000000..21452283 --- /dev/null +++ b/music/sfx/sfx_1f_43.asm @@ -0,0 +1,17 @@ +SFX_1f_43_Ch1: ; 7c49f (1f:449f) + duty 0 + note C#, 1 + note C#, 5 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 7 + loopchannel 4, SFX_1f_43_Ch1 + note D_, 16 + unknownmusic0xf3 + note C_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x7c4b2 \ No newline at end of file diff --git a/music/sfx/sfx_1f_44.asm b/music/sfx/sfx_1f_44.asm new file mode 100644 index 00000000..900aaf7e --- /dev/null +++ b/music/sfx/sfx_1f_44.asm @@ -0,0 +1,15 @@ +SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7) + duty 2 + note C#, 1 + note C#, 6 + note D_, 16 + stereopanning 240 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note F_, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x7c4d6 \ No newline at end of file diff --git a/music/sfx/sfx_1f_45.asm b/music/sfx/sfx_1f_45.asm new file mode 100644 index 00000000..4f680aae --- /dev/null +++ b/music/sfx/sfx_1f_45.asm @@ -0,0 +1,48 @@ +SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6) + duty 2 + note D_, 16 + unknownmusic0xf2 + rest 1 + note C_, 8 + note D_, 16 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 4 + note G#, 2 + note G#, 1 + note C_, 8 + note D_, 4 + note G#, 2 + note C_, 1 + note C_, 8 + note D_, 4 + note G#, 2 + note E_, 1 + note C_, 8 + note D_, 4 + note G#, 2 + note C_, 1 + note C_, 8 + note D_, 4 + note G#, 2 + note G#, 1 + note C_, 8 + note D_, 4 + note G#, 2 + note C_, 1 + note C_, 8 + note D_, 4 + note G#, 2 + rest 1 + note C_, 8 + note D_, 4 + note G#, 2 + note C_, 1 + note C_, 8 + endchannel +; 0x7c505 \ No newline at end of file diff --git a/music/sfx/sfx_1f_46.asm b/music/sfx/sfx_1f_46.asm new file mode 100644 index 00000000..83701e7a --- /dev/null +++ b/music/sfx/sfx_1f_46.asm @@ -0,0 +1,17 @@ +SFX_1f_46_Ch1: ; 7c505 (1f:4505) + duty 2 + note D_, 5 + stereopanning 0 + note C_, 7 + note D_, 5 + stereopanning 0 + note C_, 5 + note D_, 5 + stereopanning 0 + note C_, 3 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x7c518 \ No newline at end of file diff --git a/music/sfx/sfx_1f_47.asm b/music/sfx/sfx_1f_47.asm new file mode 100644 index 00000000..3a8e9f26 --- /dev/null +++ b/music/sfx/sfx_1f_47.asm @@ -0,0 +1,18 @@ +SFX_1f_47_Ch1: ; 7c518 (1f:4518) + duty 2 + note D_, 5 + stereopanning 0 + note C_, 8 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 5 + stereopanning 0 + note C_, 8 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x7c52b \ No newline at end of file diff --git a/music/sfx/sfx_1f_48.asm b/music/sfx/sfx_1f_48.asm new file mode 100644 index 00000000..a4da65dd --- /dev/null +++ b/music/sfx/sfx_1f_48.asm @@ -0,0 +1,27 @@ +SFX_1f_48_Ch1: ; 7c52b (1f:452b) + duty 1 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 7, 0, 0 + note C_, 7 + note D_, 16 + note B_, 8 + note G#, 1 + note C_, 6 + note D_, 16 + note G#, 8 + note C_, 1 + note C_, 6 + note D_, 16 + note E_, 8 + note G#, 1 + note C_, 5 + note D_, 16 + note C#, 8 + note C_, 1 + note C_, 5 + note C#, 1 + note C_, 9 + endchannel +; 0x7c546 \ No newline at end of file diff --git a/music/sfx/sfx_1f_49.asm b/music/sfx/sfx_1f_49.asm new file mode 100644 index 00000000..e63212a6 --- /dev/null +++ b/music/sfx/sfx_1f_49.asm @@ -0,0 +1,24 @@ +SFX_1f_49_Ch1: ; 7c546 (1f:4546) + duty 2 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 3 + unknownmusic0xf1 + note G#, 1 + note C_, 7 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x7c55d \ No newline at end of file diff --git a/music/sfx/sfx_1f_4a.asm b/music/sfx/sfx_1f_4a.asm new file mode 100644 index 00000000..52dfd63d --- /dev/null +++ b/music/sfx/sfx_1f_4a.asm @@ -0,0 +1,22 @@ +SFX_1f_4a_Ch1: ; 7c55d (1f:455d) + duty 2 + note C#, 1 + note D_, 13 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + note C#, 1 + note D_, 3 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 6 + note C#, 1 + note C_, 9 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x7c572 \ No newline at end of file diff --git a/music/sfx/sfx_1f_4b.asm b/music/sfx/sfx_1f_4b.asm new file mode 100644 index 00000000..af22d0db --- /dev/null +++ b/music/sfx/sfx_1f_4b.asm @@ -0,0 +1,27 @@ +SFX_1f_4b_Ch1: ; 7c572 (1f:4572) + duty 1 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 7, 0, 0 + note C_, 6 + note D_, 16 + note B_, 8 + note G#, 1 + note C_, 6 + note D_, 16 + note G#, 8 + note C_, 1 + note C_, 7 + note D_, 16 + note E_, 8 + note G#, 1 + note C_, 7 + note D_, 16 + note C#, 8 + note C_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x7c58d \ No newline at end of file diff --git a/music/sfx/sfx_1f_4c.asm b/music/sfx/sfx_1f_4c.asm new file mode 100644 index 00000000..084f295c --- /dev/null +++ b/music/sfx/sfx_1f_4c.asm @@ -0,0 +1,27 @@ +SFX_1f_4c_Ch1: ; 7c58d (1f:458d) + duty 1 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 7, 0, 0 + note C_, 8 + note D_, 16 + note B_, 8 + note G#, 1 + note C_, 7 + note D_, 16 + note G#, 8 + note C_, 1 + note C_, 7 + note D_, 16 + note E_, 8 + note G#, 1 + note C_, 6 + note D_, 16 + note C#, 8 + note C_, 1 + note C_, 6 + note C#, 1 + note C_, 9 + endchannel +; 0x7c5a8 \ No newline at end of file diff --git a/music/sfx/sfx_1f_4d.asm b/music/sfx/sfx_1f_4d.asm new file mode 100644 index 00000000..fdbd0a95 --- /dev/null +++ b/music/sfx/sfx_1f_4d.asm @@ -0,0 +1,11 @@ +SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8) + duty 1 + note C#, 1 + note C#, 7 + note D_, 16 + notetype 2, 0, 0 + note C_, 6 + note C#, 1 + note C_, 9 + endchannel +; 0x7c5b3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_4e.asm b/music/sfx/sfx_1f_4e.asm new file mode 100644 index 00000000..b39834ea --- /dev/null +++ b/music/sfx/sfx_1f_4e.asm @@ -0,0 +1,12 @@ +SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3) + duty 2 + note C#, 1 + note A_, 6 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 5 + note C#, 1 + note C_, 9 + endchannel +; 0x7c5be \ No newline at end of file diff --git a/music/sfx/sfx_1f_4f.asm b/music/sfx/sfx_1f_4f.asm new file mode 100644 index 00000000..2ec679fc --- /dev/null +++ b/music/sfx/sfx_1f_4f.asm @@ -0,0 +1,15 @@ +SFX_1f_4f_Ch1: ; 7c5be (1f:45be) + note D_, 3 + unknownmusic0xf1 + note D#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + unknownmusic0xf1 + note D_, 3 + note D_, 2 + note C_, 1 + note C_, 1 + endchannel +; 0x7c5cb \ No newline at end of file diff --git a/music/sfx/sfx_1f_50.asm b/music/sfx/sfx_1f_50.asm new file mode 100644 index 00000000..70e308a9 --- /dev/null +++ b/music/sfx/sfx_1f_50.asm @@ -0,0 +1,50 @@ +SFX_1f_50_Ch1: ; 7c5cb (1f:45cb) + note D_, 3 + unknownmusic0xf1 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note A#, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + notetype 1, 1, 2 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note G#, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note B_, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note F#, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note A_, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + note D_, 3 + note E_, 2 + note C#, 3 + note D_, 3 + note C_, 1 + note C_, 1 + endchannel +; 0x7c5fc \ No newline at end of file diff --git a/music/sfx/sfx_1f_51.asm b/music/sfx/sfx_1f_51.asm new file mode 100644 index 00000000..2895359f --- /dev/null +++ b/music/sfx/sfx_1f_51.asm @@ -0,0 +1,41 @@ +SFX_1f_51_Ch1: ; 7c5fc (1f:45fc) + duty 3 + note C#, 1 + note F_, 11 + note D_, 5 + stereopanning 0 + note C_, 6 + note C#, 1 + note C_, 9 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel + + +SFX_1f_51_Ch2: ; 7c613 (1f:4613) + duty 3 + note D_, 5 + stereopanning 1 + note C_, 5 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 1 + note C_, 5 + note D_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + endchannel +; 0x7c626 \ No newline at end of file diff --git a/music/sfx/sfx_1f_52.asm b/music/sfx/sfx_1f_52.asm new file mode 100644 index 00000000..c5f14683 --- /dev/null +++ b/music/sfx/sfx_1f_52.asm @@ -0,0 +1,11 @@ +SFX_1f_52_Ch1: ; 7c626 (1f:4626) + duty 0 + note C#, 1 + note C#, 8 + note D_, 16 + notetype 2, 0, 0 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x7c631 \ No newline at end of file diff --git a/music/sfx/sfx_1f_53.asm b/music/sfx/sfx_1f_53.asm new file mode 100644 index 00000000..54ca6272 --- /dev/null +++ b/music/sfx/sfx_1f_53.asm @@ -0,0 +1,27 @@ +SFX_1f_53_Ch1: ; 7c631 (1f:4631) + note D_, 5 + note A#, 3 + note D_, 4 + note D_, 9 + unknownmusic0xf1 + note D#, 5 + note D_, 16 + note C_, 1 + note C_, 1 + note D_, 3 + unknownmusic0xf7 + note D_, 5 + note D_, 3 + unknownmusic0xf7 + note D#, 5 + note D_, 5 + unknownmusic0xf7 + note E_, 5 + note D_, 9 + unknownmusic0xf4 + note F_, 6 + note D_, 9 + unknownmusic0xf1 + note E_, 5 + endchannel +; 0x7c64a \ No newline at end of file diff --git a/music/sfx/sfx_1f_54.asm b/music/sfx/sfx_1f_54.asm new file mode 100644 index 00000000..fc25f31f --- /dev/null +++ b/music/sfx/sfx_1f_54.asm @@ -0,0 +1,55 @@ +SFX_1f_54_Ch1: ; 7c64a (1f:464a) + duty 2 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + stereopanning 0 + note C_, 6 + note D_, 16 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + endchannel + + +SFX_1f_54_Ch2: ; 7c669 (1f:4669) + duty 3 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 5 + note C_, 1 + note C_, 1 + note C_, 1 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + stereopanning 130 + note C_, 5 + note D_, 16 + unknownmusic0xf2 + note G#, 3 + note C_, 5 + endchannel +; 0x7c688 \ No newline at end of file diff --git a/music/sfx/sfx_1f_55.asm b/music/sfx/sfx_1f_55.asm new file mode 100644 index 00000000..64f93bdd --- /dev/null +++ b/music/sfx/sfx_1f_55.asm @@ -0,0 +1,30 @@ +SFX_1f_55_Ch1: ; 7c688 (1f:4688) + duty 1 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 6 + note C#, 1 + note D_, 3 + note D_, 5 + octave 6 + note C_, 1 + note C_, 6 + note C#, 1 + note D#, 11 + note D_, 5 + unknownmusic0xf2 + note C_, 1 + note C_, 8 + note C#, 1 + note D_, 3 + note D_, 16 + octave 6 + note C_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x7c6a5 \ No newline at end of file diff --git a/music/sfx/sfx_1f_56.asm b/music/sfx/sfx_1f_56.asm new file mode 100644 index 00000000..0b48e787 --- /dev/null +++ b/music/sfx/sfx_1f_56.asm @@ -0,0 +1,18 @@ +SFX_1f_56_Ch1: ; 7c3ca (1f:43ca) + note D_, 3 + unknownmusic0xf7 + note D_, 5 + note D_, 3 + unknownmusic0xf7 + note D#, 5 + note D_, 5 + unknownmusic0xf7 + note E_, 5 + note D_, 9 + unknownmusic0xf4 + note F_, 6 + note D_, 9 + unknownmusic0xf1 + note E_, 5 + endchannel +; 0x7c3da \ No newline at end of file diff --git a/music/sfx/sfx_1f_57.asm b/music/sfx/sfx_1f_57.asm new file mode 100644 index 00000000..24baf670 --- /dev/null +++ b/music/sfx/sfx_1f_57.asm @@ -0,0 +1,8 @@ +SFX_1f_57_Ch1: ; 7c3da (1f:43da) + note D_, 10 + unknownmusic0xf1 + note E_, 5 + note D_, 9 + notetype 1, 4, 3 + endchannel +; 0x7c3e1 \ No newline at end of file diff --git a/music/sfx/sfx_1f_58.asm b/music/sfx/sfx_1f_58.asm new file mode 100644 index 00000000..3a380d0c --- /dev/null +++ b/music/sfx/sfx_1f_58.asm @@ -0,0 +1,21 @@ +SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1) + duty 2 + note D_, 9 + octave 7 + note E_, 1 + note C_, 8 + endchannel + + +SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8) + duty 2 + note D_, 3 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 9 + note B_, 2 + note E_, 2 + note C_, 8 + endchannel +; 0x7c3f3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_59.asm b/music/sfx/sfx_1f_59.asm new file mode 100644 index 00000000..72011aaf --- /dev/null +++ b/music/sfx/sfx_1f_59.asm @@ -0,0 +1,21 @@ +SFX_1f_59_Ch1: ; 7c404 (1f:4404) + duty 2 + note D_, 5 + unknownmusic0xf1 + note G#, 1 + note C_, 8 + endchannel + + +SFX_1f_59_Ch2: ; 7c40b (1f:440b) + duty 2 + note D_, 2 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + note A#, 2 + note F#, 2 + note C_, 8 + endchannel +; 0x7c416 \ No newline at end of file diff --git a/music/sfx/sfx_1f_5a.asm b/music/sfx/sfx_1f_5a.asm new file mode 100644 index 00000000..163f34ad --- /dev/null +++ b/music/sfx/sfx_1f_5a.asm @@ -0,0 +1,29 @@ +SFX_1f_5a_Ch1: ; 7c416 (1f:4416) + duty 2 + note D_, 5 + octave 7 + note C_, 1 + note C_, 8 + note D_, 9 + unknownmusic0xf2 + octave 8 + note C_, 8 + endchannel + + +SFX_1f_5a_Ch2: ; 7c421 (1f:4421) + duty 2 + note D_, 2 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 5 + note A_, 2 + rest 2 + note C_, 7 + note D_, 9 + note A#, 3 + note A#, 2 + note C_, 8 + endchannel +; 0x7c430 \ No newline at end of file diff --git a/music/sfx/sfx_1f_5b.asm b/music/sfx/sfx_1f_5b.asm new file mode 100644 index 00000000..be300957 --- /dev/null +++ b/music/sfx/sfx_1f_5b.asm @@ -0,0 +1,12 @@ +SFX_1f_5b_Ch1: ; 7c430 (1f:4430) + duty 2 + note C#, 1 + note F_, 11 + note D_, 16 + unknownmusic0xf1 + note C_, 1 + note C_, 4 + note C#, 1 + note C_, 9 + endchannel +; 0x7c43b \ No newline at end of file diff --git a/music/sfx/sfx_1f_5c.asm b/music/sfx/sfx_1f_5c.asm new file mode 100644 index 00000000..4bfc9926 --- /dev/null +++ b/music/sfx/sfx_1f_5c.asm @@ -0,0 +1,18 @@ +SFX_1f_5c_Ch1: ; 7c43b (1f:443b) + note D_, 3 + unknownmusic0xf1 + note F_, 5 + note D_, 13 + note G_, 2 + note D_, 4 + note D_, 3 + note B_, 2 + note F_, 5 + note D_, 13 + note F#, 2 + note D_, 4 + note D_, 7 + note E_, 2 + note F_, 5 + endchannel +; 0x7c44b \ No newline at end of file diff --git a/music/sfx/sfx_1f_5d.asm b/music/sfx/sfx_1f_5d.asm new file mode 100644 index 00000000..61b3c087 --- /dev/null +++ b/music/sfx/sfx_1f_5d.asm @@ -0,0 +1,52 @@ +SFX_1f_5d_Ch1: ; 7c45e (1f:445e) + duty 2 + note D_, 5 + unknownmusic0xf4 + note C_, 1 + note C_, 8 + note D_, 4 + octave 4 + note G#, 1 + note C_, 7 + note D_, 4 + octave 4 + rest 1 + note C_, 7 + note D_, 4 + octave 4 + note C_, 1 + note C_, 8 + note D_, 3 + octave 4 + note A#, 1 + note C_, 8 + endchannel + + +SFX_1f_5d_Ch2: ; 7c475 (1f:4475) + duty 2 + note D_, 5 + note C_, 9 + note C_, 1 + note C_, 1 + note D_, 4 + notetype 4, 0, 1 + note C_, 8 + note D_, 4 + rest 5 + note G#, 2 + note C_, 7 + note D_, 4 + rest 5 + rest 2 + note C_, 7 + note D_, 4 + rest 5 + note C_, 2 + note C_, 8 + note D_, 3 + rest 5 + note A#, 2 + note C_, 8 + endchannel +; 0x7c490 \ No newline at end of file diff --git a/music/sfx/sfx_1f_5e.asm b/music/sfx/sfx_1f_5e.asm new file mode 100644 index 00000000..6fd59553 --- /dev/null +++ b/music/sfx/sfx_1f_5e.asm @@ -0,0 +1,26 @@ +SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5) + note D_, 7 + note D_, 1 + note C#, 1 + note D_, 7 + note D_, 16 + note E_, 1 + note D_, 7 + note E_, 16 + note E_, 2 + note D_, 7 + note G#, 16 + note E_, 2 + note D_, 7 + rest 16 + note E_, 3 + note D_, 9 + notetype 7, 4, 2 + note D_, 16 + octave 1 + note E_, 4 + note D_, 16 + unknownmusic0xf2 + note E_, 4 + endchannel +; 0x7c6be \ No newline at end of file diff --git a/music/sfx/sfx_1f_5f.asm b/music/sfx/sfx_1f_5f.asm new file mode 100644 index 00000000..141ef445 --- /dev/null +++ b/music/sfx/sfx_1f_5f.asm @@ -0,0 +1,12 @@ +SFX_1f_5f_Ch1: ; 7c6be (1f:46be) + duty 2 + note C#, 1 + note D_, 7 + note D_, 13 + rest 3 + note E_, 1 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x7c6c9 \ No newline at end of file diff --git a/music/sfx/sfx_1f_60.asm b/music/sfx/sfx_1f_60.asm new file mode 100644 index 00000000..d7ed4ef8 --- /dev/null +++ b/music/sfx/sfx_1f_60.asm @@ -0,0 +1,12 @@ +SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9) + duty 2 + note C#, 1 + note D_, 7 + note D_, 13 + rest 3 + note G#, 1 + note C_, 7 + note C#, 1 + note C_, 9 + endchannel +; 0x7c6d4 \ No newline at end of file diff --git a/music/sfx/sfx_1f_61.asm b/music/sfx/sfx_1f_61.asm new file mode 100644 index 00000000..4734cda7 --- /dev/null +++ b/music/sfx/sfx_1f_61.asm @@ -0,0 +1,12 @@ +SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4) + note D_, 3 + note F#, 16 + note D_, 2 + note D_, 3 + note A#, 16 + note D#, 2 + note D_, 16 + unknownmusic0xf2 + note E_, 2 + endchannel +; 0x7c6de \ No newline at end of file diff --git a/music/sfx/sfx_1f_62.asm b/music/sfx/sfx_1f_62.asm new file mode 100644 index 00000000..7e044edb --- /dev/null +++ b/music/sfx/sfx_1f_62.asm @@ -0,0 +1,8 @@ +SFX_1f_62_Ch1: ; 7c6de (1f:46de) + note D_, 3 + notetype 2, 3, 2 + note D_, 16 + unknownmusic0xf2 + note E_, 4 + endchannel +; 0x7c6e5 \ No newline at end of file diff --git a/music/sfx/sfx_1f_63.asm b/music/sfx/sfx_1f_63.asm new file mode 100644 index 00000000..86f06669 --- /dev/null +++ b/music/sfx/sfx_1f_63.asm @@ -0,0 +1,17 @@ +SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5) + note D_, 5 + note D_, 13 + note D_, 1 + note D_, 4 + note A#, 1 + note D_, 1 + note D_, 4 + note B_, 1 + note D_, 2 + note D_, 4 + rest 1 + note D_, 3 + note D_, 16 + notetype 2, 2, 4 + endchannel +; 0x7c6f5 \ No newline at end of file diff --git a/music/sfx/sfx_1f_64.asm b/music/sfx/sfx_1f_64.asm new file mode 100644 index 00000000..6f36d7c9 --- /dev/null +++ b/music/sfx/sfx_1f_64.asm @@ -0,0 +1,16 @@ +SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5) + duty 2 + note D_, 2 + unknownmusic0xf2 + note A#, 1 + note C_, 7 + note D_, 2 + unknownmusic0xf2 + octave 8 + note C_, 7 + note D_, 9 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + endchannel +; 0x7c704 \ No newline at end of file diff --git a/music/sfx/sfx_1f_65.asm b/music/sfx/sfx_1f_65.asm new file mode 100644 index 00000000..58444aa7 --- /dev/null +++ b/music/sfx/sfx_1f_65.asm @@ -0,0 +1,12 @@ +SFX_1f_65_Ch1: ; 7c704 (1f:4704) + duty 2 + note D_, 3 + unknownmusic0xf1 + note C_, 1 + note C_, 8 + note D_, 9 + note G#, 2 + octave 8 + note C_, 8 + endchannel +; 0x7c70f \ No newline at end of file diff --git a/music/sfx/sfx_1f_66.asm b/music/sfx/sfx_1f_66.asm new file mode 100644 index 00000000..6e95fc2f --- /dev/null +++ b/music/sfx/sfx_1f_66.asm @@ -0,0 +1,32 @@ +SFX_1f_66_Ch1: ; 7c70f (1f:470f) + duty 3 + note D_, 6 + octave 7 + note C_, 1 + note C_, 8 + note D_, 3 + octave 7 + note G#, 1 + note C_, 8 + note D_, 16 + unknownmusic0xf1 + rest 1 + note C_, 8 + endchannel + + +SFX_1f_66_Ch2: ; 7c71e (1f:471e) + duty 2 + note D_, 5 + rest 2 + rest 2 + note C_, 7 + note D_, 3 + rest 2 + note E_, 2 + note C_, 8 + note D_, 16 + notetype 1, 8, 1 + note C_, 8 + endchannel +; 0x7c72d \ No newline at end of file diff --git a/music/sfx/sfx_1f_67.asm b/music/sfx/sfx_1f_67.asm new file mode 100644 index 00000000..685a349d --- /dev/null +++ b/music/sfx/sfx_1f_67.asm @@ -0,0 +1,44 @@ +SFX_1f_67_Ch1: ; 7c72d (1f:472d) + dutycycle 228 + note C#, 1 + note D_, 16 + note D_, 5 + note E_, 1 + octave 8 + note C_, 8 + note D_, 5 + note F#, 1 + octave 8 + note C_, 8 + note D_, 5 + note G#, 1 + octave 8 + note C_, 8 + note D_, 9 + note A#, 1 + octave 8 + note C_, 8 + note D_, 9 + note A#, 1 + octave 8 + note C_, 8 + note D_, 9 + note G#, 1 + octave 8 + note C_, 8 + note D_, 9 + note F#, 1 + octave 8 + note C_, 8 + note D_, 9 + note D#, 1 + octave 8 + note C_, 8 + note D_, 16 + note C#, 3 + octave 8 + note C_, 8 + note C#, 1 + note C_, 9 + endchannel +; 0x7c758 \ No newline at end of file diff --git a/music/silphco.asm b/music/silphco.asm new file mode 100644 index 00000000..f6ee7fd9 --- /dev/null +++ b/music/silphco.asm @@ -0,0 +1,1001 @@ +Music_SilphCo_Ch1: ; 7f243 (1f:7243) + tempo 0, 160 + stereopanning 119 + duty 3 + unknownmusic0xe8 + vibrato 8, 2, 2 + notetype 6, 11, 3 + octave 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + notetype 6, 10, 0 + note C_, 12 + notetype 6, 11, 3 + note C_, 2 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 + rest 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + +Music_SilphCo_branch_7f26d: + note G_, 2 + rest 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note A#, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + octave 3 + note C_, 2 + rest 2 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + octave 2 + note A#, 2 + rest 6 + note B_, 2 + rest 2 + note G_, 2 + rest 10 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 6, 10, 0 + note B_, 12 + notetype 6, 11, 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + rest 11 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + notetype 6, 10, 0 + octave 3 + note C_, 12 + notetype 6, 11, 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + rest 11 + note F#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + notetype 6, 10, 0 + note D_, 12 + notetype 6, 11, 3 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note G_, 1 + note F_, 1 + rest 11 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + notetype 6, 10, 0 + octave 3 + note C_, 12 + notetype 6, 11, 3 + note C_, 1 + octave 2 + note B_, 1 + note G#, 1 + note F_, 1 + note E_, 1 + rest 7 + notetype 6, 8, 0 + note B_, 16 + notetype 6, 11, 0 + octave 3 + note E_, 8 + tempo 0, 124 + notetype 6, 11, 3 + octave 2 + note B_, 2 + rest 10 + note B_, 2 + rest 10 + note B_, 2 + rest 6 + note B_, 2 + rest 16 + rest 6 + note A_, 2 + rest 6 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + callchannel Music_SilphCo_branch_7f3f0 + callchannel Music_SilphCo_branch_7f3f0 + callchannel Music_SilphCo_branch_7f3f0 + rest 4 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + octave 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note A#, 2 + rest 6 + note A_, 2 + rest 6 + note A_, 2 + rest 6 + note A_, 2 + rest 6 + note A_, 2 + rest 6 + note A_, 2 + rest 6 + note A_, 2 + rest 6 + note A#, 2 + rest 6 + note A#, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + octave 3 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + octave 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + octave 3 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + octave 4 + note C_, 2 + rest 6 + note C_, 2 + rest 6 + octave 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + octave 4 + note E_, 2 + rest 6 + note E_, 2 + rest 6 + note D#, 2 + rest 6 + note D#, 2 + rest 2 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + notetype 6, 6, 0 + note E_, 16 + note E_, 11 + notetype 6, 11, 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + notetype 6, 3, 15 + note C_, 16 + notetype 6, 10, 0 + note C_, 11 + notetype 6, 9, 3 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + notetype 6, 3, 15 + note E_, 16 + notetype 6, 9, 0 + note E_, 11 + notetype 6, 11, 3 + note F_, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + notetype 6, 3, 15 + note D_, 16 + notetype 6, 10, 7 + note D_, 11 + rest 4 + rest 4 + tempo 0, 128 + rest 4 + rest 4 + tempo 0, 136 + rest 4 + rest 4 + tempo 0, 144 + rest 4 + rest 4 + tempo 0, 160 + rest 4 + rest 4 + tempo 0, 192 + rest 4 + rest 4 + tempo 1, 32 + rest 4 + rest 4 + tempo 1, 160 + rest 4 + tempo 4, 0 + rest 4 + tempo 0, 160 + rest 4 + notetype 6, 4, 3 + octave 2 + note B_, 2 + rest 6 + notetype 6, 6, 3 + note B_, 2 + rest 6 + notetype 6, 8, 3 + note B_, 2 + rest 6 + notetype 6, 5, 0 + note B_, 8 + notetype 6, 11, 3 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + loopchannel 0, Music_SilphCo_branch_7f26d + +Music_SilphCo_branch_7f3f0: + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + endchannel + + +Music_SilphCo_Ch2: ; 7f409 (1f:7409) + vibrato 10, 3, 2 + duty 3 + notetype 6, 12, 3 + octave 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 4 + note C_, 1 + notetype 6, 11, 0 + note C_, 12 + notetype 6, 12, 3 + note C_, 2 + octave 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 + rest 2 + octave 2 + note G_, 2 + rest 6 + note F#, 2 + rest 6 + note G_, 2 + rest 6 + note G#, 2 + rest 2 + +Music_SilphCo_branch_7f42e: + note E_, 2 + rest 2 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note F#, 2 + rest 6 + note G_, 2 + rest 6 + note G#, 2 + rest 2 + note E_, 2 + rest 2 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 2 + notetype 6, 11, 7 + duty 2 + octave 4 + note E_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note E_, 8 + note D#, 8 + note D_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note G#, 8 + note D#, 8 + note D_, 8 + note D#, 8 + duty 3 + notetype 6, 6, 15 + note E_, 16 + notetype 6, 12, 0 + note B_, 16 + notetype 6, 12, 4 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 12, 2 + duty 1 + octave 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + notetype 6, 12, 4 + duty 3 + octave 3 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + notetype 6, 12, 0 + note F_, 8 + notetype 6, 11, 7 + note F_, 8 + notetype 6, 8, 10 + note F_, 4 + notetype 6, 12, 4 + duty 3 + note F_, 4 + note E_, 4 + note F_, 4 + notetype 6, 10, 0 + note F#, 8 + notetype 6, 11, 0 + note F#, 8 + notetype 6, 9, 9 + note F#, 4 + notetype 6, 12, 4 + note F#, 4 + note F_, 4 + note F#, 4 + notetype 6, 9, 0 + note G_, 12 + notetype 6, 5, 9 + note G_, 8 + notetype 6, 12, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note D#, 4 + note D_, 4 + notetype 6, 12, 2 + duty 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + notetype 6, 11, 4 + duty 3 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 12, 2 + duty 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + notetype 6, 11, 4 + duty 3 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 12, 2 + duty 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note B_, 4 + notetype 6, 11, 4 + duty 3 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 12, 2 + duty 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + octave 4 + note C_, 4 + notetype 6, 11, 4 + duty 3 + octave 3 + note D#, 4 + note D_, 4 + note D#, 4 + rest 4 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 2 + duty 0 + octave 4 + note E_, 2 + rest 2 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + note G#, 2 + rest 6 + duty 3 + octave 3 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 6 + note G_, 2 + rest 2 + duty 0 + octave 4 + note E_, 2 + rest 2 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + note B_, 2 + rest 2 + duty 3 + octave 3 + note G_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + note E_, 2 + rest 2 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + note E_, 2 + rest 2 + note G_, 2 + rest 2 + note B_, 2 + rest 2 + note G_, 2 + rest 2 + octave 4 + note C_, 2 + rest 2 + octave 3 + note G_, 2 + rest 2 + notetype 6, 8, 7 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + rest 4 + notetype 6, 4, 3 + octave 2 + note G_, 2 + rest 6 + notetype 6, 6, 3 + note F#, 2 + rest 6 + notetype 6, 8, 3 + note G_, 2 + rest 6 + notetype 6, 4, 15 + note G#, 8 + notetype 6, 11, 4 + note G_, 2 + rest 6 + note F#, 2 + rest 6 + note G_, 2 + rest 6 + note G#, 2 + rest 2 + loopchannel 0, Music_SilphCo_branch_7f42e + + +Music_SilphCo_Ch3: ; 7f5be (1f:75be) + vibrato 8, 1, 1 + notetype 12, 1, 1 + rest 12 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + +Music_SilphCo_branch_7f5c9: + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 1 + rest 1 + note G_, 1 + rest 3 + note F#, 1 + rest 3 + note G_, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G_, 1 + rest 3 + note G#, 1 + rest 3 + note G_, 1 + rest 3 + note F#, 1 + rest 3 + note G_, 1 + rest 3 + note G#, 1 + rest 1 + note F_, 1 + rest 1 + note G#, 1 + rest 3 + note G#, 1 + rest 3 + note G_, 1 + rest 3 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 1 + octave 4 + note E_, 1 + rest 5 + note F_, 1 + rest 5 + note F_, 1 + rest 3 + note E_, 1 + rest 11 + note D#, 1 + rest 3 + note E_, 1 + rest 5 + note F_, 1 + rest 5 + note F_, 1 + rest 3 + note E_, 1 + rest 11 + note D#, 1 + rest 3 + note E_, 1 + rest 1 + note F_, 1 + rest 3 + note F_, 1 + rest 3 + note F_, 1 + rest 3 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 3 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note F#, 1 + rest 3 + note F_, 1 + rest 3 + note E_, 1 + rest 3 + note F_, 1 + rest 3 + note E_, 1 + rest 3 + note D#, 1 + rest 3 + note D_, 1 + rest 1 + note D_, 8 + note F_, 8 + note D_, 8 + note F#, 8 + note D_, 8 + note G_, 8 + note D_, 8 + note A_, 8 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + octave 5 + note E_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + octave 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + octave 5 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + octave 6 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 1, 1 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + rest 4 + notetype 12, 1, 1 + rest 4 + rest 4 + rest 4 + rest 4 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + loopchannel 0, Music_SilphCo_branch_7f5c9 +; 0x7f69d \ No newline at end of file diff --git a/music/ssanne.asm b/music/ssanne.asm new file mode 100644 index 00000000..77bf12f2 --- /dev/null +++ b/music/ssanne.asm @@ -0,0 +1,339 @@ +Music_SSAnne_Ch1: ; b3a7 (2:73a7) + tempo 0, 128 + stereopanning 119 + duty 1 + vibrato 8, 3, 4 + unknownmusic0xe8 + +Music_SSAnne_branch_b3b2: + notetype 12, 10, 4 + rest 12 + octave 3 + note E_, 2 + note F#, 2 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + rest 2 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + rest 4 + note E_, 4 + note G#, 4 + rest 4 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + rest 2 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 4 + rest 4 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + rest 2 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 8 + note G#, 4 + note E_, 4 + rest 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D_, 4 + rest 4 + note D_, 4 + note E_, 4 + note C#, 4 + rest 4 + note C#, 4 + note D_, 2 + note C#, 2 + octave 2 + note B_, 4 + note E_, 4 + note B_, 4 + octave 3 + note D_, 2 + octave 2 + note B_, 2 + note A_, 4 + rest 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 4 + rest 4 + note C#, 4 + note G#, 4 + note A_, 4 + rest 4 + note A_, 4 + note B_, 4 + note B_, 4 + rest 4 + octave 3 + note D_, 8 + loopchannel 0, Music_SSAnne_branch_b3b2 + + +Music_SSAnne_Ch2: ; b419 (2:7419) + duty 0 + vibrato 12, 2, 4 + +Music_SSAnne_branch_b41e: + notetype 12, 12, 5 + octave 3 + note A_, 2 + note E_, 2 + note A_, 4 + note B_, 4 + octave 4 + note D_, 4 + notetype 8, 12, 5 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 6 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 + octave 4 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 12 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 + octave 4 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 12 + rest 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note C#, 3 + note C#, 3 + note D_, 3 + note C#, 3 + note D_, 3 + note E_, 3 + octave 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 + rest 3 + note A_, 3 + note G#, 3 + note A_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note G#, 3 + note F#, 3 + note E_, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 + rest 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note E_, 3 + note C#, 3 + octave 2 + note B_, 3 + note A_, 3 + note B_, 3 + octave 3 + note C#, 3 + note E_, 3 + rest 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 3 + octave 4 + note C#, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + loopchannel 0, Music_SSAnne_branch_b41e + + +Music_SSAnne_Ch3: ; b4cb (2:74cb) + notetype 12, 1, 3 + rest 16 + rest 12 + octave 4 + note B_, 2 + note G#, 2 + note A_, 8 + note F#, 8 + note G#, 4 + rest 4 + note B_, 8 + note A_, 8 + note B_, 8 + note A_, 8 + note G#, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note B_, 8 + note A_, 4 + note E_, 4 + note B_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note G#, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + octave 5 + note D_, 8 + note C#, 8 + note C#, 8 + octave 4 + note B_, 8 + note B_, 8 + note A_, 8 + note A_, 8 + note G#, 8 + note G#, 8 + note F#, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + note F#, 8 + note G#, 8 + note B_, 8 + loopchannel 0, Music_SSAnne_Ch3 +; 0xb504 \ No newline at end of file diff --git a/music/surfing.asm b/music/surfing.asm new file mode 100644 index 00000000..22eb93d2 --- /dev/null +++ b/music/surfing.asm @@ -0,0 +1,336 @@ +Music_Surfing_Ch1: ; 7fa19 (1f:7a19) + tempo 0, 160 + stereopanning 119 + duty 3 + vibrato 12, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 5 + rest 6 + octave 2 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + octave 3 + note G#, 2 + note F#, 2 + note G#, 4 + +Music_Surfing_branch_7fa30: + notetype 12, 11, 2 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + notetype 12, 11, 1 + note F#, 3 + notetype 12, 11, 2 + note D_, 3 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 4 + note F#, 2 + note F#, 4 + note E_, 2 + note E_, 4 + note G#, 2 + note G#, 4 + notetype 12, 11, 1 + note F#, 3 + notetype 12, 11, 2 + note G#, 1 + notetype 12, 11, 4 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + notetype 12, 11, 7 + note C#, 6 + notetype 12, 11, 3 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note B_, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 4 + loopchannel 0, Music_Surfing_branch_7fa30 + + +Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) + duty 3 + vibrato 16, 2, 5 + notetype 12, 12, 6 + octave 3 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + note G#, 6 + octave 4 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + +Music_Surfing_branch_7faae: + notetype 12, 12, 6 + octave 4 + note E_, 6 + note C#, 5 + note E_, 1 + note D_, 6 + octave 3 + note B_, 6 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + notetype 12, 12, 1 + octave 4 + note F#, 3 + notetype 12, 12, 6 + note D_, 1 + note E_, 6 + note C#, 6 + note E_, 6 + note C#, 5 + note E_, 1 + note F#, 6 + note D_, 6 + note F#, 6 + note E_, 2 + notetype 12, 12, 1 + note F#, 3 + notetype 12, 12, 6 + note E_, 1 + note A_, 6 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note E_, 1 + note C#, 6 + note D_, 2 + note C#, 3 + octave 3 + note B_, 1 + octave 4 + note F#, 6 + note E_, 2 + note D#, 3 + note E_, 1 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note G#, 1 + note A_, 6 + note G#, 2 + note F#, 3 + note E_, 1 + note G#, 6 + note A_, 2 + note G#, 3 + note A_, 1 + octave 5 + note C#, 6 + loopchannel 0, Music_Surfing_branch_7faae + + +Music_Surfing_Ch3: ; 7fafa (1f:7afa) + notetype 12, 1, 0 + rest 12 + octave 5 + note E_, 6 + octave 4 + note E_, 2 + note F#, 2 + note G#, 2 + +Music_Surfing_branch_7fb03: + octave 3 + note A_, 2 + octave 4 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 + rest 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 + rest 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + loopchannel 0, Music_Surfing_branch_7fb03 +; 0x7fb7d \ No newline at end of file diff --git a/music/titlescreen.asm b/music/titlescreen.asm new file mode 100644 index 00000000..70f72772 --- /dev/null +++ b/music/titlescreen.asm @@ -0,0 +1,678 @@ +Music_TitleScreen_Ch1: ; 7e4c0 (1f:64c0) + tempo 0, 144 + stereopanning 119 + vibrato 9, 3, 4 + duty 3 + notetype 12, 12, 1 + octave 2 + note E_, 1 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + notetype 8, 12, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 + +Music_TitleScreen_branch_7e4e2: + callchannel Music_TitleScreen_branch_7e541 + callchannel Music_TitleScreen_branch_7e54a + callchannel Music_TitleScreen_branch_7e541 + octave 3 + note C_, 8 + notetype 8, 12, 6 + note E_, 4 + note E_, 4 + note C_, 4 + notetype 12, 12, 6 + octave 2 + note B_, 8 + notetype 8, 14, 7 + octave 3 + note F_, 4 + note E_, 4 + note C_, 4 + notetype 12, 14, 7 + note D_, 10 + notetype 12, 12, 6 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 + callchannel Music_TitleScreen_branch_7e541 + callchannel Music_TitleScreen_branch_7e54a + callchannel Music_TitleScreen_branch_7e541 + note C_, 6 + note C_, 6 + note E_, 4 + note D_, 6 + note F_, 2 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 6 + note A_, 4 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note D_, 12 + note E_, 4 + note F_, 8 + note G_, 4 + note F_, 4 + note E_, 12 + note F_, 4 + note G_, 8 + notetype 12, 11, 6 + octave 4 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_7e55c + notetype 8, 11, 4 + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_7e55c + notetype 8, 11, 2 + octave 3 + note E_, 4 + note E_, 4 + note C#, 4 + loopchannel 0, Music_TitleScreen_branch_7e4e2 + +Music_TitleScreen_branch_7e541: + notetype 12, 12, 6 + octave 3 + note D_, 6 + octave 2 + note B_, 2 + octave 3 + note D_, 8 + endchannel + +Music_TitleScreen_branch_7e54a: + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 8 + notetype 12, 14, 7 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + notetype 8, 12, 6 + note C_, 4 + octave 2 + note B_, 4 + octave 3 + note C_, 4 + endchannel + +Music_TitleScreen_branch_7e55c: + notetype 12, 12, 1 + note D_, 1 + rest 1 + octave 2 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + note D_, 1 + note D_, 1 + rest 1 + note D_, 1 + note D_, 1 + endchannel + + +Music_TitleScreen_Ch2: ; 7e578 (1f:6578) + vibrato 16, 4, 6 + duty 1 + notetype 12, 14, 1 + octave 2 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + note F#, 1 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + notetype 8, 14, 1 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 + +Music_TitleScreen_branch_7e594: + vibrato 16, 4, 6 + callchannel Music_TitleScreen_branch_7e622 + octave 2 + note A_, 4 + note F_, 4 + callchannel Music_TitleScreen_branch_7e62c + octave 2 + note A_, 8 + note B_, 16 + callchannel Music_TitleScreen_branch_7e622 + octave 2 + note A_, 6 + note F_, 2 + notetype 8, 14, 7 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + notetype 12, 14, 7 + note D_, 8 + notetype 12, 9, 5 + octave 2 + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + callchannel Music_TitleScreen_branch_7e622 + octave 2 + note A_, 2 + note F_, 6 + callchannel Music_TitleScreen_branch_7e62c + octave 3 + note C_, 2 + octave 2 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + callchannel Music_TitleScreen_branch_7e622 + notetype 8, 9, 5 + octave 2 + note G_, 4 + note F_, 5 + note A_, 3 + notetype 8, 14, 6 + octave 4 + note F_, 4 + note E_, 4 + note F_, 4 + notetype 12, 14, 7 + note G_, 6 + note A#, 2 + note G_, 8 + vibrato 16, 2, 6 + duty 3 + notetype 12, 0, 11 + note G_, 8 + notetype 12, 14, 7 + note A_, 8 + duty 1 + notetype 12, 14, 7 + note A#, 6 + note F_, 2 + note F_, 8 + octave 3 + note D_, 8 + octave 4 + note A#, 4 + note B_, 4 + octave 5 + note C_, 6 + octave 4 + note G_, 2 + note G_, 8 + octave 3 + note E_, 8 + notetype 12, 13, 7 + octave 5 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_7e636 + rest 3 + note D_, 1 + rest 3 + note D_, 1 + notetype 8, 14, 5 + octave 5 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_7e636 + note D_, 1 + rest 2 + note D_, 1 + rest 3 + note D_, 1 + notetype 8, 14, 3 + octave 5 + note C_, 4 + note C_, 4 + octave 4 + note B_, 4 + loopchannel 0, Music_TitleScreen_branch_7e594 + +Music_TitleScreen_branch_7e622: + notetype 12, 14, 7 + octave 3 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + notetype 12, 9, 5 + endchannel + +Music_TitleScreen_branch_7e62c: + notetype 12, 14, 7 + octave 4 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + notetype 12, 9, 5 + endchannel + +Music_TitleScreen_branch_7e636: + notetype 12, 14, 1 + note D_, 1 + rest 2 + octave 4 + note D_, 1 + rest 3 + note D_, 1 + rest 3 + note D_, 1 + rest 3 + note D_, 1 + endchannel + + +Music_TitleScreen_Ch3: ; 7e643 (1f:6643) + notetype 12, 1, 0 + octave 3 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 3 + note G_, 1 + rest 5 + note G_, 1 + note G_, 1 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + note G_, 1 + rest 3 + notetype 8, 1, 0 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note A_, 2 + +Music_TitleScreen_branch_7e65e: + callchannel Music_TitleScreen_branch_7e6c9 + callchannel Music_TitleScreen_branch_7e6d0 + +Music_TitleScreen_branch_7e664: + callchannel Music_TitleScreen_branch_7e6c9 + callchannel Music_TitleScreen_branch_7e6c9 + callchannel Music_TitleScreen_branch_7e6c9 + callchannel Music_TitleScreen_branch_7e6d0 + loopchannel 3, Music_TitleScreen_branch_7e664 + callchannel Music_TitleScreen_branch_7e6c9 + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + callchannel Music_TitleScreen_branch_7e6d7 + note A#, 3 + note F_, 3 + callchannel Music_TitleScreen_branch_7e6d7 + note B_, 3 + note G_, 3 + callchannel Music_TitleScreen_branch_7e6dc + octave 4 + note C_, 3 + octave 3 + note G_, 3 + callchannel Music_TitleScreen_branch_7e6dc + octave 4 + note C#, 3 + octave 3 + note A_, 3 + callchannel Music_TitleScreen_branch_7e6e5 + octave 5 + pitchbend 0, 66 + note D_, 4 + rest 4 + octave 6 + pitchbend 0, 50 + note D_, 4 + octave 5 + pitchbend 0, 66 + note D_, 4 + rest 2 + notetype 8, 1, 0 + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_7e6e5 + octave 6 + pitchbend 0, 50 + note D_, 4 + rest 4 + octave 5 + pitchbend 0, 66 + note D_, 4 + rest 6 + notetype 8, 1, 0 + octave 4 + note C_, 4 + note C_, 4 + octave 3 + note B_, 4 + loopchannel 0, Music_TitleScreen_branch_7e65e + +Music_TitleScreen_branch_7e6c9: + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + endchannel + +Music_TitleScreen_branch_7e6d0: + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + endchannel + +Music_TitleScreen_branch_7e6d7: + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + endchannel + +Music_TitleScreen_branch_7e6dc: + octave 4 + note C_, 6 + octave 3 + note G_, 3 + octave 4 + note C_, 6 + octave 3 + note G_, 3 + endchannel + +Music_TitleScreen_branch_7e6e5: + notetype 12, 1, 0 + octave 4 + note D_, 1 + rest 5 + endchannel + + +Music_TitleScreen_Ch4: ; 7e6eb (1f:66eb) + dspeed 6 + rest 4 + dnote 1, snare3 + dnote 1, snare3 + dnote 1, snare4 + dnote 1, snare4 + dspeed 12 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare2 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare4 + dnote 2, snare2 + dnote 2, snare3 + dnote 2, snare2 + dnote 2, snare1 + +Music_TitleScreen_branch_7e716: + dspeed 12 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare2 + dnote 1, snare3 + rest 3 + callchannel Music_TitleScreen_branch_7e834 + callchannel Music_TitleScreen_branch_7e834 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare2 + dnote 1, snare3 + rest 1 + dnote 1, snare3 + dnote 1, snare2 + callchannel Music_TitleScreen_branch_7e842 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare2 + rest 1 + dnote 1, snare2 + rest 1 + callchannel Music_TitleScreen_branch_7e842 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare2 + rest 1 + dspeed 6 + dnote 1, snare3 + dnote 1, snare3 + dnote 1, snare4 + dnote 1, snare4 + dspeed 12 + callchannel Music_TitleScreen_branch_7e834 + callchannel Music_TitleScreen_branch_7e842 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare2 + rest 1 + dnote 1, snare3 + dnote 1, snare2 + callchannel Music_TitleScreen_branch_7e834 + callchannel Music_TitleScreen_branch_7e842 + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare2 + rest 1 + dnote 1, snare4 + dnote 1, snare3 + dnote 1, snare2 + rest 3 + dnote 1, snare3 + rest 5 + dnote 1, snare2 + dnote 1, snare4 + dnote 1, snare2 + rest 1 + dspeed 6 + dnote 1, snare3 + dnote 1, snare3 + dnote 1, snare4 + dnote 1, snare4 + dspeed 12 + dnote 1, snare1 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare1 + rest 3 + dnote 1, snare2 + rest 3 + dnote 1, snare3 + rest 5 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare3 + rest 3 + dnote 1, snare2 + rest 3 + dnote 1, snare3 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare4 + rest 1 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare2 + rest 3 + dnote 1, snare3 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare2 + rest 3 + dnote 1, snare5 + rest 5 + dnote 1, snare2 + rest 3 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare1 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare2 + rest 1 + dnote 1, snare1 + rest 1 + dspeed 8 + dnote 4, snare2 + dnote 4, snare3 + dnote 4, snare1 + dspeed 12 + dnote 1, snare5 + rest 5 + dnote 1, snare2 + rest 3 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare3 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare1 + rest 1 + dnote 1, snare3 + dnote 1, snare2 + dspeed 8 + dnote 4, snare2 + dnote 4, snare3 + dnote 4, snare2 + loopchannel 0, Music_TitleScreen_branch_7e716 + +Music_TitleScreen_branch_7e834: + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare2 + dnote 1, snare3 + dnote 1, snare2 + rest 3 + endchannel + +Music_TitleScreen_branch_7e842: + dnote 1, snare2 + rest 3 + dnote 1, snare2 + rest 5 + dnote 1, snare3 + dnote 1, snare2 + dnote 1, snare2 + rest 3 + endchannel +; 0x7e850 \ No newline at end of file diff --git a/music/trainerbattle.asm b/music/trainerbattle.asm new file mode 100644 index 00000000..ba8dbc54 --- /dev/null +++ b/music/trainerbattle.asm @@ -0,0 +1,1858 @@ +Music_TrainerBattle_Ch1: ; 22919 (8:6919) + tempo 0, 112 + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 2 + rest 8 + octave 3 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 + +Music_TrainerBattle_branch_22962: + notetype 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 8 + notetype 12, 11, 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + notetype 12, 11, 5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + notetype 12, 10, 7 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + notetype 12, 11, 5 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 + rest 2 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 + rest 2 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note E_, 4 + octave 2 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 1 + note D_, 4 + octave 2 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 4 + octave 2 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 1 + note D_, 4 + octave 2 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 + rest 2 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + rest 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 2 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note B_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 2 + note D_, 2 + rest 2 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + note D_, 2 + octave 3 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + octave 3 + note B_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note F_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note F_, 2 + note D_, 16 + note C_, 16 + octave 2 + note A#, 16 + note G_, 12 + octave 3 + note D_, 1 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + note D_, 8 + note F_, 8 + octave 3 + note A#, 8 + octave 4 + note C_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note G_, 8 + note E_, 2 + rest 4 + note E_, 2 + rest 4 + note E_, 2 + rest 2 + note E_, 2 + rest 4 + note E_, 2 + rest 4 + note E_, 2 + rest 2 + note E_, 2 + rest 4 + note E_, 2 + rest 4 + note E_, 2 + rest 2 + note E_, 2 + rest 4 + note E_, 2 + rest 4 + note E_, 2 + rest 2 + octave 3 + note C_, 2 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 4 + rest 2 + note C#, 1 + note D_, 1 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + octave 2 + note B_, 1 + rest 1 + octave 3 + note C#, 1 + rest 9 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + rest 5 + note C#, 1 + note D_, 1 + note E_, 1 + rest 1 + note F_, 1 + rest 1 + note E_, 1 + rest 1 + note D_, 1 + rest 1 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + rest 9 + note F#, 2 + note E_, 4 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note E_, 8 + note F#, 8 + note G_, 8 + octave 4 + note C_, 4 + octave 3 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + loopchannel 0, Music_TrainerBattle_branch_22962 + + +Music_TrainerBattle_Ch2: ; 22bae (8:6bae) + duty 3 + vibrato 10, 2, 5 + notetype 12, 12, 2 + octave 4 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note A_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note A_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note A_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note A_, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note A_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + notetype 12, 14, 1 + octave 4 + note B_, 16 + rest 16 + notetype 12, 13, 1 + note B_, 16 + rest 12 + note A_, 4 + notetype 12, 12, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 6 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 4 + note D_, 6 + note A_, 2 + note A#, 2 + note B_, 6 + octave 5 + note C#, 6 + note D_, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 4 + note D_, 6 + octave 4 + note A_, 4 + +Music_TrainerBattle_branch_22bfc: + notetype 12, 12, 7 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + notetype 12, 5, 0 + octave 4 + note C_, 8 + notetype 12, 3, 0 + note C_, 8 + notetype 12, 4, 14 + note C_, 8 + notetype 12, 12, 7 + note C_, 8 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + notetype 12, 9, 0 + note A_, 8 + notetype 12, 5, 0 + note A_, 8 + notetype 12, 4, 0 + note A_, 8 + notetype 12, 3, 0 + note A_, 8 + notetype 12, 12, 7 + note G_, 16 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + notetype 12, 8, 0 + note A_, 8 + notetype 12, 5, 0 + note A_, 8 + notetype 12, 4, 0 + note A_, 8 + notetype 12, 6, 0 + note A_, 8 + notetype 12, 12, 7 + note G_, 16 + octave 4 + note E_, 8 + note F#, 8 + note E_, 16 + notetype 12, 12, 5 + note G_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + notetype 12, 11, 7 + note F#, 8 + notetype 12, 5, 0 + note F#, 8 + notetype 12, 6, 0 + note F#, 8 + notetype 12, 7, 0 + note F#, 8 + notetype 12, 10, 0 + note G_, 8 + notetype 12, 10, 7 + note G_, 8 + notetype 12, 11, 7 + note G_, 4 + notetype 12, 12, 5 + note A_, 2 + note G_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + notetype 12, 10, 0 + note G#, 8 + notetype 12, 7, 0 + note G#, 8 + notetype 12, 8, 0 + note G#, 8 + notetype 12, 6, 0 + note G#, 8 + notetype 12, 10, 0 + note A_, 16 + notetype 12, 11, 0 + octave 5 + note C#, 8 + note E_, 8 + notetype 12, 12, 0 + note D_, 4 + octave 4 + note A_, 4 + octave 5 + note C_, 2 + notetype 12, 12, 7 + octave 4 + note B_, 8 + notetype 12, 6, 0 + note B_, 8 + notetype 12, 6, 9 + note B_, 6 + notetype 12, 9, 6 + note B_, 6 + rest 2 + notetype 12, 12, 0 + octave 5 + note D_, 4 + octave 4 + note A_, 4 + note A#, 2 + notetype 12, 11, 0 + octave 5 + note F_, 14 + notetype 12, 6, 0 + note G_, 16 + notetype 12, 5, 0 + note E_, 16 + notetype 12, 4, 0 + note E_, 16 + notetype 12, 12, 7 + octave 4 + note C_, 6 + octave 3 + note A_, 14 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 6 + octave 4 + note F_, 14 + octave 3 + note A#, 4 + octave 4 + note F_, 4 + note D_, 4 + note C_, 6 + octave 3 + note A_, 14 + octave 4 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A#, 4 + octave 4 + note F_, 10 + note G_, 6 + note F_, 6 + note D_, 4 + notetype 12, 11, 0 + note F_, 16 + note E_, 16 + note D_, 16 + note E_, 16 + notetype 12, 10, 0 + octave 5 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + notetype 12, 13, 1 + octave 3 + note A#, 6 + note A#, 6 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 4 + octave 4 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + note A#, 6 + note A#, 6 + note A_, 4 + notetype 12, 12, 7 + note A_, 4 + note B_, 4 + note G_, 2 + note A_, 10 + note B_, 2 + octave 4 + note C#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 16 + rest 2 + note A#, 2 + octave 4 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note B_, 16 + rest 2 + note B_, 2 + octave 4 + note C#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 16 + note E_, 8 + note G_, 8 + loopchannel 0, Music_TrainerBattle_branch_22bfc + + +Music_TrainerBattle_Ch3: ; 22d10 (8:6d10) + vibrato 0, 2, 0 + notetype 12, 1, 4 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 2 + note A#, 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + +Music_TrainerBattle_branch_22d9c: + octave 2 + note A#, 1 + note B_, 1 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 2 + note A_, 2 + note G#, 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 4 + octave 2 + note A_, 4 + octave 3 + note C_, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note D_, 4 + octave 2 + note A_, 4 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + loopchannel 0, Music_TrainerBattle_branch_22d9c +; 0x23099 \ No newline at end of file diff --git a/music/unusedsong.asm b/music/unusedsong.asm new file mode 100644 index 00000000..43b43b43 --- /dev/null +++ b/music/unusedsong.asm @@ -0,0 +1,339 @@ +Music_UnusedSong_Ch1: ; a913 (2:6913) + tempo 0, 144 + stereopanning 119 + vibrato 5, 1, 6 + +Music_UnusedSong_branch_a91b: + notetype 12, 1, 0 + octave 6 + note E_, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + octave 6 + note C#, 1 + rest 1 + octave 5 + note B_, 1 + octave 6 + note E_, 1 + rest 4 + note E_, 2 + rest 2 + note D#, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + octave 6 + note C#, 1 + rest 1 + octave 5 + note B_, 1 + octave 6 + note D#, 1 + rest 8 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note C#, 1 + octave 5 + note B_, 1 + rest 2 + octave 6 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note C#, 1 + octave 5 + note B_, 1 + rest 2 + octave 6 + note D#, 4 + note C#, 4 + note D#, 1 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + octave 5 + note B_, 2 + rest 1 + octave 6 + note E_, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + octave 6 + note C#, 1 + rest 1 + octave 5 + note B_, 1 + octave 6 + note E_, 1 + rest 8 + note D#, 1 + rest 1 + octave 5 + note B_, 1 + rest 1 + octave 6 + note C#, 1 + rest 1 + octave 5 + note B_, 1 + octave 6 + note D#, 1 + rest 4 + octave 5 + note B_, 2 + rest 2 + octave 6 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note C#, 1 + octave 5 + note B_, 1 + rest 2 + octave 6 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 2 + rest 3 + octave 5 + note A_, 2 + rest 2 + note B_, 2 + rest 2 + octave 6 + note C#, 2 + rest 2 + note E_, 2 + note F#, 8 + rest 2 + note E_, 2 + note D#, 2 + note C#, 2 + rest 2 + octave 5 + note G#, 2 + rest 2 + note A_, 2 + rest 2 + note B_, 2 + rest 2 + octave 6 + note D#, 2 + note E_, 8 + rest 2 + note D#, 2 + note C#, 2 + note D#, 2 + octave 5 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 1 + note B_, 1 + rest 4 + note F#, 2 + rest 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 6 + note C_, 1 + note C#, 1 + rest 8 + octave 5 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + octave 6 + note E_, 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + rest 6 + note B_, 2 + rest 6 + loopchannel 0, Music_UnusedSong_branch_a91b + endchannel + + +Music_UnusedSong_Ch2: ; a9cf (2:69cf) + tempo 0, 144 + stereopanning 119 + unknownmusic0xe8 + vibrato 6, 1, 5 + +Music_UnusedSong_branch_a9d8: + notetype 12, 1, 0 + octave 6 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + note G#, 1 + rest 8 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + note F#, 1 + rest 4 + octave 5 + note B_, 2 + rest 2 + octave 6 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 2 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + note G#, 1 + rest 4 + note E_, 2 + rest 2 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + note F#, 1 + rest 8 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note E_, 1 + note F#, 1 + rest 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 2 + rest 1 + note C#, 2 + rest 2 + note D#, 2 + rest 2 + note E_, 2 + rest 2 + note G#, 2 + rest 2 + note D#, 8 + rest 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + rest 2 + octave 6 + note C#, 2 + rest 2 + note D#, 2 + rest 2 + note F#, 2 + rest 2 + note C#, 8 + rest 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 + rest 8 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 + rest 4 + note G#, 2 + rest 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + rest 6 + note D#, 2 + rest 6 + loopchannel 0, Music_UnusedSong_branch_a9d8 + endchannel +; 0xaa6f \ No newline at end of file diff --git a/music/vermilion.asm b/music/vermilion.asm new file mode 100644 index 00000000..35933928 --- /dev/null +++ b/music/vermilion.asm @@ -0,0 +1,324 @@ +Music_Vermilion_Ch1: ; b9eb (2:79eb) + tempo 0, 156 + stereopanning 119 + duty 3 + vibrato 12, 3, 4 + unknownmusic0xe8 + +Music_Vermilion_branch_b9f6: + notetype 12, 11, 5 + octave 3 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 4 + note E_, 4 + note F#, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 2 + octave 4 + note C#, 2 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + note B_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + loopchannel 0, Music_Vermilion_branch_b9f6 + + +Music_Vermilion_Ch2: ; ba61 (2:7a61) + duty 3 + vibrato 10, 2, 3 + +Music_Vermilion_branch_ba66: + notetype 12, 12, 7 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C#, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C#, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 + note E_, 4 + note F#, 8 + note B_, 8 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 8 + note E_, 8 + loopchannel 0, Music_Vermilion_branch_ba66 + + +Music_Vermilion_Ch3: ; baa6 (2:7aa6) + notetype 12, 1, 0 + +Music_Vermilion_branch_baa8: + octave 4 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + loopchannel 0, Music_Vermilion_branch_baa8 + + +Music_Vermilion_Ch4: ; bb0d (2:7b0d) + dspeed 12 + +Music_Vermilion_branch_bb0e: + callchannel Music_Vermilion_branch_bb3f + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + loopchannel 4, Music_Vermilion_branch_bb0e + callchannel Music_Vermilion_branch_bb3f + callchannel Music_Vermilion_branch_bb3f + callchannel Music_Vermilion_branch_bb3f + callchannel Music_Vermilion_branch_bb3f + loopchannel 0, Music_Vermilion_branch_bb0e + +Music_Vermilion_branch_bb3f: + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + dnote 2, triangle1 + dnote 1, triangle1 + dnote 1, triangle1 + endchannel +; 0xbb58 \ No newline at end of file diff --git a/music/wildbattle.asm b/music/wildbattle.asm new file mode 100644 index 00000000..7c7b3b1d --- /dev/null +++ b/music/wildbattle.asm @@ -0,0 +1,739 @@ +Music_WildBattle_Ch1: ; 23099 (8:7099) + tempo 0, 104 + stereopanning 119 + duty 3 + vibrato 6, 3, 4 + unknownmusic0xe8 + notetype 12, 11, 3 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + notetype 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + notetype 12, 4, 15 + note C#, 10 + notetype 12, 11, 1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note C#, 10 + +Music_WildBattle_branch_230e0: + notetype 12, 11, 3 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + notetype 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note E_, 6 + note D_, 6 + note F_, 4 + notetype 12, 11, 7 + note A_, 16 + note G_, 16 + notetype 12, 11, 5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note B_, 4 + notetype 12, 11, 7 + octave 4 + note C_, 16 + notetype 12, 3, 15 + note G_, 16 + notetype 12, 11, 5 + octave 3 + note C_, 12 + note C_, 2 + rest 2 + note D_, 2 + note C_, 2 + rest 12 + note C#, 12 + note C#, 2 + rest 2 + note F_, 2 + notetype 12, 10, 3 + note D#, 6 + notetype 12, 10, 7 + note C#, 8 + loopchannel 0, Music_WildBattle_branch_230e0 + + +Music_WildBattle_Ch2: ; 231d8 (8:71d8) + duty 3 + vibrato 8, 2, 5 + notetype 12, 12, 3 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + notetype 12, 12, 2 + octave 4 + note G_, 6 + octave 3 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + notetype 12, 9, 0 + note F#, 10 + notetype 12, 12, 2 + note G_, 6 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note G_, 10 + +Music_WildBattle_branch_23225: + notetype 12, 12, 5 + note G_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note A_, 6 + note G_, 4 + octave 4 + note G#, 12 + note G_, 2 + rest 2 + note G#, 2 + note G_, 2 + rest 4 + notetype 12, 11, 7 + octave 5 + note C#, 8 + notetype 12, 12, 5 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + note G#, 4 + octave 4 + note C#, 6 + note C_, 6 + octave 3 + note A#, 4 + octave 4 + note F_, 6 + note E_, 6 + note D_, 4 + notetype 12, 12, 7 + octave 3 + note A#, 4 + octave 4 + note C_, 4 + note D_, 4 + note F_, 4 + notetype 12, 12, 0 + note G#, 16 + notetype 12, 11, 0 + note G#, 16 + notetype 12, 4, 14 + note G_, 16 + notetype 12, 12, 7 + note G_, 16 + octave 3 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + note F_, 8 + notetype 12, 12, 0 + note E_, 16 + notetype 12, 12, 7 + note E_, 16 + octave 3 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + note F_, 8 + notetype 12, 12, 0 + note G_, 16 + notetype 12, 3, 15 + octave 5 + note C_, 16 + notetype 12, 12, 5 + octave 4 + note E_, 12 + note E_, 2 + rest 2 + note F_, 2 + notetype 12, 12, 1 + note E_, 4 + notetype 12, 12, 5 + rest 10 + note F_, 12 + note F_, 2 + rest 2 + note G#, 2 + notetype 12, 10, 3 + note G_, 6 + notetype 12, 12, 7 + note F_, 8 + loopchannel 0, Music_WildBattle_branch_23225 + + +Music_WildBattle_Ch3: ; 23290 (8:7290) + vibrato 0, 2, 0 + notetype 12, 1, 1 + octave 4 + note C#, 1 + rest 1 + note C#, 1 + note C_, 1 + note D_, 1 + rest 1 + note D_, 1 + note C_, 1 + note D#, 1 + rest 1 + note D#, 1 + note C_, 1 + note E_, 1 + rest 1 + note E_, 1 + note C_, 1 + note F_, 1 + rest 1 + note F_, 1 + note C_, 1 + note F#, 1 + rest 1 + note F#, 1 + note C_, 1 + note G_, 1 + rest 1 + note G_, 1 + note C_, 1 + octave 3 + note A#, 2 + note B_, 2 + +Music_WildBattle_branch_232b5: + octave 4 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note F_, 2 + loopchannel 2, Music_WildBattle_branch_232b5 + +Music_WildBattle_branch_232d8: + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G#, 12 + note G_, 2 + rest 2 + note G#, 2 + note G_, 2 + rest 4 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + loopchannel 0, Music_WildBattle_branch_232d8 +; 0x233a6 \ No newline at end of file diff --git a/music/yellow/intro.asm b/music/yellow/intro.asm new file mode 100644 index 00000000..dc84df74 --- /dev/null +++ b/music/yellow/intro.asm @@ -0,0 +1,485 @@ +Music_IntroBattle_Ch1: ; 7f65c (1f:765c) + tempo 0, 116 + stereopanning 119 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + note G#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 3 + note A#, 1 + note B_, 2 + note B_, 10 + notetype 12, 11, 6 + octave 4 + note C#, 1 + note C_, 1 + note C#, 10 + octave 3 + note G#, 1 + note G_, 1 + note G#, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 8 + note E_, 8 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note G#, 6 + notetype 12, 11, 2 + note B_, 2 + notetype 12, 11, 6 + note G#, 6 + notetype 12, 11, 2 + note B_, 2 + notetype 12, 11, 6 + octave 4 + note E_, 6 + notetype 12, 11, 2 + note G#, 2 + notetype 12, 11, 6 + note E_, 6 + notetype 12, 11, 2 + note G#, 2 + notetype 12, 11, 6 + octave 3 + note A_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note F#, 4 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + notetype 12, 11, 3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 2 + note C#, 2 + note F#, 4 + note F#, 3 + note D#, 1 + note F#, 2 + note F#, 8 + notetype 12, 11, 6 + note F#, 1 + note F_, 1 + note F#, 8 + octave 3 + note B_, 1 + note A#, 1 + note B_, 8 + octave 4 + note F#, 1 + note F_, 1 + note F#, 2 + notetype 12, 11, 3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + notetype 12, 11, 2 + octave 3 + note B_, 16 + endchannel + + +Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3) + duty 2 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 3 + note D#, 1 + note E_, 2 + note E_, 4 + notetype 12, 12, 5 + note G#, 1 + note G_, 1 + note G#, 10 + octave 3 + note B_, 1 + note A#, 1 + note B_, 6 + notetype 12, 12, 7 + octave 4 + note E_, 4 + note G#, 4 + note B_, 4 + octave 5 + note C#, 16 + octave 4 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + octave 3 + note B_, 6 + notetype 12, 12, 2 + octave 4 + note E_, 2 + notetype 12, 12, 7 + octave 3 + note B_, 6 + notetype 12, 12, 2 + octave 4 + note E_, 2 + notetype 12, 12, 7 + note G#, 6 + notetype 12, 12, 2 + note B_, 2 + notetype 12, 12, 7 + note G#, 6 + notetype 12, 12, 2 + note B_, 2 + notetype 12, 12, 7 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + notetype 12, 12, 3 + octave 4 + note E_, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 2 + note F#, 2 + note A_, 4 + note A_, 3 + note F#, 1 + note A_, 2 + note A_, 4 + notetype 12, 12, 7 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 6 + notetype 12, 12, 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + notetype 12, 12, 2 + note E_, 16 + endchannel + + +Music_IntroBattle_Ch3: ; 7f749 (1f:7749) + notetype 12, 1, 0 + octave 4 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note F#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 3 + note F#, 1 + rest 1 + octave 4 + note F#, 1 + note G#, 1 + note A_, 1 + octave 5 + note C#, 1 + note E_, 1 + rest 15 + endchannel +; 0x7f860 \ No newline at end of file diff --git a/music/yellow/meetjessiejames.asm b/music/yellow/meetjessiejames.asm new file mode 100644 index 00000000..eeff798b --- /dev/null +++ b/music/yellow/meetjessiejames.asm @@ -0,0 +1,310 @@ +Music_MeetJessieJames_Ch1: ; 8316d (20:716d) + tempo 0, 144 + stereopanning 119 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + note G#, 1 + note G_, 1 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + notetype 12, 11, 6 + note D#, 12 + note C_, 4 + +Music_MeetJessieJames_branch_83187: + notetype 12, 11, 2 + octave 4 + note D_, 16 + rest 12 + notetype 12, 11, 4 + octave 3 + note A#, 4 + rest 16 + rest 8 + notetype 12, 11, 2 + octave 2 + note A_, 2 + octave 3 + note A#, 2 + note A_, 4 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + octave 2 + note A#, 4 + notetype 12, 11, 4 + octave 3 + note B_, 4 + notetype 12, 11, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note B_, 2 + notetype 12, 11, 4 + note A#, 4 + loopchannel 0, Music_MeetJessieJames_branch_83187 + + +Music_MeetJessieJames_Ch2: ; 831c8 (20:71c8) + duty 3 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 4 + note D_, 1 + note C#, 1 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + notetype 12, 12, 7 + note A_, 12 + octave 4 + note C#, 4 + +Music_MeetJessieJames_branch_831df: + notetype 12, 12, 2 + octave 3 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + octave 2 + note A_, 4 + notetype 12, 12, 5 + octave 4 + note C#, 4 + notetype 12, 12, 2 + note D_, 1 + octave 3 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + notetype 12, 12, 6 + octave 4 + note D_, 8 + notetype 12, 12, 2 + note D#, 6 + note F_, 4 + note D#, 4 + octave 3 + note A#, 2 + octave 4 + note D#, 6 + note F_, 4 + note D#, 2 + notetype 12, 12, 5 + note D_, 4 + notetype 12, 12, 2 + note D#, 6 + note F_, 4 + note D#, 4 + octave 3 + note A#, 2 + octave 4 + note D#, 4 + note F_, 4 + notetype 12, 12, 5 + note D#, 8 + loopchannel 0, Music_MeetJessieJames_branch_831df + + +Music_MeetJessieJames_Ch3: ; 8322a (20:722a) + notetype 12, 1, 0 + rest 16 + rest 8 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note D#, 2 + +Music_MeetJessieJames_branch_83235: + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A#, 2 + note A_, 2 + note D#, 2 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note D_, 2 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + octave 3 + note A#, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note E_, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + note A#, 1 + rest 1 + note D#, 1 + rest 1 + octave 3 + note A#, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note E_, 1 + rest 1 + loopchannel 0, Music_MeetJessieJames_branch_83235 + endchannel +; 0x832ba \ No newline at end of file diff --git a/music/yellow/surfingpikachu.asm b/music/yellow/surfingpikachu.asm new file mode 100644 index 00000000..46bec7c3 --- /dev/null +++ b/music/yellow/surfingpikachu.asm @@ -0,0 +1,691 @@ +Music_SurfingPikachu_Ch1: ; 82ce8 (20:6ce8) + tempo 0, 117 + stereopanning 119 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 3 + octave 3 + note E_, 6 + notetype 12, 11, 2 + note F#, 2 + notetype 12, 11, 3 + note E_, 6 + notetype 12, 11, 2 + note F#, 16 + rest 2 + notetype 12, 11, 3 + note E_, 6 + notetype 12, 11, 2 + note A_, 2 + notetype 12, 11, 3 + note E_, 6 + notetype 12, 11, 2 + note A_, 14 + notetype 12, 11, 2 + note D#, 2 + note C#, 1 + note D#, 1 + octave 2 + note B_, 6 + octave 3 + note E_, 4 + note E_, 4 + note E_, 8 + note G#, 4 + note G#, 4 + note G#, 2 + +Music_SurfingPikachu_branch_82d1a: + notetype 12, 11, 3 + octave 3 + note G#, 4 + note E_, 4 + note F#, 4 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 6 + note F#, 2 + note A_, 8 + octave 2 + note B_, 6 + octave 3 + note E_, 2 + note G#, 8 + note G#, 4 + note E_, 4 + note F#, 4 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 1 + rest 3 + note A_, 4 + duty 0 + notetype 12, 11, 2 + note G#, 1 + note F#, 1 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note B_, 1 + note A#, 1 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 3 + octave 3 + note F#, 1 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note E_, 3 + note E_, 1 + note B_, 2 + note A_, 2 + note G#, 6 + note E_, 1 + note F_, 1 + note F#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note B_, 1 + note A#, 1 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 3 + octave 3 + note F#, 1 + note A_, 2 + note G#, 2 + note A_, 2 + octave 4 + note D#, 2 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 8 + duty 3 + loopchannel 0, Music_SurfingPikachu_branch_82d1a + + +Music_SurfingPikachu_Ch2: ; 82d9d (20:6d9d) + duty 3 + vibrato 6, 1, 5 + notetype 12, 12, 4 + octave 3 + note B_, 6 + notetype 12, 12, 2 + octave 4 + note E_, 2 + notetype 12, 12, 4 + octave 3 + note B_, 6 + notetype 12, 12, 2 + octave 4 + note E_, 2 + notetype 12, 11, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + notetype 12, 12, 4 + octave 4 + note C#, 6 + notetype 12, 12, 2 + note F#, 2 + notetype 12, 12, 4 + note C#, 6 + notetype 12, 12, 2 + note F#, 2 + notetype 12, 11, 2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + notetype 12, 12, 2 + note E_, 6 + note B_, 4 + note B_, 4 + note B_, 8 + note B_, 4 + note B_, 4 + note B_, 2 + +Music_SurfingPikachu_branch_82de0: + notetype 12, 12, 6 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 2 + note G#, 8 + note F#, 6 + note A_, 2 + octave 4 + note C#, 8 + octave 3 + note E_, 6 + note G#, 2 + note B_, 8 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note D#, 2 + note E_, 8 + note D#, 6 + note C#, 2 + note D#, 1 + rest 3 + note F#, 4 + note E_, 10 + notetype 12, 12, 6 + duty 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 2 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note F#, 2 + note G#, 8 + note A_, 6 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 10 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 2 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note F#, 2 + note G#, 8 + note A_, 4 + note F#, 4 + note D#, 4 + octave 5 + note C#, 4 + octave 4 + note B_, 8 + notetype 12, 12, 2 + octave 5 + note E_, 4 + notetype 12, 12, 6 + duty 3 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C#, 1 + loopchannel 0, Music_SurfingPikachu_branch_82de0 + + +Music_SurfingPikachu_Ch3: ; 82e45 (20:6e45) + notetype 12, 1, 0 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note C#, 1 + rest 1 + octave 4 + note A_, 6 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 6 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + note G#, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + +Music_SurfingPikachu_branch_82ea0: + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + note C_, 1 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + note D#, 1 + note E_, 1 + rest 1 + octave 4 + note D#, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note B_, 1 + note A#, 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note F#, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D_, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note F#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note D#, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + loopchannel 0, Music_SurfingPikachu_branch_82ea0 +; 0x82fbe \ No newline at end of file diff --git a/music/yellow/yellowunusedsong.asm b/music/yellow/yellowunusedsong.asm new file mode 100644 index 00000000..9c5c0aa6 --- /dev/null +++ b/music/yellow/yellowunusedsong.asm @@ -0,0 +1,327 @@ +Music_YellowUnusedSong_Ch1: ; 82fbe (20:6fbe) + tempo 0, 140 + stereopanning 119 + duty 3 + vibrato 8, 1, 4 + notetype 8, 11, 2 + octave 3 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note A_, 6 + note G_, 6 + note A_, 12 + +Music_YellowUnusedSong_branch_82fde: + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + octave 4 + note D#, 6 + note D_, 12 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + octave 3 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note A_, 6 + note G_, 6 + note A_, 12 + loopchannel 0, Music_YellowUnusedSong_branch_82fde + + +Music_YellowUnusedSong_Ch2: ; 83010 (20:7010) + duty 2 + notetype 8, 12, 2 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 + octave 3 + note A_, 6 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note D_, 6 + note A#, 6 + note A_, 12 + +Music_YellowUnusedSong_branch_8302a: + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 + octave 3 + note A_, 6 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note G#, 6 + note G_, 12 + notetype 8, 9, 0 + octave 3 + note D#, 16 + note D#, 8 + note D#, 16 + note D#, 8 + octave 2 + note A#, 16 + note A#, 8 + octave 3 + note D#, 12 + note F_, 12 + notetype 8, 12, 2 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 + octave 3 + note A_, 6 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note D_, 6 + note A#, 6 + note A_, 12 + loopchannel 0, Music_YellowUnusedSong_branch_8302a + + +Music_YellowUnusedSong_Ch3: ; 83068 (20:7068) + notetype 12, 1, 0 + vibrato 2, 1, 5 + rest 16 + rest 12 + octave 4 + note C_, 4 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 + +Music_YellowUnusedSong_branch_83075: + note A_, 8 + note A#, 8 + note G_, 8 + note A_, 4 + note D_, 4 + note A_, 8 + note A#, 8 + octave 5 + note C#, 8 + note D_, 8 + note D#, 16 + note D#, 16 + octave 4 + note A#, 16 + octave 5 + note D#, 8 + note F_, 8 + octave 4 + note D_, 16 + note D_, 16 + octave 4 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 + loopchannel 0, Music_YellowUnusedSong_branch_83075 + + +Music_YellowUnusedSong_Ch4: ; 83092 (20:7092) + dspeed 12 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 4, snare3 + dnote 4, snare3 + +Music_YellowUnusedSong_branch_830c3: + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 4, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dnote 4, snare3 + dspeed 8 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dspeed 12 + dnote 4, snare3 + dnote 4, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 2, snare3 + dnote 4, snare3 + dnote 4, snare3 + loopchannel 0, Music_YellowUnusedSong_branch_830c3 +; 0x8316d \ No newline at end of file diff --git a/textpre.py b/textpre.py index c4e65398..294e9ccb 100644 --- a/textpre.py +++ b/textpre.py @@ -262,6 +262,12 @@ chars = { preprocessor.chars = chars +from extras.pokemontools.crystal import ( + callchannel, + loopchannel, +) + config = configuration.Config() -processor = preprocessor.Preprocessor(config, []) +macros = [callchannel, loopchannel] +processor = preprocessor.Preprocessor(config, macros) processor.preprocess() -- cgit v1.2.3 From 5e7ecff26c5736cbf2a4d97e20b3f4c11aef5770 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sun, 13 Oct 2013 12:27:02 -0400 Subject: Update submodule --- extras | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras b/extras index 2374a9ce..c57e0f07 160000 --- a/extras +++ b/extras @@ -1 +1 @@ -Subproject commit 2374a9ce905ccc4c701f81904b01019641e884b5 +Subproject commit c57e0f0706608a4acba89182945bec975a43acfd -- cgit v1.2.3 From 7df715d0c465ff24a5c5175957c08f6522601e50 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 14 Oct 2013 00:41:56 -0400 Subject: Add song alternate start labels --- main.asm | 12 ++++++------ music/meetrival.asm | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/main.asm b/main.asm index 07230475..19331779 100644 --- a/main.asm +++ b/main.asm @@ -20133,11 +20133,11 @@ Func_9b47: ; 0x9b47 ld a, $de call PlayMusic ld hl, $c006 - ld de, $71a2 + ld de, Music_MeetRival_branch_b1a2 call Func_9b60 - ld de, $721d + ld de, Music_MeetRival_branch_b21d call Func_9b60 - ld de, $72b5 + ld de, Music_MeetRival_branch_b2b5 Func_9b60: ; 0x9b60 ld a, e @@ -20152,14 +20152,14 @@ Func_9b65: ; 0x9b65 ld a, $de call PlayMusic ld hl, $c006 - ld de, $7119 + ld de, Music_MeetRival_branch_b119 jp Func_9b60 ; 0x9b75 Func_9b75: ; 0x9b75 call Func_9b47 ld hl, $c006 - ld de, $719b + ld de, Music_MeetRival_branch_b19b jp Func_9b60 ; 0x9b81 @@ -20175,7 +20175,7 @@ Func_9b81: ; 0x9b81 ld a, $c3 call PlayMusic ld hl, $c006 - ld de, $6a6f + ld de, Music_Cities1_branch_aa6f jp Func_9b60 ; 0x9ba3 diff --git a/music/meetrival.asm b/music/meetrival.asm index 75d38a29..13836b2c 100644 --- a/music/meetrival.asm +++ b/music/meetrival.asm @@ -122,6 +122,8 @@ Music_MeetRival_branch_b140: Music_MeetRival_branch_b19b: tempo 0, 100 loopchannel 0, Music_MeetRival_branch_b1a5 + +Music_MeetRival_branch_b1a2: tempo 0, 112 Music_MeetRival_branch_b1a5: -- cgit v1.2.3 From 5c6bcde09f249f09aa2d138557659a6f8bae49e2 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Thu, 17 Oct 2013 21:48:35 -0600 Subject: Improve comments. --- main.asm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main.asm b/main.asm index cabca5cd..d416b3db 100644 --- a/main.asm +++ b/main.asm @@ -54424,7 +54424,7 @@ ReadMove: ; 39884 (e:5884) pop hl ret -; move choice modifiaction methods that are applied for each trainer class +; move choice modification methods that are applied for each trainer class ; 0 is sentinel value TrainerClassMoveChoiceModifications: ; 3989b (e:589b) db 0 ; YOUNGSTER @@ -54476,6 +54476,7 @@ db 1,0 ; AGATHA db 1,3,0 ; LANCE ; trainer pic pointers and base money. +; money received after battle = base money × level of highest-level enemy mon dw YoungsterPic db 0,$15,0 -- cgit v1.2.3 From 4037c6a95989c807e4d80f1b47a8ba0bc8266199 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Fri, 18 Oct 2013 15:29:31 -0400 Subject: Some music engine labels --- main.asm | 372 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 194 insertions(+), 178 deletions(-) diff --git a/main.asm b/main.asm index 19331779..893dfad9 100644 --- a/main.asm +++ b/main.asm @@ -18633,16 +18633,16 @@ Func_91d0 ; 0x91d0 add hl, bc res 4, [hl] res 5, [hl] - call Func_91e6 + call Music_endchannel ret ; 0x91e6 -Func_91e6 ; 0x91e6 - call Func_9825 +Music_endchannel: ; 0x91e6 + call GetNextMusicByte ld d, a - cp $ff - jp nz, Func_9274 - ld b, $0 + cp $ff ; is this command an endchannel? + jp nz, Music_callchannel ; no + ld b, $0 ; yes ld hl, $c02e add hl, bc bit 1, [hl] @@ -18691,7 +18691,7 @@ Func_91e6 ; 0x91e6 inc de ld a, [de] ld [hl], a - jp Func_91e6 + jp Music_endchannel .asm_923f ld hl, $5b1f add hl, bc @@ -18725,18 +18725,17 @@ Func_91e6 ; 0x91e6 add hl, bc ld [hl], b ret -; 0x9274 -Func_9274: ; 0x9274 - cp $fd - jp nz, Func_92a9 - call Func_9825 +Music_callchannel: ; 0x9274 + cp $fd ; is this command a callchannel? + jp nz, Music_loopchannel ; no + call GetNextMusicByte ; yes push af - call Func_9825 + call GetNextMusicByte ld d, a pop af ld e, a - push de + push de ; store pointer ld d, $0 ld a, c add a @@ -18753,43 +18752,43 @@ Func_9274: ; 0x9274 ld [de], a inc de ld a, [hld] - ld [de], a + ld [de], a ; copy current channel address pop de ld [hl], e inc hl - ld [hl], d + ld [hl], d ; overwrite current address with pointer ld b, $0 ld hl, $c02e add hl, bc set 1, [hl] - jp Func_91e6 -; 0x92a9 + jp Music_endchannel -Func_92a9: ; 0x92a9 - cp $fe - jp nz, Func_92e4 - call Func_9825 +Music_loopchannel: ; 0x92a9 + cp $fe ; is this command a loopchannel? + jp nz, Music_notetype ; no + call GetNextMusicByte ; yes ld e, a and a - jr z, .asm_92cd ; 0x92b3 $18 + jr z, .infiniteLoop ld b, $0 ld hl, $c0be add hl, bc ld a, [hl] cp e - jr nz, .asm_92cb ; 0x92bd $c - ld a, $1 + jr nz, .loopAgain + ld a, $1 ; if no more loops to make, ld [hl], a - call Func_9825 - call Func_9825 - jp Func_91e6 -.asm_92cb + call GetNextMusicByte ; skip pointer + call GetNextMusicByte + jp Music_endchannel +.loopAgain ; inc loop count inc a ld [hl], a -.asm_92cd - call Func_9825 + ; fall through +.infiniteLoop ; overwrite current address with pointer + call GetNextMusicByte push af - call Func_9825 + call GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -18800,73 +18799,76 @@ Func_92a9: ; 0x92a9 pop af ld [hli], a ld [hl], b - jp Func_91e6 -; 0x92e4 + jp Music_endchannel -Func_92e4: ; 0x92e4 +Music_notetype: ; 0x92e4 and $f0 - cp $d0 - jp nz, Func_9323 - ld a, d + cp $d0 ; is this command a notetype? + jp nz, Music_unknownmusic0xe8 ; no + ld a, d ; yes and $f ld b, $0 ld hl, $c0c6 add hl, bc - ld [hl], a + ld [hl], a ; store low nibble as speed ld a, c cp $3 - jr z, .asm_9320 ; 0x92f8 $26 - call Func_9825 + jr z, .noiseChannel ; noise channel has 0 params + call GetNextMusicByte ld d, a ld a, c cp $2 - jr z, .asm_930c ; 0x9301 $9 + jr z, .musicChannel3 cp $6 - jr nz, .asm_9319 ; 0x9305 $12 + jr nz, .notChannel3 ld hl, $c0e7 - jr .asm_930f ; 0x930a $3 -.asm_930c + jr .sfxChannel3 +.musicChannel3 ld hl, $c0e6 -.asm_930f +.sfxChannel3 ld a, d and $f - ld [hl], a + ld [hl], a ; store low nibble of param as duty ld a, d and $30 sla a ld d, a -.asm_9319 + ; fall through + + ; if channel 3, store high nibble as volume + ; else, store volume (high nibble) and fade (low nibble) +.notChannel3 ld b, $0 ld hl, $c0de add hl, bc ld [hl], d -.asm_9320 - jp Func_91e6 -; 0x9323 +.noiseChannel + jp Music_endchannel -Func_9323: ; 0x9323 +Music_unknownmusic0xe8: ; 0x9323 ld a, d - cp $e8 - jr nz, .asm_9335 ; 0x9326 $d - ld b, $0 + cp $e8 ; is this command an unknownmusic0xe8? + jr nz, Music_vibrato ; no + ld b, $0 ; yes ld hl, $c02e add hl, bc ld a, [hl] xor $1 ld [hl], a - jp Func_91e6 -.asm_9335 - cp $ea - jr nz, .asm_936d ; 0x9337 $34 - call Func_9825 + jp Music_endchannel + +Music_vibrato: ; 0x9335 + cp $ea ; is this command a vibrato? + jr nz, Music_pitchbend ; no + call GetNextMusicByte ; yes ld b, $0 ld hl, $c04e add hl, bc - ld [hl], a + ld [hl], a ; store delay ld hl, $c06e add hl, bc - ld [hl], a - call Func_9825 + ld [hl], a ; store delay + call GetNextMusicByte ld d, a and $f0 swap a @@ -18878,7 +18880,7 @@ Func_9323: ; 0x9323 adc b swap a or e - ld [hl], a + ld [hl], a ; store rate as both high and low nibbles ld a, d and $f ld d, a @@ -18886,17 +18888,18 @@ Func_9323: ; 0x9323 add hl, bc swap a or d - ld [hl], a - jp Func_91e6 -.asm_936d - cp $eb - jr nz, .asm_93a5 ; 0x936f $34 - call Func_9825 + ld [hl], a ; store depth as both high and low nibbles + jp Music_endchannel + +Music_pitchbend: ; 0x936d + cp $eb ; is this command a pitchbend? + jr nz, Music_duty ; no + call GetNextMusicByte ; yes ld b, $0 ld hl, $c076 add hl, bc - ld [hl], a - call Func_9825 + ld [hl], a ; store first param + call GetNextMusicByte ld d, a and $f0 swap a @@ -18907,67 +18910,71 @@ Func_9323: ; 0x9323 ld b, $0 ld hl, $c0a6 add hl, bc - ld [hl], d + ld [hl], d ; store unknown part of second param ld hl, $c0ae add hl, bc - ld [hl], e + ld [hl], e ; store unknown part of second param ld b, $0 ld hl, $c02e add hl, bc set 4, [hl] - call Func_9825 + call GetNextMusicByte ld d, a jp Func_950a -.asm_93a5 - cp $ec - jr nz, .asm_93ba ; 0x93a7 $11 - call Func_9825 + +Music_duty: ; 0x93a5 + cp $ec ; is this command a duty? + jr nz, Music_tempo ; no + call GetNextMusicByte ; yes rrca rrca and $c0 ld b, $0 ld hl, $c03e add hl, bc - ld [hl], a - jp Func_91e6 -.asm_93ba - cp $ed - jr nz, .asm_93fa ; 0x93bc $3c - ld a, c + ld [hl], a ; store duty + jp Music_endchannel + +Music_tempo: ; 0x93ba + cp $ed ; is this command a tempo? + jr nz, Music_unknownmusic0xee ; no + ld a, c ; yes cp $4 - jr nc, .asm_93de ; 0x93c1 $1b - call Func_9825 - ld [$c0e8], a - call Func_9825 - ld [$c0e9], a + jr nc, .sfxChannel + call GetNextMusicByte + ld [$c0e8], a ; store first param + call GetNextMusicByte + ld [$c0e9], a ; store second param xor a - ld [$c0ce], a + ld [$c0ce], a ; clear RAM ld [$c0cf], a ld [$c0d0], a ld [$c0d1], a - jr .asm_93f7 ; 0x93dc $19 -.asm_93de - call Func_9825 - ld [$c0ea], a - call Func_9825 - ld [$c0eb], a - xor a - ld [$c0d2], a + jr .musicChannelDone +.sfxChannel + call GetNextMusicByte + ld [$c0ea], a ; store first param + call GetNextMusicByte + ld [$c0eb], a ; store second param + xor a + ld [$c0d2], a ; clear RAM ld [$c0d3], a ld [$c0d4], a ld [$c0d5], a -.asm_93f7 - jp Func_91e6 -.asm_93fa - cp $ee - jr nz, .asm_9407 ; 0x93fc $9 - call Func_9825 - ld [$c004], a - jp Func_91e6 -.asm_9407 - cp $ef - jr nz, .asm_9426 ; 0x9409 $1b - call Func_9825 +.musicChannelDone + jp Music_endchannel + +Music_unknownmusic0xee: ; 0x93fa + cp $ee ; is this command an unknownmusic0xee? + jr nz, Music_unknownmusic0xef ; no + call GetNextMusicByte ; yes + ld [$c004], a ; store first param + jp Music_endchannel + +Music_unknownmusic0xef ; 0x9407 + cp $ef ; is this command an unknownmusic0xef? + jr nz, Music_dutycycle ; no + call GetNextMusicByte ; yes push bc call Func_9876 pop bc @@ -18979,48 +18986,53 @@ Func_9323: ; 0x9323 xor a ld [$c02d], a .asm_9423 - jp Func_91e6 -.asm_9426 - cp $fc - jr nz, .asm_9444 ; 0x9428 $1a - call Func_9825 + jp Music_endchannel + +Music_dutycycle: ; 0x9426 + cp $fc ; is this command a dutycycle? + jr nz, Music_stereopanning ; no + call GetNextMusicByte ; yes ld b, $0 ld hl, $c046 add hl, bc - ld [hl], a + ld [hl], a ; store full cycle and $c0 ld hl, $c03e add hl, bc - ld [hl], a + ld [hl], a ; store first duty ld hl, $c02e add hl, bc - set 6, [hl] - jp Func_91e6 -.asm_9444 - cp $f0 - jr nz, .asm_9450 ; 0x9446 $8 - call Func_9825 - ld [$ff00+$24], a - jp Func_91e6 -.asm_9450 - cp $f8 - jr nz, .asm_945f ; 0x9452 $b - ld b, $0 + set 6, [hl] ; set dutycycle flag + jp Music_endchannel + +Music_stereopanning: ; 0x9444 + cp $f0 ; is this command a stereopanning? + jr nz, Music_unknownmusic0xf8 ; no + call GetNextMusicByte ; yes + ld [$ff00+$24], a ; store stereopanning + jp Music_endchannel + +Music_unknownmusic0xf8: ; 0x9450 + cp $f8 ; is this command an unknownmusic0xf8? + jr nz, Music_octave ; no + ld b, $0 ; yes ld hl, $c036 add hl, bc set 0, [hl] - jp Func_91e6 -.asm_945f + jp Music_endchannel + +Music_octave: ; 0x945f and $f0 - cp $e0 - jr nz, .asm_9472 ; 0x9463 $d - ld hl, $c0d6 + cp $e0 ; is this command an octave? + jr nz, .asm_9472 ; no + ld hl, $c0d6 ; yes ld b, $0 add hl, bc ld a, d and $f - ld [hl], a - jp Func_91e6 + ld [hl], a ; store low nibble as octave + jp Music_endchannel + .asm_9472 cp $20 jr nz, .asm_94bf ; 0x9474 $49 @@ -19043,19 +19055,19 @@ Func_9323: ; 0x9323 ld b, $1 call Func_9838 ld [hl], d - call Func_9825 + call GetNextMusicByte ld d, a ld b, $2 call Func_9838 ld [hl], d - call Func_9825 + call GetNextMusicByte ld e, a ld a, c cp $7 ld a, $0 jr z, .asm_94b2 ; 0x94ab $5 push de - call Func_9825 + call GetNextMusicByte pop de .asm_94b2 ld d, a @@ -19077,9 +19089,9 @@ Func_9323: ; 0x9323 add hl, bc bit 0, [hl] jr nz, .asm_94db ; 0x94d1 $8 - call Func_9825 + call GetNextMusicByte ld [$ff00+$10], a - jp Func_91e6 + jp Music_endchannel .asm_94db ld a, c cp $3 @@ -19103,7 +19115,7 @@ Func_9323: ; 0x9323 and $f push af push bc - call Func_9825 + call GetNextMusicByte .asm_94fd ld d, a ld a, [$c003] @@ -19669,7 +19681,7 @@ Func_980d: ; 0x980d ret ; 0x9825 -Func_9825: ; 0x9825 +GetNextMusicByte: ; 0x9825 ld d, $0 ld a, c add a @@ -19680,9 +19692,9 @@ Func_9825: ; 0x9825 ld e, a ld a, [hld] ld d, a - ld a, [de] + ld a, [de] ; get next music command inc de - ld [hl], e + ld [hl], e ; store address of next command inc hl ld [hl], d ret @@ -19725,7 +19737,7 @@ Func_9858: ; 0x9858 add hl, hl ld d, h ld e, l - ld hl, $5b2f + ld hl, Unknown_9b2f add hl, de ld e, [hl] inc hl @@ -19764,53 +19776,53 @@ Func_9876: ; 0x9876 ld [$c0e7], a ld d, $8 ld hl, $c016 - call Func_9a89 + call FillMusicRAM ld hl, $c006 - call Func_9a89 + call FillMusicRAM ld d, $4 ld hl, $c026 - call Func_9a89 + call FillMusicRAM ld hl, $c02e - call Func_9a89 + call FillMusicRAM ld hl, $c03e - call Func_9a89 + call FillMusicRAM ld hl, $c046 - call Func_9a89 + call FillMusicRAM ld hl, $c04e - call Func_9a89 + call FillMusicRAM ld hl, $c056 - call Func_9a89 + call FillMusicRAM ld hl, $c05e - call Func_9a89 + call FillMusicRAM ld hl, $c066 - call Func_9a89 + call FillMusicRAM ld hl, $c06e - call Func_9a89 + call FillMusicRAM ld hl, $c036 - call Func_9a89 + call FillMusicRAM ld hl, $c076 - call Func_9a89 + call FillMusicRAM ld hl, $c07e - call Func_9a89 + call FillMusicRAM ld hl, $c086 - call Func_9a89 + call FillMusicRAM ld hl, $c08e - call Func_9a89 + call FillMusicRAM ld hl, $c096 - call Func_9a89 + call FillMusicRAM ld hl, $c09e - call Func_9a89 + call FillMusicRAM ld hl, $c0a6 - call Func_9a89 + call FillMusicRAM ld hl, $c0ae - call Func_9a89 + call FillMusicRAM ld a, $1 ld hl, $c0be - call Func_9a89 + call FillMusicRAM ld hl, $c0b6 - call Func_9a89 + call FillMusicRAM ld hl, $c0c6 - call Func_9a89 + call FillMusicRAM ld [$c0e8], a ld a, $ff ld [$c004], a @@ -19836,7 +19848,7 @@ Func_994e: ; 0x994e ld d, h add hl, hl add hl, de - ld de, $4000 + ld de, SFX_Headers_02 add hl, de ld a, h ld [$c0ec], a @@ -20009,11 +20021,11 @@ Func_9a34: ; 0x9a34 ld [$c0e7], a ld d, $a0 ld hl, $c006 - call Func_9a89 + call FillMusicRAM ld a, $1 ld d, $18 ld hl, $c0b6 - call Func_9a89 + call FillMusicRAM ld [$c0e8], a ld [$c0ea], a ld a, $ff @@ -20021,7 +20033,8 @@ Func_9a34: ; 0x9a34 ret ; 0x9a89 -Func_9a89: ; 0x9a89 +; fills d bytes at hl with a +FillMusicRAM: ; 0x9a89 ld b, d .asm_9a8a ld [hli], a @@ -20038,12 +20051,12 @@ Func_9a8f: ; 0x9a8f ld d, h add hl, hl add hl, de - ld de, $4000 + ld de, SFX_Headers_02 add hl, de ld e, l ld d, h ld hl, $c006 - ld a, [de] + ld a, [de] ; get channel number ld b, a rlca rlca @@ -20081,7 +20094,7 @@ Func_9a8f: ; 0x9a8f .asm_9ad2 pop bc pop hl - ld a, [de] + ld a, [de] ; get channel pointer ld [hli], a inc de ld a, [de] @@ -20126,7 +20139,10 @@ Func_9a8f: ; 0x9a8f ret ; 0x9b16 -INCBIN "baserom.gbc",$9b16,$9b47 - $9b16 +INCBIN "baserom.gbc",$9b16,$9b2f - $9b16 + +Unknown_9b2f: ; 0x9b2f +INCBIN "baserom.gbc",$9b2f,$9b47 - $9b2f Func_9b47: ; 0x9b47 ld c, $2 -- cgit v1.2.3 From a336ddf0e58e926d4d4ed091d1f45a920cb26632 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Fri, 18 Oct 2013 16:28:58 -0400 Subject: More music engine labels --- main.asm | 95 +++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/main.asm b/main.asm index 893dfad9..473f804c 100644 --- a/main.asm +++ b/main.asm @@ -18920,7 +18920,7 @@ Music_pitchbend: ; 0x936d set 4, [hl] call GetNextMusicByte ld d, a - jp Func_950a + jp Music_notelength Music_duty: ; 0x93a5 cp $ec ; is this command a duty? @@ -19044,7 +19044,7 @@ Music_octave: ; 0x945f add hl, bc bit 0, [hl] jr nz, .asm_94bf ; 0x9483 $3a - call Func_950a + call Music_notelength ld d, a ld b, $0 ld hl, $c03e @@ -19080,7 +19080,7 @@ Music_octave: ; 0x945f .asm_94bf ld a, c cp $4 - jr c, .asm_94db ; 0x94c2 $17 + jr c, .asm_94db ; if not a sfx ld a, d cp $10 jr nz, .asm_94db ; 0x94c7 $12 @@ -19095,12 +19095,12 @@ Music_octave: ; 0x945f .asm_94db ld a, c cp $3 - jr nz, Func_950a ; 0x94de $2a + jr nz, Music_notelength ; if not channel 3 ld a, d and $f0 cp $b0 jr z, .asm_94f5 ; 0x94e5 $e - jr nc, Func_950a ; 0x94e7 $21 + jr nc, Music_notelength ; 0x94e7 $21 swap a ld b, a ld a, d @@ -19127,13 +19127,13 @@ Music_octave: ; 0x945f pop bc pop de -Func_950a: ; 0x950a +Music_notelength: ; 0x950a ld a, d push af and $f inc a ld b, $0 - ld e, a + ld e, a ; store note length (in 16ths) ld d, b ld hl, $c0c6 add hl, bc @@ -19142,23 +19142,23 @@ Func_950a: ; 0x950a call Func_9847 ld a, c cp $4 - jr nc, .asm_952b ; 0x951f $a + jr nc, .sfxChannel ld a, [$c0e8] ld d, a ld a, [$c0e9] ld e, a - jr .asm_953e ; 0x9529 $13 -.asm_952b + jr .done +.sfxChannel ld d, $1 ld e, $0 cp $7 - jr z, .asm_953e ; 0x9531 $b + jr z, .done ; if noise channel call Func_9693 ld a, [$c0ea] ld d, a ld a, [$c0eb] ld e, a -.asm_953e +.done ld a, l ld b, $0 ld hl, $c0ce @@ -19177,41 +19177,43 @@ Func_950a: ; 0x950a ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_9568 ; 0x955c $a + jr nz, Music_notepitch ; 0x955c $a ld hl, $c02e add hl, bc bit 2, [hl] - jr z, .asm_9568 ; 0x9564 $2 + jr z, Music_notepitch ; 0x9564 $2 pop hl ret -.asm_9568 + +Music_notepitch: ; 0x9568 pop af and $f0 - cp $c0 - jr nz, .asm_959f ; 0x956d $30 + cp $c0 ; compare to rest + jr nz, .notRest ld a, c cp $4 - jr nc, .asm_957c ; 0x9572 $8 + jr nc, .sfxChannel ld hl, $c02a add hl, bc ld a, [hl] and a - jr nz, .asm_959e ; 0x957a $22 -.asm_957c + jr nz, .done + ; fall through +.sfxChannel ld a, c cp $2 - jr z, .asm_9585 ; 0x957f $4 + jr z, .musicChannel3 cp $6 - jr nz, .asm_9592 ; 0x9583 $d -.asm_9585 + jr nz, .notsfxChannel3 +.musicChannel3 ld b, $0 ld hl, $5b1f add hl, bc ld a, [$ff00+$25] and [hl] ld [$ff00+$25], a - jr .asm_959e ; 0x9590 $c -.asm_9592 + jr .done +.notsfxChannel3 ld b, $2 call Func_9838 ld a, $8 @@ -19219,9 +19221,9 @@ Func_950a: ; 0x950a inc hl ld a, $80 ld [hl], a -.asm_959e +.done ret -.asm_959f +.notRest swap a ld b, $0 ld hl, $c0d6 @@ -19238,7 +19240,7 @@ Func_950a: ; 0x950a push de ld a, c cp $4 - jr nc, .asm_95cd ; 0x95bc $f + jr nc, .skip ; if sfx channel ld hl, $c02a ld d, $0 ld e, a @@ -19246,11 +19248,11 @@ Func_950a: ; 0x950a ld a, [hl] and a jr nz, .asm_95cb ; 0x95c7 $2 - jr .asm_95cd ; 0x95c9 $2 + jr .skip .asm_95cb pop de ret -.asm_95cd +.skip ld b, $0 ld hl, $c0de add hl, bc @@ -19286,15 +19288,15 @@ Func_95f8: ; 0x95f8 ld d, a ld a, c cp $7 - jr z, .asm_9613 ; 0x9605 $c + jr z, .sfxNoiseChannel cp $4 - jr nc, .asm_9625 ; 0x9609 $1a + jr nc, .skip ; if music noise channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr nz, .asm_9625 ; 0x9611 $12 -.asm_9613 + jr nz, .skip +.sfxNoiseChannel ld a, [$c004] ld hl, $5b27 add hl, bc @@ -19306,7 +19308,7 @@ Func_95f8: ; 0x95f8 and [hl] or d ld d, a -.asm_9625 +.skip ld a, d ld [$ff00+$25], a ret @@ -19319,9 +19321,9 @@ Func_9629: ; 0x9629 ld d, [hl] ld a, c cp $2 - jr z, .asm_9644 ; 0x9633 $f + jr z, .channel3 ; if music channel 3 cp $6 - jr z, .asm_9644 ; 0x9637 $b + jr z, .channel3 ; if sfx channel 3 ld a, d and $3f ld d, a @@ -19330,7 +19332,7 @@ Func_9629: ; 0x9629 ld a, [hl] or d ld d, a -.asm_9644 +.channel3 ld b, $1 call Func_9838 ld [hl], d @@ -19340,16 +19342,17 @@ Func_9629: ; 0x9629 Func_964b: ; 0x964b ld a, c cp $2 - jr z, .asm_9654 ; 0x964e $4 + jr z, .musicChannel3 cp $6 - jr nz, .asm_9681 ; 0x9652 $2d -.asm_9654 + jr nz, .notsfxChannel3 + ; fall through +.musicChannel3 push de ld de, $c0e6 cp $2 - jr z, .asm_965f ; 0x965a $3 + jr z, .musicChannel3again ld de, $c0e7 -.asm_965f +.musicChannel3again ld a, [de] add a ld d, $0 @@ -19363,18 +19366,18 @@ Func_964b: ; 0x964b ld b, $f ld a, $0 ld [$ff00+$1a], a -.asm_9674 +.loop ld a, [de] inc de ld [hli], a ld a, b dec b and a - jr nz, .asm_9674 ; 0x967a $f8 + jr nz, .loop ld a, $80 ld [$ff00+$1a], a pop de -.asm_9681 +.notsfxChannel3 ld a, d or $80 and $c7 -- cgit v1.2.3 From 74948728aae7402250083e400adf45159e8a18bd Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Sat, 19 Oct 2013 13:24:34 -0400 Subject: More music engine labels and comments --- main.asm | 386 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 185 insertions(+), 201 deletions(-) diff --git a/main.asm b/main.asm index 473f804c..5d5c5d86 100644 --- a/main.asm +++ b/main.asm @@ -18369,6 +18369,7 @@ INCLUDE "music/sfx/sfx_02_11.tx" INCLUDE "music/sfx/sfx_02_12.tx" INCLUDE "music/sfx/sfx_02_13.tx" +Unknown_8361: INCBIN "baserom.gbc",$8361,$83c3 - $8361 INCLUDE "music/sfx/sfx_02_3f.tx" @@ -18447,59 +18448,58 @@ INCLUDE "music/sfx/sfx_02_34.tx" INCLUDE "music/sfx/sfx_02_35.tx" INCLUDE "music/sfx/sfx_02_36.tx" -Func_90c6: ; 0x90c6 +PlayBattleMusic: ; 0x90c6 xor a ld [$cfc7], a ld [$d083], a dec a ld [$c0ee], a - call PlaySound + call PlaySound ; stop music call DelayFrame - ld c, $8 - ld a, [$d05c] - and a - jr z, .asm_90e3 ; 0x90dd $4 - ld a, $ea - jr .asm_9100 ; 0x90e1 $1d -.asm_90e3 - ld a, [$d059] + ld c, BANK(Music_GymLeaderBattle) + ld a, [W_GYMLEADERNO] + and a + jr z, .notGymLeaderBattle + ld a, (Music_GymLeaderBattle - $4000) / 3 + jr .playSong +.notGymLeaderBattle + ld a, [W_CUROPPONENT] cp $c8 - jr c, .asm_90fe ; 0x90e8 $14 - cp $f3 - jr z, .asm_90fa ; 0x90ec $c - cp $f7 - jr nz, .asm_90f6 ; 0x90f0 $4 - ld a, $ea - jr .asm_9100 ; 0x90f4 $a -.asm_90f6 - ld a, $ed - jr .asm_9100 ; 0x90f8 $6 -.asm_90fa - ld a, $f3 - jr .asm_9100 ; 0x90fc $2 -.asm_90fe - ld a, $f0 -.asm_9100 + jr c, .wildBattle + cp SONY3 + $c8 + jr z, .finalBattle + cp LANCE + $c8 + jr nz, .normalTrainerBattle + ld a, (Music_GymLeaderBattle - $4000) / 3 ; lance also plays gym leader theme + jr .playSong +.normalTrainerBattle + ld a, (Music_TrainerBattle - $4000) / 3 + jr .playSong +.finalBattle + ld a, (Music_FinalBattle - $4000) / 3 + jr .playSong +.wildBattle + ld a, (Music_WildBattle - $4000) / 3 +.playSong jp PlayMusic -; 0x9103 Func_9103: ; 0x9103 - ld c, $0 -.asm_9105 + ld c, CH0 +.loop ld b, $0 ld hl, $c026 add hl, bc ld a, [hl] and a - jr z, .asm_9131 ; 0x910d $22 + jr z, .nextChannel ld a, c - cp $4 - jr nc, .asm_912e ; 0x9112 $1a + cp CH4 + jr nc, .asm_912e ; if sfx channel ld a, [$c002] and a - jr z, .asm_912e ; 0x9118 $14 + jr z, .asm_912e bit 7, a - jr nz, .asm_9131 ; 0x911c $13 + jr nz, .nextChannel set 7, a ld [$c002], a xor a @@ -18507,63 +18507,65 @@ Func_9103: ; 0x9103 ld [$ff00+$1a], a ld a, $80 ld [$ff00+$1a], a - jr .asm_9131 ; 0x912c $3 + jr .nextChannel .asm_912e call Func_9138 -.asm_9131 +.nextChannel ld a, c - inc c - cp $7 - jr nz, .asm_9105 ; 0x9135 $ce + inc c ; inc channel number + cp CH7 + jr nz, .loop ret -; 0x9138 +; this routine checks flags for music effects currently applied +; to the channel and calls certain functions based on flags. +; specific flags are unknown Func_9138: ; 0x9138 ld b, $0 - ld hl, $c0b6 + ld hl, $c0b6 ; delay unitl next note add hl, bc ld a, [hl] - cp $1 - jp z, Func_91d0 - dec a + cp $1 ; if the delay is 1, play next note + jp z, PlayNextNote + dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp $4 - jr nc, .asm_9154 ; 0x9149 $9 + cp CH4 + jr nc, .skip ; if a sfx channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr z, .asm_9154 ; 0x9151 $1 + jr z, .skip ret -.asm_9154 +.skip ld hl, $c02e add hl, bc bit 6, [hl] - jr z, .asm_915f ; 0x915a $3 + jr z, .asm_915f call Func_980d .asm_915f ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_9171 ; 0x9167 $8 + jr nz, .asm_9171 ld hl, $c02e add hl, bc bit 2, [hl] - jr nz, .asm_9185 ; 0x916f $14 + jr nz, .asm_9185 .asm_9171 ld hl, $c02e add hl, bc bit 4, [hl] - jr z, .asm_917c ; 0x9177 $3 + jr z, .asm_917c jp Func_96f9 .asm_917c ld hl, $c04e add hl, bc ld a, [hl] and a - jr z, .asm_9186 ; 0x9182 $2 + jr z, .asm_9186 dec [hl] .asm_9185 ret @@ -18572,7 +18574,7 @@ Func_9138: ; 0x9138 add hl, bc ld a, [hl] and a - jr nz, .asm_918f ; 0x918c $1 + jr nz, .asm_918f ret .asm_918f ld d, a @@ -18581,7 +18583,7 @@ Func_9138: ; 0x9138 ld a, [hl] and $f and a - jr z, .asm_919c ; 0x9198 $2 + jr z, .asm_919c dec [hl] ret .asm_919c @@ -18595,24 +18597,24 @@ Func_9138: ; 0x9138 ld hl, $c02e add hl, bc bit 3, [hl] - jr z, .asm_91bc ; 0x91ac $e + jr z, .asm_91bc res 3, [hl] ld a, d and $f ld d, a ld a, e sub d - jr nc, .asm_91ba ; 0x91b6 $2 + jr nc, .asm_91ba ld a, $0 .asm_91ba - jr .asm_91c8 ; 0x91ba $c + jr .asm_91c8 .asm_91bc set 3, [hl] ld a, d and $f0 swap a add e - jr nc, .asm_91c8 ; 0x91c4 $2 + jr nc, .asm_91c8 ld a, $ff .asm_91c8 ld d, a @@ -18620,9 +18622,11 @@ Func_9138: ; 0x9138 call Func_9838 ld [hl], d ret -; 0x91d0 -Func_91d0 ; 0x91d0 +; this routine executes all music commands that take up no time, +; like tempo changes, duty changes etc. and doesn't return +; until the first note is reached +PlayNextNote ; 0x91d0 ld hl, $c06e add hl, bc ld a, [hl] @@ -18635,7 +18639,6 @@ Func_91d0 ; 0x91d0 res 5, [hl] call Music_endchannel ret -; 0x91e6 Music_endchannel: ; 0x91e6 call GetNextMusicByte @@ -18646,33 +18649,33 @@ Music_endchannel: ; 0x91e6 ld hl, $c02e add hl, bc bit 1, [hl] - jr nz, .asm_9224 ; 0x91f7 $2b + jr nz, .returnFromCall ld a, c - cp $3 - jr nc, .asm_9200 ; 0x91fc $2 - jr .asm_923f ; 0x91fe $3f -.asm_9200 + cp CH3 + jr nc, .noiseOrSfxChannel + jr .asm_923f +.noiseOrSfxChannel res 2, [hl] ld hl, $c036 add hl, bc res 0, [hl] - cp $6 - jr nz, .asm_9214 ; 0x920a $8 + cp CH6 + jr nz, .notSfxChannel3 ld a, $0 ld [$ff00+$1a], a ld a, $80 ld [$ff00+$1a], a -.asm_9214 - jr nz, .asm_9222 ; 0x9214 $c +.notSfxChannel3 + jr nz, .asm_9222 ld a, [$c003] and a - jr z, .asm_9222 ; 0x921a $6 + jr z, .asm_9222 xor a ld [$c003], a - jr .asm_923f ; 0x9220 $1d + jr .asm_923f .asm_9222 - jr .asm_9248 ; 0x9222 $24 -.asm_9224 + jr .asm_9248 +.returnFromCall res 1, [hl] ld d, $0 ld a, c @@ -18680,7 +18683,7 @@ Music_endchannel: ; 0x91e6 ld e, a ld hl, $c006 add hl, de - push hl + push hl ; store current channel address ld hl, $c016 add hl, de ld e, l @@ -18690,7 +18693,7 @@ Music_endchannel: ; 0x91e6 ld [hli], a inc de ld a, [de] - ld [hl], a + ld [hl], a ; store channel address from call jp Music_endchannel .asm_923f ld hl, $5b1f @@ -18701,18 +18704,18 @@ Music_endchannel: ; 0x91e6 .asm_9248 ld a, [$c02a] cp $14 - jr nc, .asm_9251 ; 0x924d $2 - jr .asm_926e ; 0x924f $1d + jr nc, .asm_9251 + jr .asm_926e .asm_9251 ld a, [$c02a] cp $86 - jr z, .asm_926e ; 0x9256 $16 - jr c, .asm_925c ; 0x9258 $2 - jr .asm_926e ; 0x925a $12 + jr z, .asm_926e + jr c, .asm_925c + jr .asm_926e .asm_925c ld a, c cp $4 - jr z, .asm_9265 ; 0x925f $4 + jr z, .asm_9265 call Func_96c7 ret c .asm_9265 @@ -18760,7 +18763,7 @@ Music_callchannel: ; 0x9274 ld b, $0 ld hl, $c02e add hl, bc - set 1, [hl] + set 1, [hl] ; set the call flag jp Music_endchannel Music_loopchannel: ; 0x92a9 @@ -18812,14 +18815,14 @@ Music_notetype: ; 0x92e4 add hl, bc ld [hl], a ; store low nibble as speed ld a, c - cp $3 + cp CH3 jr z, .noiseChannel ; noise channel has 0 params call GetNextMusicByte ld d, a ld a, c - cp $2 + cp CH2 jr z, .musicChannel3 - cp $6 + cp CH6 jr nz, .notChannel3 ld hl, $c0e7 jr .sfxChannel3 @@ -18917,7 +18920,7 @@ Music_pitchbend: ; 0x936d ld b, $0 ld hl, $c02e add hl, bc - set 4, [hl] + set 4, [hl] ; set pitchbend flag call GetNextMusicByte ld d, a jp Music_notelength @@ -19024,7 +19027,7 @@ Music_unknownmusic0xf8: ; 0x9450 Music_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? - jr nz, .asm_9472 ; no + jr nz, UnknownNoiseCommand ; no ld hl, $c0d6 ; yes ld b, $0 add hl, bc @@ -19033,17 +19036,17 @@ Music_octave: ; 0x945f ld [hl], a ; store low nibble as octave jp Music_endchannel -.asm_9472 - cp $20 - jr nz, .asm_94bf ; 0x9474 $49 +UnknownNoiseCommand: ; 0x9472 + cp $20 ; is this command an unknownnoisecommand? + jr nz, .skip ; no ld a, c - cp $3 - jr c, .asm_94bf ; 0x9479 $44 + cp CH3 ; is this a noise or sfx channel? + jr c, .skip ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_94bf ; 0x9483 $3a + jr nz, .skip call Music_notelength ld d, a ld b, $0 @@ -19063,13 +19066,13 @@ Music_octave: ; 0x945f call GetNextMusicByte ld e, a ld a, c - cp $7 + cp CH7 ld a, $0 - jr z, .asm_94b2 ; 0x94ab $5 + jr z, .sfxNoiseChannel push de call GetNextMusicByte pop de -.asm_94b2 +.sfxNoiseChannel ld d, a push de call Func_9629 @@ -19077,30 +19080,30 @@ Music_octave: ; 0x945f pop de call Func_964b ret -.asm_94bf +.skip ld a, c - cp $4 + cp CH4 jr c, .asm_94db ; if not a sfx ld a, d cp $10 - jr nz, .asm_94db ; 0x94c7 $12 + jr nz, .asm_94db ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_94db ; 0x94d1 $8 + jr nz, .asm_94db call GetNextMusicByte ld [$ff00+$10], a jp Music_endchannel .asm_94db ld a, c - cp $3 - jr nz, Music_notelength ; if not channel 3 + cp CH3 + jr nz, Music_notelength ; if not noise channel ld a, d and $f0 - cp $b0 - jr z, .asm_94f5 ; 0x94e5 $e - jr nc, Music_notelength ; 0x94e7 $21 + cp $b0 ; is this command a dnote? + jr z, Music_dnote + jr nc, Music_notelength swap a ld b, a ld a, d @@ -19109,14 +19112,15 @@ Music_octave: ; 0x945f ld a, b push de push bc - jr .asm_94fd ; 0x94f3 $8 -.asm_94f5 + jr asm_94fd + +Music_dnote: ld a, d and $f push af push bc - call GetNextMusicByte -.asm_94fd + call GetNextMusicByte ; get dnote instrument +asm_94fd ld d, a ld a, [$c003] and a @@ -19141,7 +19145,7 @@ Music_notelength: ; 0x950a ld l, b call Func_9847 ld a, c - cp $4 + cp CH4 jr nc, .sfxChannel ld a, [$c0e8] ld d, a @@ -19151,7 +19155,7 @@ Music_notelength: ; 0x950a .sfxChannel ld d, $1 ld e, $0 - cp $7 + cp CH7 jr z, .done ; if noise channel call Func_9693 ld a, [$c0ea] @@ -19177,11 +19181,11 @@ Music_notelength: ; 0x950a ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, Music_notepitch ; 0x955c $a + jr nz, Music_notepitch ld hl, $c02e add hl, bc bit 2, [hl] - jr z, Music_notepitch ; 0x9564 $2 + jr z, Music_notepitch pop hl ret @@ -19191,7 +19195,7 @@ Music_notepitch: ; 0x9568 cp $c0 ; compare to rest jr nz, .notRest ld a, c - cp $4 + cp CH4 jr nc, .sfxChannel ld hl, $c02a add hl, bc @@ -19201,9 +19205,9 @@ Music_notepitch: ; 0x9568 ; fall through .sfxChannel ld a, c - cp $2 + cp CH2 jr z, .musicChannel3 - cp $6 + cp CH6 jr nz, .notsfxChannel3 .musicChannel3 ld b, $0 @@ -19239,7 +19243,7 @@ Music_notepitch: ; 0x9568 .asm_95b8 push de ld a, c - cp $4 + cp CH4 jr nc, .skip ; if sfx channel ld hl, $c02a ld d, $0 @@ -19277,7 +19281,6 @@ Music_notepitch: ; 0x9568 ld [hl], e call Func_964b ret -; 0x95f8 Func_95f8: ; 0x95f8 ld b, $0 @@ -19287,10 +19290,10 @@ Func_95f8: ; 0x95f8 or [hl] ld d, a ld a, c - cp $7 + cp CH7 jr z, .sfxNoiseChannel - cp $4 - jr nc, .skip ; if music noise channel + cp CH4 + jr nc, .skip ; if sfx channel ld hl, $c02a add hl, bc ld a, [hl] @@ -19312,7 +19315,6 @@ Func_95f8: ; 0x95f8 ld a, d ld [$ff00+$25], a ret -; 0x9629 Func_9629: ; 0x9629 ld b, $0 @@ -19320,9 +19322,9 @@ Func_9629: ; 0x9629 add hl, bc ld d, [hl] ld a, c - cp $2 + cp CH2 jr z, .channel3 ; if music channel 3 - cp $6 + cp CH6 jr z, .channel3 ; if sfx channel 3 ld a, d and $3f @@ -19337,27 +19339,26 @@ Func_9629: ; 0x9629 call Func_9838 ld [hl], d ret -; 0x964b Func_964b: ; 0x964b ld a, c - cp $2 - jr z, .musicChannel3 - cp $6 + cp CH2 + jr z, .channel3 + cp CH6 jr nz, .notsfxChannel3 ; fall through -.musicChannel3 +.channel3 push de ld de, $c0e6 - cp $2 - jr z, .musicChannel3again + cp CH2 + jr z, .musicChannel3 ld de, $c0e7 -.musicChannel3again +.musicChannel3 ld a, [de] add a ld d, $0 ld e, a - ld hl, $4361 + ld hl, Unknown_8361 add hl, de ld e, [hl] inc hl @@ -19389,7 +19390,6 @@ Func_964b: ; 0x964b ld [hl], d call Func_96b5 ret -; 0x9693 Func_9693: ; 0x9693 call Func_96e5 @@ -19411,7 +19411,6 @@ Func_9693: ; 0x9693 ld [$c0ea], a .asm_96b4 ret -; 0x96b5 Func_96b5: ; 0x96b5 call Func_96e5 @@ -19428,7 +19427,6 @@ Func_96b5: ; 0x96b5 ld [hl], d .asm_96c6 ret -; 0x96c7 Func_96c7: ; 0x96c7 call Func_96e5 @@ -19452,7 +19450,6 @@ Func_96c7: ; 0x96c7 scf ccf ret -; 0x96e5 Func_96e5: ; 0x96e5 ld a, [$c02a] @@ -19470,7 +19467,6 @@ Func_96e5: ; 0x96e5 .asm_96f7 scf ret -; 0x96f9 Func_96f9: ; 0x96f9 ld hl, $c02e @@ -19573,7 +19569,6 @@ Func_96f9: ; 0x96f9 res 4, [hl] res 5, [hl] ret -; 0x978f Func_978f: ; 0x978f ld hl, $c096 @@ -19663,7 +19658,6 @@ Func_978f: ; 0x978f add hl, bc ld [hl], a ret -; 0x980d Func_980d: ; 0x980d ld b, $0 @@ -19682,7 +19676,6 @@ Func_980d: ; 0x980d or d ld [hl], a ret -; 0x9825 GetNextMusicByte: ; 0x9825 ld d, $0 @@ -19701,7 +19694,6 @@ GetNextMusicByte: ; 0x9825 inc hl ld [hl], d ret -; 0x9838 Func_9838: ; 0x9838 ld a, c @@ -19716,7 +19708,6 @@ Func_9838: ; 0x9838 ld l, a ld h, $ff ret -; 0x9847 Func_9847: ; 0x9847 ld h, $0 @@ -19732,7 +19723,6 @@ Func_9847: ; 0x9847 jr .asm_9849 ; 0x9855 $f2 .asm_9857 ret -; 0x9858 Func_9858: ; 0x9858 ld h, $0 @@ -19758,7 +19748,6 @@ Func_9858: ; 0x9858 add d ld d, a ret -; 0x9876 Func_9876: ; 0x9876 ld [$c001], a @@ -19842,7 +19831,6 @@ Func_9876: ; 0x9876 ld a, $77 ld [$ff00+$24], a jp Func_9a8f -; 0x994e Func_994e: ; 0x994e ld l, a @@ -19994,7 +19982,6 @@ Func_994e: ; 0x994e jp z, Func_9a8f dec c jp .asm_9967 -; 0x9a34 Func_9a34: ; 0x9a34 ld a, $80 @@ -20034,7 +20021,6 @@ Func_9a34: ; 0x9a34 ld a, $ff ld [$c004], a ret -; 0x9a89 ; fills d bytes at hl with a FillMusicRAM: ; 0x9a89 @@ -20044,7 +20030,6 @@ FillMusicRAM: ; 0x9a89 dec b jr nz, .asm_9a8a ; 0x9a8c $fc ret -; 0x9a8f Func_9a8f: ; 0x9a8f ld a, [$c001] @@ -20140,49 +20125,49 @@ Func_9a8f: ; 0x9a8f ld [$ff00+$24], a .asm_9b15 ret -; 0x9b16 INCBIN "baserom.gbc",$9b16,$9b2f - $9b16 Unknown_9b2f: ; 0x9b2f INCBIN "baserom.gbc",$9b2f,$9b47 - $9b2f -Func_9b47: ; 0x9b47 - ld c, $2 - ld a, $de +; an alternate start for MeetRival which has a different first measure +Music_RivalAlternateStart: ; 0x9b47 + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ld hl, $c006 ld de, Music_MeetRival_branch_b1a2 - call Func_9b60 + call OverwriteChannelPointer ld de, Music_MeetRival_branch_b21d - call Func_9b60 + call OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -Func_9b60: ; 0x9b60 +OverwriteChannelPointer: ; 0x9b60 ld a, e ld [hli], a ld a, d ld [hli], a ret -; 0x9b65 -Func_9b65: ; 0x9b65 - ld c, $2 - ld a, $de +; an alternate tempo for MeetRival which has a slightly slower tempo +Music_RivalAlternateTempo: ; 0x9b65 + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ld hl, $c006 ld de, Music_MeetRival_branch_b119 - jp Func_9b60 -; 0x9b75 + jp OverwriteChannelPointer -Func_9b75: ; 0x9b75 - call Func_9b47 +; applies both the alternate start and alternate tempo +Music_RivalAlternateStartAndTempo: ; 0x9b75 + call Music_RivalAlternateStart ld hl, $c006 ld de, Music_MeetRival_branch_b19b - jp Func_9b60 -; 0x9b81 + jp OverwriteChannelPointer -Func_9b81: ; 0x9b81 +; an alternate tempo for Cities1 which is used for the Hall of Fame room +Music_Cities1AlternateTempo: ; 0x9b81 ld a, $a ld [$cfc8], a ld [$cfc9], a @@ -20190,13 +20175,12 @@ Func_9b81: ; 0x9b81 ld [$cfc7], a ld c, $64 call DelayFrames - ld c, $2 - ld a, $c3 + ld c, BANK(Music_Cities1) + ld a, (Music_Cities1 - $4000) / 3 call PlayMusic ld hl, $c006 ld de, Music_Cities1_branch_aa6f - jp Func_9b60 -; 0x9ba3 + jp OverwriteChannelPointer INCLUDE "music/pkmnhealed.tx" INCLUDE "music/routes1.tx" @@ -36555,8 +36539,8 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, $1 ld [$ff00+$8c], a @@ -39804,8 +39788,8 @@ OaksLabScript13: ; 1ce32 (7:4e32) ld a, $10 ld [$ff00+$8c], a call DisplayTextID - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, $1 ld [$ff00+$8c], a @@ -39874,8 +39858,8 @@ OaksLabScript15: ; 1ceb0 (7:4eb0) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, $15 ld [$ff00+$8c], a @@ -39986,8 +39970,8 @@ OaksLabScript16: ; 1cf12 (7:4f12) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, $1 ld [$ff00+$8c], a @@ -81251,8 +81235,8 @@ Route22Script2: ; 50fb5 (14:4fb5) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, [$cf0d] cp $1 @@ -81322,9 +81306,9 @@ Func_5104e: ; 5104e (14:504e) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b65) - ld hl, Func_9b65 - call Bankswitch ; indirect jump to Func_9b65 (9b65 (2:5b65)) + ld b, BANK(Music_RivalAlternateTempo) + ld hl, Music_RivalAlternateTempo + call Bankswitch ; indirect jump to Music_RivalAlternateTempo (9b65 (2:5b65)) ld a, $2 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c call Func_50ee6 @@ -81400,9 +81384,9 @@ INCBIN "baserom.gbc",$510d9,$510df - $510d9 ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b75) - ld hl, Func_9b75 - call Bankswitch ; indirect jump to Func_9b75 (9b75 (2:5b75)) + ld b, BANK(Music_RivalAlternateStartAndTempo) + ld hl, Music_RivalAlternateStartAndTempo + call Bankswitch ; indirect jump to Music_RivalAlternateStartAndTempo (9b75 (2:5b75)) ld a, [$cf0d] cp $1 jr nz, .asm_51134 @@ -82995,9 +82979,9 @@ INCBIN "baserom.gbc",$51c7d,$51c82 - $51c7d ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 - call Bankswitch ; indirect jump to Func_9b47 (9b47 (2:5b47)) + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart + call Bankswitch ; indirect jump to Music_RivalAlternateStart (9b47 (2:5b47)) ld de, Unknown_51d1d ; $5d1d ld a, [$cf0d] cp $1 @@ -83909,9 +83893,9 @@ Func_525af: ; 525af (14:65af) ld a, $2 ld [W_BATTLETYPE], a ; $d05a .asm_525f9 - ld hl, Func_90c6 - ld b, BANK(Func_90c6) - jp Bankswitch ; indirect jump to Func_90c6 (90c6 (2:50c6)) + ld hl, PlayBattleMusic + ld b, BANK(PlayBattleMusic) + jp Bankswitch ; indirect jump to PlayBattleMusic (90c6 (2:50c6)) ; known jump sources: 3f9b6 (f:79b6) Func_52601: ; 52601 (14:6601) @@ -97176,8 +97160,8 @@ PokemonTower2Script1: ; 60563 (18:4563) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, $2 ld [W_POKEMONTOWER2CURSCRIPT], a @@ -98927,8 +98911,8 @@ SSAnne2Script2: ; 6146d (18:546d) ld a, $ff ld [$c0ee], a call PlaySound - ld b, BANK(Func_9b47) - ld hl, Func_9b47 + ld b, BANK(Music_RivalAlternateStart) + ld hl, Music_RivalAlternateStart call Bankswitch ld a, $3 ld [W_SSANNE2CURSCRIPT], a @@ -109946,8 +109930,8 @@ GaryScript3: ; 75fbb (1d:5fbb) ret GaryScript4: ; 75fe4 (1d:5fe4) - ld b, BANK(Func_9b81) - ld hl, Func_9b81 + ld b, BANK(Music_Cities1AlternateTempo) + ld hl, Music_Cities1AlternateTempo call Bankswitch ld a, $2 ld [$ff00+$8c], a -- cgit v1.2.3 From d47cdd6e159066fa71a0ca2a0571b10547834159 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Mon, 21 Oct 2013 19:30:07 -0400 Subject: More bank 2 music engine and music/sfx format update --- constants.asm | 68 ++++------- main.asm | 286 ++++++++++++++++++++++++-------------------- music/bikeriding.asm | 4 +- music/celadon.asm | 2 +- music/cinnabar.asm | 2 +- music/cinnabarmansion.asm | 2 +- music/cities1.asm | 2 +- music/cities2.asm | 2 +- music/credits.asm | 2 +- music/defeatedgymleader.asm | 2 +- music/defeatedtrainer.asm | 2 +- music/defeatedwildmon.asm | 8 +- music/dungeon1.asm | 2 +- music/dungeon2.asm | 2 +- music/dungeon3.asm | 2 +- music/finalbattle.asm | 2 +- music/gamecorner.asm | 2 +- music/gym.asm | 2 +- music/gymleaderbattle.asm | 2 +- music/halloffame.asm | 2 +- music/indigoplateau.asm | 2 +- music/introbattle.asm | 2 +- music/jigglypuffsong.asm | 2 +- music/lavender.asm | 2 +- music/meeteviltrainer.asm | 2 +- music/meetfemaletrainer.asm | 2 +- music/meetmaletrainer.asm | 2 +- music/meetprofoak.asm | 2 +- music/meetrival.asm | 4 +- music/museumguy.asm | 2 +- music/oakslab.asm | 2 +- music/pkmnhealed.asm | 2 +- music/pokecenter.asm | 2 +- music/pokemontower.asm | 2 +- music/routes1.asm | 2 +- music/routes3.asm | 2 +- music/routes4.asm | 2 +- music/safarizone.asm | 2 +- music/sfx/sfx_02_01.asm | 4 +- music/sfx/sfx_02_02.asm | 4 +- music/sfx/sfx_02_03.asm | 4 +- music/sfx/sfx_02_04.asm | 4 +- music/sfx/sfx_02_05.asm | 24 +--- music/sfx/sfx_02_06.asm | 4 +- music/sfx/sfx_02_07.asm | 8 +- music/sfx/sfx_02_08.asm | 4 +- music/sfx/sfx_02_09.asm | 4 +- music/sfx/sfx_02_0a.asm | 4 +- music/sfx/sfx_02_0b.asm | 4 +- music/sfx/sfx_02_0c.asm | 4 +- music/sfx/sfx_02_0d.asm | 4 +- music/sfx/sfx_02_0e.asm | 4 +- music/sfx/sfx_02_0f.asm | 8 +- music/sfx/sfx_02_10.asm | 8 +- music/sfx/sfx_02_11.asm | 4 +- music/sfx/sfx_02_12.asm | 4 +- music/sfx/sfx_02_13.asm | 4 +- music/sfx/sfx_02_14.asm | 42 ++----- music/sfx/sfx_02_15.asm | 54 ++------- music/sfx/sfx_02_16.asm | 29 +---- music/sfx/sfx_02_17.asm | 83 +++---------- music/sfx/sfx_02_18.asm | 88 ++++---------- music/sfx/sfx_02_19.asm | 38 ++---- music/sfx/sfx_02_1a.asm | 52 ++------ music/sfx/sfx_02_1b.asm | 41 ++----- music/sfx/sfx_02_1c.asm | 49 ++------ music/sfx/sfx_02_1d.asm | 89 ++++---------- music/sfx/sfx_02_1e.asm | 104 ++++------------ music/sfx/sfx_02_1f.asm | 110 ++++------------- music/sfx/sfx_02_20.asm | 86 +++---------- music/sfx/sfx_02_21.asm | 119 +++++------------- music/sfx/sfx_02_22.asm | 52 ++------ music/sfx/sfx_02_23.asm | 79 +++--------- music/sfx/sfx_02_24.asm | 89 +++----------- music/sfx/sfx_02_25.asm | 96 ++++----------- music/sfx/sfx_02_26.asm | 51 ++------ music/sfx/sfx_02_27.asm | 79 +++--------- music/sfx/sfx_02_28.asm | 40 ++----- music/sfx/sfx_02_29.asm | 81 +++---------- music/sfx/sfx_02_2a.asm | 40 ++----- music/sfx/sfx_02_2b.asm | 55 ++------- music/sfx/sfx_02_2c.asm | 99 ++++----------- music/sfx/sfx_02_2d.asm | 33 ++--- music/sfx/sfx_02_2e.asm | 79 +++--------- music/sfx/sfx_02_2f.asm | 62 +++------- music/sfx/sfx_02_30.asm | 86 +++---------- music/sfx/sfx_02_31.asm | 76 +++--------- music/sfx/sfx_02_32.asm | 118 ++++-------------- music/sfx/sfx_02_33.asm | 53 ++------ music/sfx/sfx_02_34.asm | 52 ++------ music/sfx/sfx_02_35.asm | 75 +++--------- music/sfx/sfx_02_36.asm | 55 ++------- music/sfx/sfx_02_37.asm | 59 ++------- music/sfx/sfx_02_38.asm | 96 ++++----------- music/sfx/sfx_02_39.asm | 64 +++------- music/sfx/sfx_02_3a.asm | 8 +- music/sfx/sfx_02_3b.asm | 8 +- music/sfx/sfx_02_3c.asm | 19 +-- music/sfx/sfx_02_3d.asm | 15 +-- music/sfx/sfx_02_3e.asm | 24 +--- music/sfx/sfx_02_3f.asm | 8 +- music/sfx/sfx_02_40.asm | 18 +-- music/sfx/sfx_02_41.asm | 6 +- music/sfx/sfx_02_42.asm | 8 +- music/sfx/sfx_02_43.asm | 16 +-- music/sfx/sfx_02_44.asm | 15 +-- music/sfx/sfx_02_45.asm | 50 ++------ music/sfx/sfx_02_46.asm | 17 +-- music/sfx/sfx_02_47.asm | 18 +-- music/sfx/sfx_02_48.asm | 30 ++--- music/sfx/sfx_02_49.asm | 25 +--- music/sfx/sfx_02_4a.asm | 24 +--- music/sfx/sfx_02_4b.asm | 30 ++--- music/sfx/sfx_02_4c.asm | 30 ++--- music/sfx/sfx_02_4d.asm | 10 +- music/sfx/sfx_02_4e.asm | 11 +- music/sfx/sfx_02_4f.asm | 16 +-- music/sfx/sfx_02_50.asm | 63 +++------- music/sfx/sfx_02_51.asm | 42 ++----- music/sfx/sfx_02_52.asm | 10 +- music/sfx/sfx_02_53.asm | 32 ++--- music/sfx/sfx_02_54.asm | 60 +++------- music/sfx/sfx_02_55.asm | 35 ++---- music/sfx/sfx_02_56.asm | 20 +--- music/sfx/sfx_02_57.asm | 7 +- music/sfx/sfx_02_58.asm | 15 +-- music/sfx/sfx_02_59.asm | 15 +-- music/sfx/sfx_02_5a.asm | 25 +--- music/sfx/sfx_02_5b.asm | 11 +- music/sfx/sfx_02_5c.asm | 20 +--- music/sfx/sfx_02_5d.asm | 73 +++-------- music/sfx/sfx_02_5e.asm | 9 +- music/sfx/sfx_02_5f.asm | 30 +---- music/sfx/sfx_08_01.asm | 4 +- music/sfx/sfx_08_02.asm | 4 +- music/sfx/sfx_08_03.asm | 4 +- music/sfx/sfx_08_04.asm | 4 +- music/sfx/sfx_08_05.asm | 24 +--- music/sfx/sfx_08_06.asm | 4 +- music/sfx/sfx_08_07.asm | 8 +- music/sfx/sfx_08_08.asm | 4 +- music/sfx/sfx_08_09.asm | 4 +- music/sfx/sfx_08_0a.asm | 4 +- music/sfx/sfx_08_0b.asm | 4 +- music/sfx/sfx_08_0c.asm | 4 +- music/sfx/sfx_08_0d.asm | 4 +- music/sfx/sfx_08_0e.asm | 4 +- music/sfx/sfx_08_0f.asm | 8 +- music/sfx/sfx_08_10.asm | 8 +- music/sfx/sfx_08_11.asm | 4 +- music/sfx/sfx_08_12.asm | 4 +- music/sfx/sfx_08_13.asm | 4 +- music/sfx/sfx_08_14.asm | 42 ++----- music/sfx/sfx_08_15.asm | 54 ++------- music/sfx/sfx_08_16.asm | 29 +---- music/sfx/sfx_08_17.asm | 83 +++---------- music/sfx/sfx_08_18.asm | 88 ++++---------- music/sfx/sfx_08_19.asm | 38 ++---- music/sfx/sfx_08_1a.asm | 52 ++------ music/sfx/sfx_08_1b.asm | 41 ++----- music/sfx/sfx_08_1c.asm | 49 ++------ music/sfx/sfx_08_1d.asm | 89 ++++---------- music/sfx/sfx_08_1e.asm | 104 ++++------------ music/sfx/sfx_08_1f.asm | 110 ++++------------- music/sfx/sfx_08_20.asm | 86 +++---------- music/sfx/sfx_08_21.asm | 119 +++++------------- music/sfx/sfx_08_22.asm | 52 ++------ music/sfx/sfx_08_23.asm | 79 +++--------- music/sfx/sfx_08_24.asm | 89 +++----------- music/sfx/sfx_08_25.asm | 96 ++++----------- music/sfx/sfx_08_26.asm | 51 ++------ music/sfx/sfx_08_27.asm | 79 +++--------- music/sfx/sfx_08_28.asm | 40 ++----- music/sfx/sfx_08_29.asm | 81 +++---------- music/sfx/sfx_08_2a.asm | 40 ++----- music/sfx/sfx_08_2b.asm | 55 ++------- music/sfx/sfx_08_2c.asm | 99 ++++----------- music/sfx/sfx_08_2d.asm | 33 ++--- music/sfx/sfx_08_2e.asm | 79 +++--------- music/sfx/sfx_08_2f.asm | 62 +++------- music/sfx/sfx_08_30.asm | 86 +++---------- music/sfx/sfx_08_31.asm | 76 +++--------- music/sfx/sfx_08_32.asm | 118 ++++-------------- music/sfx/sfx_08_33.asm | 53 ++------ music/sfx/sfx_08_34.asm | 52 ++------ music/sfx/sfx_08_35.asm | 75 +++--------- music/sfx/sfx_08_36.asm | 55 ++------- music/sfx/sfx_08_37.asm | 59 ++------- music/sfx/sfx_08_38.asm | 96 ++++----------- music/sfx/sfx_08_39.asm | 64 +++------- music/sfx/sfx_08_3a.asm | 8 +- music/sfx/sfx_08_3b.asm | 8 +- music/sfx/sfx_08_3c.asm | 19 +-- music/sfx/sfx_08_3d.asm | 15 +-- music/sfx/sfx_08_3e.asm | 24 +--- music/sfx/sfx_08_3f.asm | 8 +- music/sfx/sfx_08_40.asm | 18 +-- music/sfx/sfx_08_41.asm | 13 +- music/sfx/sfx_08_42.asm | 15 +-- music/sfx/sfx_08_43.asm | 19 +-- music/sfx/sfx_08_44.asm | 44 ++----- music/sfx/sfx_08_45.asm | 28 ++--- music/sfx/sfx_08_46.asm | 8 +- music/sfx/sfx_08_47.asm | 4 +- music/sfx/sfx_08_48.asm | 11 +- music/sfx/sfx_08_49.asm | 11 +- music/sfx/sfx_08_4a.asm | 4 +- music/sfx/sfx_08_4b.asm | 4 +- music/sfx/sfx_08_4c.asm | 9 +- music/sfx/sfx_08_4d.asm | 12 +- music/sfx/sfx_08_4e.asm | 8 +- music/sfx/sfx_08_4f.asm | 16 +-- music/sfx/sfx_08_50.asm | 12 +- music/sfx/sfx_08_51.asm | 16 +-- music/sfx/sfx_08_52.asm | 12 +- music/sfx/sfx_08_53.asm | 16 +-- music/sfx/sfx_08_54.asm | 7 +- music/sfx/sfx_08_55.asm | 32 ++--- music/sfx/sfx_08_56.asm | 12 +- music/sfx/sfx_08_57.asm | 16 +-- music/sfx/sfx_08_58.asm | 5 +- music/sfx/sfx_08_59.asm | 12 +- music/sfx/sfx_08_5a.asm | 8 +- music/sfx/sfx_08_5b.asm | 8 +- music/sfx/sfx_08_5c.asm | 12 +- music/sfx/sfx_08_5d.asm | 8 +- music/sfx/sfx_08_5e.asm | 33 ++--- music/sfx/sfx_08_5f.asm | 16 +-- music/sfx/sfx_08_60.asm | 8 +- music/sfx/sfx_08_61.asm | 20 +--- music/sfx/sfx_08_62.asm | 7 +- music/sfx/sfx_08_63.asm | 20 +--- music/sfx/sfx_08_64.asm | 19 +-- music/sfx/sfx_08_65.asm | 20 +--- music/sfx/sfx_08_66.asm | 10 +- music/sfx/sfx_08_67.asm | 36 ++---- music/sfx/sfx_08_68.asm | 26 +--- music/sfx/sfx_08_69.asm | 39 ++---- music/sfx/sfx_08_6a.asm | 59 ++------- music/sfx/sfx_08_6b.asm | 53 ++------ music/sfx/sfx_08_6c.asm | 46 ++----- music/sfx/sfx_08_6d.asm | 46 ++----- music/sfx/sfx_08_6e.asm | 51 ++------ music/sfx/sfx_08_6f.asm | 25 ++-- music/sfx/sfx_08_70.asm | 90 ++++---------- music/sfx/sfx_08_71.asm | 33 ++--- music/sfx/sfx_08_72.asm | 16 +-- music/sfx/sfx_08_73.asm | 50 ++------ music/sfx/sfx_08_74.asm | 37 ++---- music/sfx/sfx_08_75.asm | 4 +- music/sfx/sfx_08_76.asm | 144 +++++----------------- music/sfx/sfx_08_77.asm | 26 +--- music/sfx/sfx_1f_01.asm | 4 +- music/sfx/sfx_1f_02.asm | 4 +- music/sfx/sfx_1f_03.asm | 4 +- music/sfx/sfx_1f_04.asm | 4 +- music/sfx/sfx_1f_05.asm | 24 +--- music/sfx/sfx_1f_06.asm | 4 +- music/sfx/sfx_1f_07.asm | 8 +- music/sfx/sfx_1f_08.asm | 4 +- music/sfx/sfx_1f_09.asm | 4 +- music/sfx/sfx_1f_0a.asm | 4 +- music/sfx/sfx_1f_0b.asm | 4 +- music/sfx/sfx_1f_0c.asm | 4 +- music/sfx/sfx_1f_0d.asm | 4 +- music/sfx/sfx_1f_0e.asm | 4 +- music/sfx/sfx_1f_0f.asm | 8 +- music/sfx/sfx_1f_10.asm | 8 +- music/sfx/sfx_1f_11.asm | 4 +- music/sfx/sfx_1f_12.asm | 4 +- music/sfx/sfx_1f_13.asm | 4 +- music/sfx/sfx_1f_14.asm | 42 ++----- music/sfx/sfx_1f_15.asm | 54 ++------- music/sfx/sfx_1f_16.asm | 29 +---- music/sfx/sfx_1f_17.asm | 83 +++---------- music/sfx/sfx_1f_18.asm | 88 ++++---------- music/sfx/sfx_1f_19.asm | 38 ++---- music/sfx/sfx_1f_1a.asm | 52 ++------ music/sfx/sfx_1f_1b.asm | 41 ++----- music/sfx/sfx_1f_1c.asm | 49 ++------ music/sfx/sfx_1f_1d.asm | 89 ++++---------- music/sfx/sfx_1f_1e.asm | 104 ++++------------ music/sfx/sfx_1f_1f.asm | 110 ++++------------- music/sfx/sfx_1f_20.asm | 86 +++---------- music/sfx/sfx_1f_21.asm | 119 +++++------------- music/sfx/sfx_1f_22.asm | 52 ++------ music/sfx/sfx_1f_23.asm | 79 +++--------- music/sfx/sfx_1f_24.asm | 89 +++----------- music/sfx/sfx_1f_25.asm | 96 ++++----------- music/sfx/sfx_1f_26.asm | 51 ++------ music/sfx/sfx_1f_27.asm | 79 +++--------- music/sfx/sfx_1f_28.asm | 40 ++----- music/sfx/sfx_1f_29.asm | 81 +++---------- music/sfx/sfx_1f_2a.asm | 40 ++----- music/sfx/sfx_1f_2b.asm | 55 ++------- music/sfx/sfx_1f_2c.asm | 99 ++++----------- music/sfx/sfx_1f_2d.asm | 33 ++--- music/sfx/sfx_1f_2e.asm | 79 +++--------- music/sfx/sfx_1f_2f.asm | 62 +++------- music/sfx/sfx_1f_30.asm | 86 +++---------- music/sfx/sfx_1f_31.asm | 76 +++--------- music/sfx/sfx_1f_32.asm | 118 ++++-------------- music/sfx/sfx_1f_33.asm | 53 ++------ music/sfx/sfx_1f_34.asm | 52 ++------ music/sfx/sfx_1f_35.asm | 75 +++--------- music/sfx/sfx_1f_36.asm | 55 ++------- music/sfx/sfx_1f_37.asm | 59 ++------- music/sfx/sfx_1f_38.asm | 96 ++++----------- music/sfx/sfx_1f_39.asm | 64 +++------- music/sfx/sfx_1f_3a.asm | 8 +- music/sfx/sfx_1f_3b.asm | 8 +- music/sfx/sfx_1f_3c.asm | 19 +-- music/sfx/sfx_1f_3d.asm | 15 +-- music/sfx/sfx_1f_3e.asm | 24 +--- music/sfx/sfx_1f_3f.asm | 8 +- music/sfx/sfx_1f_40.asm | 18 +-- music/sfx/sfx_1f_41.asm | 6 +- music/sfx/sfx_1f_42.asm | 8 +- music/sfx/sfx_1f_43.asm | 16 +-- music/sfx/sfx_1f_44.asm | 15 +-- music/sfx/sfx_1f_45.asm | 55 ++------- music/sfx/sfx_1f_46.asm | 17 +-- music/sfx/sfx_1f_47.asm | 18 +-- music/sfx/sfx_1f_48.asm | 30 ++--- music/sfx/sfx_1f_49.asm | 25 +--- music/sfx/sfx_1f_4a.asm | 24 +--- music/sfx/sfx_1f_4b.asm | 30 ++--- music/sfx/sfx_1f_4c.asm | 30 ++--- music/sfx/sfx_1f_4d.asm | 10 +- music/sfx/sfx_1f_4e.asm | 11 +- music/sfx/sfx_1f_4f.asm | 16 +-- music/sfx/sfx_1f_50.asm | 63 +++------- music/sfx/sfx_1f_51.asm | 42 ++----- music/sfx/sfx_1f_52.asm | 10 +- music/sfx/sfx_1f_53.asm | 32 ++--- music/sfx/sfx_1f_54.asm | 60 +++------- music/sfx/sfx_1f_55.asm | 35 ++---- music/sfx/sfx_1f_56.asm | 20 +--- music/sfx/sfx_1f_57.asm | 7 +- music/sfx/sfx_1f_58.asm | 15 +-- music/sfx/sfx_1f_59.asm | 15 +-- music/sfx/sfx_1f_5a.asm | 25 +--- music/sfx/sfx_1f_5b.asm | 11 +- music/sfx/sfx_1f_5c.asm | 20 +--- music/sfx/sfx_1f_5d.asm | 54 ++------- music/sfx/sfx_1f_5e.asm | 31 ++--- music/sfx/sfx_1f_5f.asm | 11 +- music/sfx/sfx_1f_60.asm | 11 +- music/sfx/sfx_1f_61.asm | 12 +- music/sfx/sfx_1f_62.asm | 7 +- music/sfx/sfx_1f_63.asm | 19 +-- music/sfx/sfx_1f_64.asm | 15 +-- music/sfx/sfx_1f_65.asm | 10 +- music/sfx/sfx_1f_66.asm | 29 +---- music/sfx/sfx_1f_67.asm | 51 ++------ music/silphco.asm | 2 +- music/ssanne.asm | 2 +- music/surfing.asm | 2 +- music/trainerbattle.asm | 2 +- music/unusedsong.asm | 2 +- music/vermilion.asm | 2 +- music/wildbattle.asm | 2 +- 362 files changed, 2899 insertions(+), 9139 deletions(-) diff --git a/constants.asm b/constants.asm index 352e14ec..84950cd6 100644 --- a/constants.asm +++ b/constants.asm @@ -273,6 +273,8 @@ W_LISTMENUID EQU $CF94 ; ID used by DisplayListMenuID W_WALKCOUNTER EQU $CFC5 ; walk animation counter +W_CURCHANNELPOINTER EQU $CFC7 ; (the current music channel pointer - $4000) / 3 + W_ENEMYMOVENUM EQU $CFCC W_ENEMYMOVEEFFECT EQU $CFCD W_ENEMYMOVEPOWER EQU $CFCE @@ -3416,6 +3418,24 @@ mutedsnare2 EQU $11 mutedsnare3 EQU $12 mutedsnare4 EQU $13 +unknownsfx0x10: MACRO + db $10 + db \1 +ENDM + +unknownsfx0x20: MACRO + db $20 | \1 + db \2 + db \3 + db \4 +ENDM + +unknownnoise0x20: MACRO + db $20 | \1 + db \2 + db \3 +ENDM + ;format: note pitch, length (in 16ths) note: MACRO db (\1 << 4) | (\2 - 1) @@ -3446,14 +3466,10 @@ octave: MACRO db $E8 - \1 ENDM -unknownmusic0xe8: MACRO +togglecall: MACRO db $E8 ENDM -unknownmusic0xe9: MACRO - db $E9 -ENDM - ;format: vibrato delay, rate, depth vibrato: MACRO db $EA @@ -3492,50 +3508,10 @@ stereopanning: MACRO db \1 ENDM -unknownmusic0xf1: MACRO - db $F1 -ENDM - -unknownmusic0xf2: MACRO - db $F2 -ENDM - -unknownmusic0xf3: MACRO - db $F3 -ENDM - -unknownmusic0xf4: MACRO - db $F4 -ENDM - -unknownmusic0xf5: MACRO - db $F5 -ENDM - -unknownmusic0xf6: MACRO - db $F6 -ENDM - -unknownmusic0xf7: MACRO - db $F7 -ENDM - -unknownmusic0xf8: MACRO +executemusic: MACRO db $F8 ENDM -unknownmusic0xf9: MACRO - db $F9 -ENDM - -unknownmusic0xfa: MACRO - db $FA -ENDM - -unknownmusic0xfb: MACRO - db $FB -ENDM - dutycycle: MACRO db $FC db \1 diff --git a/main.asm b/main.asm index 5d5c5d86..8b42c9cb 100644 --- a/main.asm +++ b/main.asm @@ -1215,12 +1215,12 @@ HandleBlackOut: ; 0931 (0:0931) jp Func_5d5f StopMusic: ; 0951 (0:0951) - ld [$cfc7],a + ld [W_CURCHANNELPOINTER],a ld a,$ff ld [$c0ee],a call PlaySound .waitLoop - ld a,[$cfc7] + ld a,[W_CURCHANNELPOINTER] and a jr nz,.waitLoop jp StopAllSounds @@ -5287,7 +5287,7 @@ StopAllSounds: ; 200e (0:200e) ld [$c0ef], a ld [$c0f0], a xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld [$c0ee], a ld [$cfca], a dec a @@ -5856,7 +5856,7 @@ asm_2324: ; 2324 (0:2324) ret z .asm_2351 ld a, c - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, b ld [$cfca], a ld [$c0ee], a @@ -5916,7 +5916,7 @@ PlayMusic: ; 23a1 (0:23a1) ld b, a ld [$c0ee], a xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, c ld [$c0ef], a ld [$c0f0], a @@ -5937,7 +5937,7 @@ PlaySound: ; 23b1 (0:23b1) ld [$c02c], a ld [$c02d], a .asm_23c8 - ld a, [$cfc7] + ld a, [W_CURCHANNELPOINTER] and a jr z, .asm_23e3 ld a, [$c0ee] @@ -5949,7 +5949,7 @@ PlaySound: ; 23b1 (0:23b1) cp $ff jr nz, .asm_2414 xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a .asm_23e3 xor a ld [$c0ee], a @@ -5982,11 +5982,11 @@ PlaySound: ; 23b1 (0:23b1) .asm_2414 ld a, b ld [$cfca], a - ld a, [$cfc7] + ld a, [W_CURCHANNELPOINTER] ld [$cfc8], a ld [$cfc9], a ld a, b - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a .asm_2425 pop bc pop de @@ -6737,7 +6737,7 @@ ResetPlayerSpriteData_ClearSpriteData: ; 28c4 (0:28c4) ; known jump sources: 2071 (0:2071) Func_28cb: ; 28cb (0:28cb) - ld a, [$cfc7] + ld a, [W_CURCHANNELPOINTER] and a jr nz, .asm_28dc ld a, [$d72c] @@ -6772,10 +6772,10 @@ Func_28cb: ; 28cb (0:28cb) ld [$FF00+$24], a ret .asm_2903 - ld a, [$cfc7] + ld a, [W_CURCHANNELPOINTER] ld b, a xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, $ff ld [$c0ee], a call PlaySound @@ -8479,14 +8479,14 @@ PlayTrainerMusic: ; 33e8 (0:33e8) ret z cp $c8 + SONY3 ret z - ld a, [W_LONEATTACKNO] ; $d05c + ld a, [W_GYMLEADERNO] ; $d05c and a ret nz xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, $ff call PlaySound ; stop music - ld a, $1f + ld a, BANK(Music_MeetEvilTrainer) ld [$c0ef], a ld [$c0f0], a ld a, [W_ENGAGEDTRAINERCLASS] @@ -8498,7 +8498,7 @@ PlayTrainerMusic: ; 33e8 (0:33e8) jr z, .noEvilTrainer cp b jr nz, .evilTrainerListLoop - ld a, $f6 + ld a, (Music_MeetEvilTrainer - $4000) / 3 jr .PlaySound .noEvilTrainer ld hl, FemaleTrainerList @@ -8508,10 +8508,10 @@ PlayTrainerMusic: ; 33e8 (0:33e8) jr z, .maleTrainer cp b jr nz, .femaleTrainerListLoop - ld a, $f9 + ld a, (Music_MeetFemaleTrainer - $4000) / 3 jr .PlaySound .maleTrainer - ld a, $fc + ld a, (Music_MeetMaleTrainer - $4000) / 3 .PlaySound ld [$c0ee], a jp PlaySound @@ -13845,7 +13845,7 @@ Func_5849: ld a, [hl] ld [$cd3e], a ld a, $a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, $2 ld [$c0f0], a ld a, $e5 @@ -13944,7 +13944,7 @@ Func_5a5f: ; 5a5f (1:5a5f) ld [W_ISLINKBATTLE], a ; $d12b ld [$FF00+$b5], a ld a, $a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, $2 ld [$c0f0], a ld a, $ca @@ -14855,7 +14855,7 @@ Function61BC: ; 61bc (1:61bc) ld [$C0EF],a ld [$C0F0],a ld a,$A - ld [$CFC7],a + ld [W_CURCHANNELPOINTER],a ld a,$FF ld [$C0EE],a call PlaySound ; stop music @@ -16640,7 +16640,7 @@ DisplayPokemonCenterDialogue_: ; 6fe6 (1:6fe6) ld hl, Func_70433 call Bankswitch ; do the healing machine animation xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, [$c0f0] ld [$c0ef], a ld a, [$d35b] @@ -18369,8 +18369,31 @@ INCLUDE "music/sfx/sfx_02_11.tx" INCLUDE "music/sfx/sfx_02_12.tx" INCLUDE "music/sfx/sfx_02_13.tx" -Unknown_8361: -INCBIN "baserom.gbc",$8361,$83c3 - $8361 +Unknown_8361: ; 0x8361 + dw Unknown_8373 + dw Unknown_8383 + dw Unknown_8393 + dw Unknown_83a3 + dw Unknown_83b3 + dw SFX_02_3f_Ch1 + dw SFX_02_3f_Ch1 + dw SFX_02_3f_Ch1 + dw SFX_02_3f_Ch1 + +Unknown_8373: ; 0x8373 + db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 + +Unknown_8383: ; 0x8383 + db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 + +Unknown_8393: ; 0x8393 + db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 + +Unknown_83a3: ; 0x83a3 + db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 + +Unknown_83b3: ; 0x83b3 + db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 INCLUDE "music/sfx/sfx_02_3f.tx" INCLUDE "music/sfx/sfx_02_5e.tx" @@ -18450,7 +18473,7 @@ INCLUDE "music/sfx/sfx_02_36.tx" PlayBattleMusic: ; 0x90c6 xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld [$d083], a dec a ld [$c0ee], a @@ -18509,7 +18532,7 @@ Func_9103: ; 0x9103 ld [$ff00+$1a], a jr .nextChannel .asm_912e - call Func_9138 + call ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number @@ -18519,8 +18542,12 @@ Func_9103: ; 0x9103 ; this routine checks flags for music effects currently applied ; to the channel and calls certain functions based on flags. -; specific flags are unknown -Func_9138: ; 0x9138 +; known flags for $c02e: +; 1: call has been used +; 3: a toggle used only by this routine for vibrato +; 4: pitchbend flag +; 6: dutycycle flag +ApplyMusicAffects: ; 0x9138 ld b, $0 ld hl, $c0b6 ; delay unitl next note add hl, bc @@ -18531,92 +18558,92 @@ Func_9138: ; 0x9138 ld [hl], a ld a, c cp CH4 - jr nc, .skip ; if a sfx channel + jr nc, .startChecks ; if a sfx channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr z, .skip + jr z, .startChecks ret -.skip +.startChecks ld hl, $c02e add hl, bc - bit 6, [hl] - jr z, .asm_915f - call Func_980d -.asm_915f + bit 6, [hl] ; dutycycle + jr z, .checkForexecutemusic + call Music_ApplyDutyCycle +.checkForexecutemusic ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_9171 + jr nz, .checkForPitchBend ld hl, $c02e add hl, bc bit 2, [hl] - jr nz, .asm_9185 -.asm_9171 + jr nz, .disablePitchBendVibrato +.checkForPitchBend ld hl, $c02e add hl, bc - bit 4, [hl] - jr z, .asm_917c - jp Func_96f9 -.asm_917c - ld hl, $c04e + bit 4, [hl] ; pitchbend + jr z, .checkVibratoDelay + jp Music_ApplyPitchBend +.checkVibratoDelay + ld hl, $c04e ; vibrato delay add hl, bc ld a, [hl] - and a - jr z, .asm_9186 - dec [hl] -.asm_9185 + and a ; check if delay is over + jr z, .checkForVibrato + dec [hl] ; otherwise, dec delay +.disablePitchBendVibrato ret -.asm_9186 - ld hl, $c056 +.checkForVibrato + ld hl, $c056 ; vibrato rate add hl, bc ld a, [hl] and a - jr nz, .asm_918f - ret -.asm_918f + jr nz, .vibrato + ret ; no vibrato +.vibrato ld d, a ld hl, $c05e add hl, bc ld a, [hl] and $f and a - jr z, .asm_919c - dec [hl] + jr z, .vibratoAlreadyDone + dec [hl] ; apply vibrato pitch change ret -.asm_919c +.vibratoAlreadyDone ld a, [hl] swap [hl] or [hl] - ld [hl], a + ld [hl], a ; reset the vibrato value and start again ld hl, $c066 add hl, bc - ld e, [hl] + ld e, [hl] ; get note pitch ld hl, $c02e add hl, bc - bit 3, [hl] - jr z, .asm_91bc + bit 3, [hl] ; this is the only code that sets/resets bit three so + jr z, .unset ; it continuously alternates which path it takes res 3, [hl] ld a, d and $f ld d, a ld a, e sub d - jr nc, .asm_91ba + jr nc, .noCarry ld a, $0 -.asm_91ba - jr .asm_91c8 -.asm_91bc +.noCarry + jr .done +.unset set 3, [hl] ld a, d and $f0 swap a add e - jr nc, .asm_91c8 + jr nc, .done ld a, $ff -.asm_91c8 +.done ld d, a ld b, $3 call Func_9838 @@ -18693,10 +18720,10 @@ Music_endchannel: ; 0x91e6 ld [hli], a inc de ld a, [de] - ld [hl], a ; store channel address from call + ld [hl], a ; loads channel address to return to jp Music_endchannel .asm_923f - ld hl, $5b1f + ld hl, Unknown_9b1f add hl, bc ld a, [$ff00+$25] and [hl] @@ -18714,7 +18741,7 @@ Music_endchannel: ; 0x91e6 jr .asm_926e .asm_925c ld a, c - cp $4 + cp CH4 jr z, .asm_9265 call Func_96c7 ret c @@ -18807,7 +18834,7 @@ Music_loopchannel: ; 0x92a9 Music_notetype: ; 0x92e4 and $f0 cp $d0 ; is this command a notetype? - jp nz, Music_unknownmusic0xe8 ; no + jp nz, Music_togglecall ; no ld a, d ; yes and $f ld b, $0 @@ -18848,16 +18875,16 @@ Music_notetype: ; 0x92e4 .noiseChannel jp Music_endchannel -Music_unknownmusic0xe8: ; 0x9323 +Music_togglecall: ; 0x9323 ld a, d - cp $e8 ; is this command an unknownmusic0xe8? + cp $e8 ; is this command an togglecall? jr nz, Music_vibrato ; no ld b, $0 ; yes ld hl, $c02e add hl, bc ld a, [hl] xor $1 - ld [hl], a + ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) jp Music_endchannel Music_vibrato: ; 0x9335 @@ -18983,12 +19010,12 @@ Music_unknownmusic0xef ; 0x9407 pop bc ld a, [$c003] and a - jr nz, .asm_9423 ; 0x9417 $a + jr nz, .skip ld a, [$c02d] ld [$c003], a xor a ld [$c02d], a -.asm_9423 +.skip jp Music_endchannel Music_dutycycle: ; 0x9426 @@ -19010,13 +19037,13 @@ Music_dutycycle: ; 0x9426 Music_stereopanning: ; 0x9444 cp $f0 ; is this command a stereopanning? - jr nz, Music_unknownmusic0xf8 ; no + jr nz, Music_executemusic ; no call GetNextMusicByte ; yes ld [$ff00+$24], a ; store stereopanning jp Music_endchannel -Music_unknownmusic0xf8: ; 0x9450 - cp $f8 ; is this command an unknownmusic0xf8? +Music_executemusic: ; 0x9450 + cp $f8 ; is this command an executemusic? jr nz, Music_octave ; no ld b, $0 ; yes ld hl, $c036 @@ -19027,7 +19054,7 @@ Music_unknownmusic0xf8: ; 0x9450 Music_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? - jr nz, UnknownNoiseCommand ; no + jr nz, Music_unknownsfx0x20 ; no ld hl, $c0d6 ; yes ld b, $0 add hl, bc @@ -19036,8 +19063,8 @@ Music_octave: ; 0x945f ld [hl], a ; store low nibble as octave jp Music_endchannel -UnknownNoiseCommand: ; 0x9472 - cp $20 ; is this command an unknownnoisecommand? +Music_unknownsfx0x20: ; 0x9472 + cp $20 ; is this command an unknownsfx0x20? jr nz, .skip ; no ld a, c cp CH3 ; is this a noise or sfx channel? @@ -19046,8 +19073,8 @@ UnknownNoiseCommand: ; 0x9472 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .skip - call Music_notelength + jr nz, .skip ; no + call Music_notelength ; yes ld d, a ld b, $0 ld hl, $c03e @@ -19068,7 +19095,7 @@ UnknownNoiseCommand: ; 0x9472 ld a, c cp CH7 ld a, $0 - jr z, .sfxNoiseChannel + jr z, .sfxNoiseChannel ; only two params for noise channel push de call GetNextMusicByte pop de @@ -19085,13 +19112,13 @@ UnknownNoiseCommand: ; 0x9472 cp CH4 jr c, .asm_94db ; if not a sfx ld a, d - cp $10 - jr nz, .asm_94db - ld b, $0 + cp $10 ; is this command a unknownsfx0x10? + jr nz, .asm_94db ; no + ld b, $0 ; yes ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_94db + jr nz, .asm_94db ; no call GetNextMusicByte ld [$ff00+$10], a jp Music_endchannel @@ -19211,7 +19238,7 @@ Music_notepitch: ; 0x9568 jr nz, .notsfxChannel3 .musicChannel3 ld b, $0 - ld hl, $5b1f + ld hl, Unknown_9b1f add hl, bc ld a, [$ff00+$25] and [hl] @@ -19284,7 +19311,7 @@ Music_notepitch: ; 0x9568 Func_95f8: ; 0x95f8 ld b, $0 - ld hl, $5b27 + ld hl, Unknown_9b27 add hl, bc ld a, [$ff00+$25] or [hl] @@ -19301,12 +19328,12 @@ Func_95f8: ; 0x95f8 jr nz, .skip .sfxNoiseChannel ld a, [$c004] - ld hl, $5b27 + ld hl, Unknown_9b27 add hl, bc and [hl] ld d, a ld a, [$ff00+$25] - ld hl, $5b1f + ld hl, Unknown_9b1f add hl, bc and [hl] or d @@ -19468,7 +19495,7 @@ Func_96e5: ; 0x96e5 scf ret -Func_96f9: ; 0x96f9 +Music_ApplyPitchBend: ; 0x96f9 ld hl, $c02e add hl, bc bit 5, [hl] @@ -19659,7 +19686,7 @@ Func_978f: ; 0x978f ld [hl], a ret -Func_980d: ; 0x980d +Music_ApplyDutyCycle: ; 0x980d ld b, $0 ld hl, $c046 add hl, bc @@ -19697,11 +19724,11 @@ GetNextMusicByte: ; 0x9825 Func_9838: ; 0x9838 ld a, c - ld hl, $5b17 + ld hl, Unknown_9b17 add l - jr nc, .asm_9840 ; 0x983d $1 + jr nc, .noCarry inc h -.asm_9840 +.noCarry ld l, a ld a, [hl] add b @@ -20025,10 +20052,10 @@ Func_9a34: ; 0x9a34 ; fills d bytes at hl with a FillMusicRAM: ; 0x9a89 ld b, d -.asm_9a8a +.loop ld [hli], a dec b - jr nz, .asm_9a8a ; 0x9a8c $fc + jr nz, .loop ret Func_9a8f: ; 0x9a8f @@ -20112,7 +20139,7 @@ Func_9a8f: ; 0x9a8f ld [hli], a ld [hl], a ld hl, $c012 - ld de, $5b16 + ld de, Unknown_9b16 ld [hl], e inc hl ld [hl], d @@ -20126,10 +20153,34 @@ Func_9a8f: ; 0x9a8f .asm_9b15 ret -INCBIN "baserom.gbc",$9b16,$9b2f - $9b16 +Unknown_9b16: ; 0x9b16 + db $FF + +Unknown_9b17: ; 0x9b17 + db $10, $15, $1A, $1F ; channels 0-3 + db $10, $15, $1A, $1F ; channels 4-7 + +Unknown_9b1f: ; 0x9b1f + db $EE, $DD, $BB, $77 ; channels 0-3 + db $EE, $DD, $BB, $77 ; channels 4-7 + +Unknown_9b27: ; 0x9b27 + db $11, $22, $44, $88 ; channels 0-3 + db $11, $22, $44, $88 ; channels 4-7 Unknown_9b2f: ; 0x9b2f -INCBIN "baserom.gbc",$9b2f,$9b47 - $9b2f + dw $F82C + dw $F89D + dw $F907 + dw $F96B + dw $F9CA + dw $FA23 + dw $FA77 + dw $FAC7 + dw $FB12 + dw $FB58 + dw $FB9B + dw $FBDA ; an alternate start for MeetRival which has a different first measure Music_RivalAlternateStart: ; 0x9b47 @@ -20150,7 +20201,7 @@ OverwriteChannelPointer: ; 0x9b60 ld [hli], a ret -; an alternate tempo for MeetRival which has a slightly slower tempo +; an alternate tempo for MeetRival which is slightly slower Music_RivalAlternateTempo: ; 0x9b65 ld c, BANK(Music_MeetRival) ld a, (Music_MeetRival - $4000) / 3 @@ -20172,7 +20223,7 @@ Music_Cities1AlternateTempo: ; 0x9b81 ld [$cfc8], a ld [$cfc9], a ld a, $ff - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld c, $64 call DelayFrames ld c, BANK(Music_Cities1) @@ -43561,7 +43612,7 @@ asm_1e9ab: ; 1e9ab (7:69ab) asm_1e9b0: ; 1e9b0 (7:69b0) call EnableAutoTextBoxDrawing xor a - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a dec a call PlaySound ld c, $2 @@ -44028,9 +44079,6 @@ INCLUDE "music/sfx/sfx_08_49.tx" INCLUDE "music/sfx/sfx_08_4a.tx" INCLUDE "music/sfx/sfx_08_4b.tx" INCLUDE "music/sfx/sfx_08_4c.tx" - -INCBIN "baserom.gbc",$204d1,$204d6 - $204d1 ; unknown music - INCLUDE "music/sfx/sfx_08_4d.tx" INCLUDE "music/sfx/sfx_08_4e.tx" INCLUDE "music/sfx/sfx_08_4f.tx" @@ -44039,16 +44087,10 @@ INCLUDE "music/sfx/sfx_08_51.tx" INCLUDE "music/sfx/sfx_08_52.tx" INCLUDE "music/sfx/sfx_08_53.tx" INCLUDE "music/sfx/sfx_08_54.tx" - -INCBIN "baserom.gbc",$20528,$20533 - $20528 ; unknown music - INCLUDE "music/sfx/sfx_08_55.tx" INCLUDE "music/sfx/sfx_08_56.tx" INCLUDE "music/sfx/sfx_08_57.tx" INCLUDE "music/sfx/sfx_08_58.tx" - -INCBIN "baserom.gbc",$20565,$2056a - $20565 ; unknown music - INCLUDE "music/sfx/sfx_08_59.tx" INCLUDE "music/sfx/sfx_08_5a.tx" INCLUDE "music/sfx/sfx_08_5b.tx" @@ -44063,9 +44105,6 @@ INCLUDE "music/sfx/sfx_08_63.tx" INCLUDE "music/sfx/sfx_08_64.tx" INCLUDE "music/sfx/sfx_08_65.tx" INCLUDE "music/sfx/sfx_08_66.tx" - -INCBIN "baserom.gbc",$20610,$20624 - $20610 ; unknown music - INCLUDE "music/sfx/sfx_08_67.tx" INCLUDE "music/sfx/sfx_08_68.tx" INCLUDE "music/sfx/sfx_08_69.tx" @@ -44075,20 +44114,11 @@ INCLUDE "music/sfx/sfx_08_6c.tx" INCLUDE "music/sfx/sfx_08_6d.tx" INCLUDE "music/sfx/sfx_08_6e.tx" INCLUDE "music/sfx/sfx_08_6f.tx" - -INCBIN "baserom.gbc",$207f1,$207fa - $207f1 ; unknown music - INCLUDE "music/sfx/sfx_08_70.tx" INCLUDE "music/sfx/sfx_08_71.tx" - -INCBIN "baserom.gbc",$20862,$20875 - $20862 ; unknown music - INCLUDE "music/sfx/sfx_08_72.tx" INCLUDE "music/sfx/sfx_08_73.tx" INCLUDE "music/sfx/sfx_08_74.tx" - -INCBIN "baserom.gbc",$208d5,$208e0 - $208d5 ; unknown music - INCLUDE "music/sfx/sfx_08_75.tx" INCLUDE "music/sfx/sfx_08_76.tx" @@ -101479,7 +101509,7 @@ Func_70423: ; 70423 (1c:4423) ld [$cfc8], a ld [$cfc9], a ld a, $ff - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a jp GBFadeOut2 ; known jump sources: 7027 (1:7027) @@ -101501,12 +101531,12 @@ Func_70433: ; 70433 (1c:4433) ld de, Unknown_704d7 ; $44d7 call Func_70503 ld a, $4 - ld [$cfc7], a + ld [W_CURCHANNELPOINTER], a ld a, $ff ld [$c0ee], a call PlaySound .asm_70464 - ld a, [$cfc7] + ld a, [W_CURCHANNELPOINTER] and a jr nz, .asm_70464 ld a, [W_NUMINPARTY] ; $d163 diff --git a/music/bikeriding.asm b/music/bikeriding.asm index 4afac7f3..7c4ad149 100644 --- a/music/bikeriding.asm +++ b/music/bikeriding.asm @@ -47,7 +47,7 @@ Music_BikeRiding_branch_7dbc9: note D_, 2 note E_, 2 note F_, 6 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 note E_, 2 note D_, 2 @@ -56,7 +56,7 @@ Music_BikeRiding_branch_7dbc9: note F_, 2 note E_, 1 note F_, 1 - unknownmusic0xe8 + togglecall notetype 12, 11, 5 note G_, 6 note G_, 6 diff --git a/music/celadon.asm b/music/celadon.asm index bf73ff2c..fc736084 100644 --- a/music/celadon.asm +++ b/music/celadon.asm @@ -2,7 +2,7 @@ Music_Celadon_Ch1: ; b6c7 (2:76c7) tempo 0, 144 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall notetype 12, 2, 15 rest 8 octave 3 diff --git a/music/cinnabar.asm b/music/cinnabar.asm index 283e8f71..7bed4592 100644 --- a/music/cinnabar.asm +++ b/music/cinnabar.asm @@ -3,7 +3,7 @@ Music_Cinnabar_Ch1: ; b86d (2:786d) stereopanning 119 duty 3 vibrato 12, 3, 4 - unknownmusic0xe8 + togglecall Music_Cinnabar_branch_b878: notetype 12, 11, 5 diff --git a/music/cinnabarmansion.asm b/music/cinnabarmansion.asm index 36b911ec..f406b536 100644 --- a/music/cinnabarmansion.asm +++ b/music/cinnabarmansion.asm @@ -40,7 +40,7 @@ Music_CinnabarMansion_branch_7ed19: Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40) duty 2 - unknownmusic0xe8 + togglecall vibrato 10, 2, 4 notetype 12, 12, 2 diff --git a/music/cities1.asm b/music/cities1.asm index 9512adbf..c1ac1b90 100644 --- a/music/cities1.asm +++ b/music/cities1.asm @@ -403,7 +403,7 @@ Music_Cities1_branch_ac00: Music_Cities1_Ch3: ; ac32 (2:6c32) notetype 12, 1, 1 - unknownmusic0xe8 + togglecall Music_Cities1_branch_ac35: vibrato 0, 0, 0 diff --git a/music/cities2.asm b/music/cities2.asm index b1ed7353..d26decd8 100644 --- a/music/cities2.asm +++ b/music/cities2.asm @@ -3,7 +3,7 @@ Music_Cities2_Ch1: ; b504 (2:7504) stereopanning 119 duty 3 vibrato 8, 3, 2 - unknownmusic0xe8 + togglecall notetype 12, 11, 6 rest 8 octave 3 diff --git a/music/credits.asm b/music/credits.asm index 3013b3d0..485e1c61 100644 --- a/music/credits.asm +++ b/music/credits.asm @@ -3,7 +3,7 @@ Music_Credits_Ch1: ; 7fc1f (1f:7c1f) stereopanning 119 duty 3 vibrato 8, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 5 octave 4 note E_, 6 diff --git a/music/defeatedgymleader.asm b/music/defeatedgymleader.asm index 3629249c..71e3081a 100644 --- a/music/defeatedgymleader.asm +++ b/music/defeatedgymleader.asm @@ -3,7 +3,7 @@ Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) stereopanning 119 duty 3 vibrato 18, 3, 1 - unknownmusic0xe8 + togglecall tempo 0, 112 notetype 12, 10, 6 octave 4 diff --git a/music/defeatedtrainer.asm b/music/defeatedtrainer.asm index b4ec6c33..5872b290 100644 --- a/music/defeatedtrainer.asm +++ b/music/defeatedtrainer.asm @@ -2,7 +2,7 @@ Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) tempo 0, 224 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall tempo 0, 224 notetype 4, 10, 2 octave 4 diff --git a/music/defeatedwildmon.asm b/music/defeatedwildmon.asm index 6d17496a..ac4b875a 100644 --- a/music/defeatedwildmon.asm +++ b/music/defeatedwildmon.asm @@ -1,10 +1,10 @@ Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) tempo 0, 112 stereopanning 119 - unknownmusic0xf8 + executemusic duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall tempo 0, 112 notetype 12, 11, 7 octave 3 @@ -68,7 +68,7 @@ Music_DefeatedWildMon_branch_23b8b: Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) - unknownmusic0xf8 + executemusic duty 2 notetype 12, 12, 3 octave 4 @@ -143,7 +143,7 @@ Music_DefeatedWildMon_branch_23bce: Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) - unknownmusic0xf8 + executemusic notetype 12, 2, 0 octave 5 note E_, 1 diff --git a/music/dungeon1.asm b/music/dungeon1.asm index 33d74e36..9c69b773 100644 --- a/music/dungeon1.asm +++ b/music/dungeon1.asm @@ -2,7 +2,7 @@ Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) tempo 0, 144 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall vibrato 10, 1, 4 notetype 12, 4, 13 rest 8 diff --git a/music/dungeon2.asm b/music/dungeon2.asm index 6bf6eb51..07ab047e 100644 --- a/music/dungeon2.asm +++ b/music/dungeon2.asm @@ -2,7 +2,7 @@ Music_Dungeon2_Ch1: ; 7e887 (1f:6887) tempo 0, 144 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall vibrato 10, 1, 4 Music_Dungeon2_branch_7e892: diff --git a/music/dungeon3.asm b/music/dungeon3.asm index 4f7eb74d..59941fc1 100644 --- a/music/dungeon3.asm +++ b/music/dungeon3.asm @@ -2,7 +2,7 @@ Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1) tempo 0, 160 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc: diff --git a/music/finalbattle.asm b/music/finalbattle.asm index d3c45a90..fcfb709d 100644 --- a/music/finalbattle.asm +++ b/music/finalbattle.asm @@ -3,7 +3,7 @@ Music_FinalBattle_Ch1: ; 233a6 (8:73a6) stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 2 octave 3 note F#, 1 diff --git a/music/gamecorner.asm b/music/gamecorner.asm index 15379284..6fd4b15f 100644 --- a/music/gamecorner.asm +++ b/music/gamecorner.asm @@ -3,7 +3,7 @@ Music_GameCorner_Ch1: ; 7e20b (1f:620b) stereopanning 119 duty 3 vibrato 12, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 5 octave 3 note A_, 6 diff --git a/music/gym.asm b/music/gym.asm index a024f052..a7529d0d 100644 --- a/music/gym.asm +++ b/music/gym.asm @@ -3,7 +3,7 @@ Music_Gym_Ch1: ; bcbb (2:7cbb) stereopanning 119 duty 3 vibrato 8, 2, 2 - unknownmusic0xe8 + togglecall notetype 12, 11, 5 octave 3 note G_, 6 diff --git a/music/gymleaderbattle.asm b/music/gymleaderbattle.asm index 04cb09be..a469c425 100644 --- a/music/gymleaderbattle.asm +++ b/music/gymleaderbattle.asm @@ -3,7 +3,7 @@ Music_GymLeaderBattle_Ch1: ; 22370 (8:6370) stereopanning 119 duty 3 vibrato 8, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 rest 6 octave 3 diff --git a/music/halloffame.asm b/music/halloffame.asm index 820e6ab0..d5523acd 100644 --- a/music/halloffame.asm +++ b/music/halloffame.asm @@ -3,7 +3,7 @@ Music_HallOfFame_Ch1: ; 7fbaf (1f:7baf) stereopanning 119 duty 3 vibrato 12, 2, 2 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 rest 16 rest 16 diff --git a/music/indigoplateau.asm b/music/indigoplateau.asm index 46f9d4b1..fde15664 100644 --- a/music/indigoplateau.asm +++ b/music/indigoplateau.asm @@ -3,7 +3,7 @@ Music_IndigoPlateau_Ch1: ; a5f0 (2:65f0) stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 2 octave 2 note A_, 8 diff --git a/music/introbattle.asm b/music/introbattle.asm index f3956fe7..f17f127e 100644 --- a/music/introbattle.asm +++ b/music/introbattle.asm @@ -3,7 +3,7 @@ Music_IntroBattle_Ch1: ; 7f844 (1f:7844) stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 1 rest 8 octave 2 diff --git a/music/jigglypuffsong.asm b/music/jigglypuffsong.asm index 0db6fe94..fb484898 100644 --- a/music/jigglypuffsong.asm +++ b/music/jigglypuffsong.asm @@ -4,7 +4,7 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) vibrato 8, 2, 4 duty 2 dutycycle 165 - unknownmusic0xe8 + togglecall notetype 13, 6, 7 octave 4 note E_, 8 diff --git a/music/lavender.asm b/music/lavender.asm index 5ec494e5..eafb8677 100644 --- a/music/lavender.asm +++ b/music/lavender.asm @@ -2,7 +2,7 @@ Music_Lavender_Ch1: ; bb58 (2:7b58) tempo 0, 152 stereopanning 119 duty 1 - unknownmusic0xe8 + togglecall vibrato 0, 8, 8 notetype 12, 8, 7 rest 16 diff --git a/music/meeteviltrainer.asm b/music/meeteviltrainer.asm index a81673f7..7ef5fc6e 100644 --- a/music/meeteviltrainer.asm +++ b/music/meeteviltrainer.asm @@ -2,7 +2,7 @@ Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) tempo 0, 124 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 12, 11, 1 rest 4 octave 3 diff --git a/music/meetfemaletrainer.asm b/music/meetfemaletrainer.asm index 32db8bf4..6d8a6273 100644 --- a/music/meetfemaletrainer.asm +++ b/music/meetfemaletrainer.asm @@ -2,7 +2,7 @@ Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) tempo 0, 124 stereopanning 119 duty 1 - unknownmusic0xe8 + togglecall notetype 12, 11, 2 octave 3 note G#, 6 diff --git a/music/meetmaletrainer.asm b/music/meetmaletrainer.asm index ae52ddae..9a3d7ba1 100644 --- a/music/meetmaletrainer.asm +++ b/music/meetmaletrainer.asm @@ -3,7 +3,7 @@ Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) stereopanning 119 duty 3 vibrato 20, 3, 3 - unknownmusic0xe8 + togglecall notetype 12, 11, 4 octave 3 note C#, 1 diff --git a/music/meetprofoak.asm b/music/meetprofoak.asm index 3a097b0b..e2db6e25 100644 --- a/music/meetprofoak.asm +++ b/music/meetprofoak.asm @@ -2,7 +2,7 @@ Music_MeetProfOak_Ch1: ; af59 (2:6f59) tempo 0, 112 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall notetype 12, 11, 4 octave 3 note F#, 1 diff --git a/music/meetrival.asm b/music/meetrival.asm index 13836b2c..196eeea9 100644 --- a/music/meetrival.asm +++ b/music/meetrival.asm @@ -9,7 +9,7 @@ Music_MeetRival_branch_b123: stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 octave 4 note D_, 1 @@ -130,7 +130,7 @@ Music_MeetRival_branch_b1a5: stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 octave 3 note D_, 1 diff --git a/music/museumguy.asm b/music/museumguy.asm index 9da69804..ef1c3bd7 100644 --- a/music/museumguy.asm +++ b/music/museumguy.asm @@ -2,7 +2,7 @@ Music_MuseumGuy_Ch1: ; adae (2:6dae) tempo 0, 128 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 12, 11, 1 octave 3 note B_, 2 diff --git a/music/oakslab.asm b/music/oakslab.asm index 4040603a..6988099a 100644 --- a/music/oakslab.asm +++ b/music/oakslab.asm @@ -3,7 +3,7 @@ Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) stereopanning 119 duty 3 vibrato 16, 1, 2 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 octave 2 note B_, 1 diff --git a/music/pkmnhealed.asm b/music/pkmnhealed.asm index 26ac7944..9c41bc4e 100644 --- a/music/pkmnhealed.asm +++ b/music/pkmnhealed.asm @@ -2,7 +2,7 @@ Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) tempo 0, 144 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 12, 8, 1 rest 2 pitchbend 0, 75 diff --git a/music/pokecenter.asm b/music/pokecenter.asm index fc3e0e7a..a4d30ac7 100644 --- a/music/pokecenter.asm +++ b/music/pokecenter.asm @@ -3,7 +3,7 @@ Music_Pokecenter_Ch1: ; be56 (2:7e56) stereopanning 119 duty 3 vibrato 10, 2, 2 - unknownmusic0xe8 + togglecall Music_Pokecenter_branch_be61: notetype 12, 10, 3 diff --git a/music/pokemontower.asm b/music/pokemontower.asm index 51232d93..09e22afc 100644 --- a/music/pokemontower.asm +++ b/music/pokemontower.asm @@ -2,7 +2,7 @@ Music_PokemonTower_Ch1: ; 7f04a (1f:704a) tempo 0, 152 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall vibrato 12, 2, 3 notetype 12, 8, 0 rest 4 diff --git a/music/routes1.asm b/music/routes1.asm index 7f12b56f..237bfaac 100644 --- a/music/routes1.asm +++ b/music/routes1.asm @@ -3,7 +3,7 @@ Music_Routes1_Ch1: ; 9bde (2:5bde) stereopanning 119 vibrato 4, 2, 3 duty 2 - unknownmusic0xe8 + togglecall Music_Routes1_branch_9be9: notetype 12, 10, 1 diff --git a/music/routes3.asm b/music/routes3.asm index 46c9528f..0b78bba1 100644 --- a/music/routes3.asm +++ b/music/routes3.asm @@ -3,7 +3,7 @@ Music_Routes3_Ch1: ; 9fad (2:5fad) stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 5 octave 3 note E_, 1 diff --git a/music/routes4.asm b/music/routes4.asm index ee53bf8b..ab6ec299 100644 --- a/music/routes4.asm +++ b/music/routes4.asm @@ -3,7 +3,7 @@ Music_Routes4_Ch1: ; a26a (2:626a) stereopanning 119 duty 3 vibrato 10, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 10, 2 octave 2 note G#, 4 diff --git a/music/safarizone.asm b/music/safarizone.asm index a772fa2a..1a984ddf 100644 --- a/music/safarizone.asm +++ b/music/safarizone.asm @@ -2,7 +2,7 @@ Music_SafariZone_Ch1: ; bc2e (2:7c2e) tempo 0, 132 stereopanning 119 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall duty 2 notetype 12, 9, 2 octave 3 diff --git a/music/sfx/sfx_02_01.asm b/music/sfx/sfx_02_01.asm index c9c00bd6..e92c35b8 100644 --- a/music/sfx/sfx_02_01.asm +++ b/music/sfx/sfx_02_01.asm @@ -1,6 +1,4 @@ SFX_02_01_Ch1: ; 82fd (2:42fd) - note D_, 1 - rest 2 - note D#, 4 + unknownnoise0x20 0, 193, 51 endchannel ; 0x8301 \ No newline at end of file diff --git a/music/sfx/sfx_02_02.asm b/music/sfx/sfx_02_02.asm index 057f3617..ca252725 100644 --- a/music/sfx/sfx_02_02.asm +++ b/music/sfx/sfx_02_02.asm @@ -1,6 +1,4 @@ SFX_02_02_Ch1: ; 8301 (2:4301) - note D_, 1 - note B_, 2 - note D#, 4 + unknownnoise0x20 0, 177, 51 endchannel ; 0x8305 \ No newline at end of file diff --git a/music/sfx/sfx_02_03.asm b/music/sfx/sfx_02_03.asm index b4732da1..4eb687a8 100644 --- a/music/sfx/sfx_02_03.asm +++ b/music/sfx/sfx_02_03.asm @@ -1,6 +1,4 @@ SFX_02_03_Ch1: ; 8305 (2:4305) - note D_, 1 - note A#, 2 - note D#, 4 + unknownnoise0x20 0, 161, 51 endchannel ; 0x8309 \ No newline at end of file diff --git a/music/sfx/sfx_02_04.asm b/music/sfx/sfx_02_04.asm index df4cc87c..45caab6b 100644 --- a/music/sfx/sfx_02_04.asm +++ b/music/sfx/sfx_02_04.asm @@ -1,6 +1,4 @@ SFX_02_04_Ch1: ; 8309 (2:4309) - note D_, 1 - note G#, 2 - note D#, 4 + unknownnoise0x20 0, 129, 51 endchannel ; 0x830d \ No newline at end of file diff --git a/music/sfx/sfx_02_05.asm b/music/sfx/sfx_02_05.asm index 155877ff..156254e5 100644 --- a/music/sfx/sfx_02_05.asm +++ b/music/sfx/sfx_02_05.asm @@ -1,21 +1,9 @@ SFX_02_05_Ch1: ; 830d (2:430d) - note D_, 8 - note G#, 5 - note D#, 8 - note D_, 7 - note G#, 5 - note D#, 7 - note D_, 6 - note G#, 4 - note D#, 6 - note D_, 5 - note G#, 4 - note D#, 5 - note D_, 4 - note G#, 3 - note D#, 4 - note D_, 3 - note G#, 2 - note D#, 3 + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 endchannel ; 0x8320 \ No newline at end of file diff --git a/music/sfx/sfx_02_06.asm b/music/sfx/sfx_02_06.asm index fee6d5dc..03f8d4aa 100644 --- a/music/sfx/sfx_02_06.asm +++ b/music/sfx/sfx_02_06.asm @@ -1,6 +1,4 @@ SFX_02_06_Ch1: ; 8320 (2:4320) - note D_, 1 - note F_, 2 - note D_, 11 + unknownnoise0x20 0, 81, 42 endchannel ; 0x8324 \ No newline at end of file diff --git a/music/sfx/sfx_02_07.asm b/music/sfx/sfx_02_07.asm index 9e0bd50c..02fd9e06 100644 --- a/music/sfx/sfx_02_07.asm +++ b/music/sfx/sfx_02_07.asm @@ -1,9 +1,5 @@ SFX_02_07_Ch1: ; 8324 (2:4324) - note D_, 2 - note E_, 2 - note D_, 12 - note D_, 1 - note F#, 2 - note D_, 11 + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 endchannel ; 0x832b \ No newline at end of file diff --git a/music/sfx/sfx_02_08.asm b/music/sfx/sfx_02_08.asm index 209b3d99..4efce48f 100644 --- a/music/sfx/sfx_02_08.asm +++ b/music/sfx/sfx_02_08.asm @@ -1,6 +1,4 @@ SFX_02_08_Ch1: ; 832b (2:432b) - note D_, 1 - note G#, 2 - note C#, 1 + unknownnoise0x20 0, 129, 16 endchannel ; 0x832f \ No newline at end of file diff --git a/music/sfx/sfx_02_09.asm b/music/sfx/sfx_02_09.asm index 43e61cdf..bb04efca 100644 --- a/music/sfx/sfx_02_09.asm +++ b/music/sfx/sfx_02_09.asm @@ -1,6 +1,4 @@ SFX_02_09_Ch1: ; 832f (2:432f) - note D_, 1 - note G#, 3 - note D_, 4 + unknownnoise0x20 0, 130, 35 endchannel ; 0x8333 \ No newline at end of file diff --git a/music/sfx/sfx_02_0a.asm b/music/sfx/sfx_02_0a.asm index 473dd427..128c9a74 100644 --- a/music/sfx/sfx_02_0a.asm +++ b/music/sfx/sfx_02_0a.asm @@ -1,6 +1,4 @@ SFX_02_0a_Ch1: ; 8333 (2:4333) - note D_, 1 - note G#, 3 - note D_, 6 + unknownnoise0x20 0, 130, 37 endchannel ; 0x8337 \ No newline at end of file diff --git a/music/sfx/sfx_02_0b.asm b/music/sfx/sfx_02_0b.asm index a79a0530..de643bd6 100644 --- a/music/sfx/sfx_02_0b.asm +++ b/music/sfx/sfx_02_0b.asm @@ -1,6 +1,4 @@ SFX_02_0b_Ch1: ; 8337 (2:4337) - note D_, 1 - note G#, 3 - note D_, 7 + unknownnoise0x20 0, 130, 38 endchannel ; 0x833b \ No newline at end of file diff --git a/music/sfx/sfx_02_0c.asm b/music/sfx/sfx_02_0c.asm index 5546584d..98c4ef19 100644 --- a/music/sfx/sfx_02_0c.asm +++ b/music/sfx/sfx_02_0c.asm @@ -1,6 +1,4 @@ SFX_02_0c_Ch1: ; 833b (2:433b) - note D_, 1 - note A#, 2 - note C#, 1 + unknownnoise0x20 0, 161, 16 endchannel ; 0x833f \ No newline at end of file diff --git a/music/sfx/sfx_02_0d.asm b/music/sfx/sfx_02_0d.asm index 9205e59b..dfa8e738 100644 --- a/music/sfx/sfx_02_0d.asm +++ b/music/sfx/sfx_02_0d.asm @@ -1,6 +1,4 @@ SFX_02_0d_Ch1: ; 833f (2:433f) - note D_, 1 - note A#, 3 - note C#, 2 + unknownnoise0x20 0, 162, 17 endchannel ; 0x8343 \ No newline at end of file diff --git a/music/sfx/sfx_02_0e.asm b/music/sfx/sfx_02_0e.asm index 89af0d6c..52b0dd4d 100644 --- a/music/sfx/sfx_02_0e.asm +++ b/music/sfx/sfx_02_0e.asm @@ -1,6 +1,4 @@ SFX_02_0e_Ch1: ; 8343 (2:4343) - note D_, 1 - note A#, 3 - note F_, 1 + unknownnoise0x20 0, 162, 80 endchannel ; 0x8347 \ No newline at end of file diff --git a/music/sfx/sfx_02_0f.asm b/music/sfx/sfx_02_0f.asm index 82b2f294..5a2404fc 100644 --- a/music/sfx/sfx_02_0f.asm +++ b/music/sfx/sfx_02_0f.asm @@ -1,9 +1,5 @@ SFX_02_0f_Ch1: ; 8347 (2:4347) - note D_, 1 - note A#, 2 - note C#, 9 - note D_, 1 - note D#, 2 - note D#, 4 + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 endchannel ; 0x834e \ No newline at end of file diff --git a/music/sfx/sfx_02_10.asm b/music/sfx/sfx_02_10.asm index cfed7de3..057fd81b 100644 --- a/music/sfx/sfx_02_10.asm +++ b/music/sfx/sfx_02_10.asm @@ -1,9 +1,5 @@ SFX_02_10_Ch1: ; 834e (2:434e) - note D_, 3 - note A_, 2 - note D_, 9 - note D_, 1 - note G_, 2 - note C#, 9 + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 endchannel ; 0x8355 \ No newline at end of file diff --git a/music/sfx/sfx_02_11.asm b/music/sfx/sfx_02_11.asm index d55a5f56..3ab56c2b 100644 --- a/music/sfx/sfx_02_11.asm +++ b/music/sfx/sfx_02_11.asm @@ -1,6 +1,4 @@ SFX_02_11_Ch1: ; 8355 (2:4355) - note D_, 1 - note A_, 2 - note D_, 3 + unknownnoise0x20 0, 145, 34 endchannel ; 0x8359 \ No newline at end of file diff --git a/music/sfx/sfx_02_12.asm b/music/sfx/sfx_02_12.asm index 4b93a742..608e341c 100644 --- a/music/sfx/sfx_02_12.asm +++ b/music/sfx/sfx_02_12.asm @@ -1,6 +1,4 @@ SFX_02_12_Ch1: ; 8359 (2:4359) - note D_, 1 - note G_, 2 - note D_, 3 + unknownnoise0x20 0, 113, 34 endchannel ; 0x835d \ No newline at end of file diff --git a/music/sfx/sfx_02_13.asm b/music/sfx/sfx_02_13.asm index 38ee5d96..38b06431 100644 --- a/music/sfx/sfx_02_13.asm +++ b/music/sfx/sfx_02_13.asm @@ -1,6 +1,4 @@ SFX_02_13_Ch1: ; 835d (2:435d) - note D_, 1 - note F#, 2 - note D_, 3 + unknownnoise0x20 0, 97, 34 endchannel ; 0x8361 \ No newline at end of file diff --git a/music/sfx/sfx_02_14.asm b/music/sfx/sfx_02_14.asm index 9942507a..70dfe276 100644 --- a/music/sfx/sfx_02_14.asm +++ b/music/sfx/sfx_02_14.asm @@ -1,46 +1,22 @@ SFX_02_14_Ch1: ; 8987 (2:4987) dutycycle 245 - note D_, 5 - unknownmusic0xf3 - note C#, 9 - note C_, 8 - note D_, 16 - octave 3 - note A_, 9 - note C_, 8 - note D_, 9 - note A_, 2 - note F_, 9 - note C_, 8 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 endchannel SFX_02_14_Ch2: ; 8996 (2:4996) dutycycle 160 - note D_, 6 - note B_, 4 - note C_, 9 - note C_, 8 - note D_, 16 - rest 6 - note G#, 9 - note C_, 8 - note D_, 9 - note G_, 2 - note E_, 9 - note C_, 8 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 endchannel SFX_02_14_Ch3: ; 89a5 (2:49a5) - note D_, 4 - note A#, 2 - note C#, 13 - note D_, 15 - note A_, 5 - note D_, 13 - note D_, 9 - note G#, 2 - note C#, 13 + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 endchannel ; 0x89af \ No newline at end of file diff --git a/music/sfx/sfx_02_15.asm b/music/sfx/sfx_02_15.asm index 13293cee..619cb208 100644 --- a/music/sfx/sfx_02_15.asm +++ b/music/sfx/sfx_02_15.asm @@ -1,55 +1,25 @@ SFX_02_15_Ch1: ; 8b97 (2:4b97) dutycycle 160 - note D_, 5 - unknownmusic0xf3 - note C_, 1 - note C_, 7 - note D_, 9 - notetype 5, 6, 0 - note C_, 8 - note D_, 4 - octave 6 - note D_, 1 - note C_, 8 - note D_, 9 - notetype 1, 1, 0 - note C_, 8 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 endchannel SFX_02_15_Ch2: ; 8baa (2:4baa) dutycycle 90 - note D_, 6 - note B_, 4 - unknownmusic0xf1 - note C_, 7 - note D_, 8 - rest 6 - note F_, 3 - note C_, 8 - note D_, 4 - note A#, 3 - note C#, 2 - note C_, 8 - note D_, 9 - note B_, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 endchannel SFX_02_15_Ch3: ; 8bbd (2:4bbd) - note D_, 4 - note A#, 3 - note D#, 13 - note D_, 13 - note A_, 5 - note D_, 13 - note D_, 4 - note G#, 3 - note C#, 13 - note D_, 9 - note G_, 2 - note D_, 13 + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 endchannel ; 0x8bca \ No newline at end of file diff --git a/music/sfx/sfx_02_16.asm b/music/sfx/sfx_02_16.asm index 286d4b6b..4e095a04 100644 --- a/music/sfx/sfx_02_16.asm +++ b/music/sfx/sfx_02_16.asm @@ -1,33 +1,16 @@ SFX_02_16_Ch1: ; 8b0c (2:4b0c) duty 0 - note D_, 9 - unknownmusic0xf5 - note G#, 1 - note C_, 5 - note D_, 3 - octave 7 - octave 8 - note C_, 6 - note D_, 9 - notetype 1, 13, 12 - note C_, 6 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 endchannel SFX_02_16_Ch2: ; 8b1b (2:4b1b) dutycycle 165 - note D_, 8 - note A_, 6 - note E_, 2 - note C_, 5 - note D_, 3 - note G#, 2 - note D_, 2 - note C_, 6 - note D_, 9 - note F#, 2 - note C#, 11 - note C_, 6 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 SFX_02_16_Ch3: ; 8b29 (2:4b29) diff --git a/music/sfx/sfx_02_17.asm b/music/sfx/sfx_02_17.asm index 5a4775ca..f8b66456 100644 --- a/music/sfx/sfx_02_17.asm +++ b/music/sfx/sfx_02_17.asm @@ -1,78 +1,31 @@ SFX_02_17_Ch1: ; 88a6 (2:48a6) dutycycle 240 - note D_, 5 - unknownmusic0xf7 - note C_, 9 - note C_, 7 - note D_, 7 - octave 2 - note C_, 1 - note C_, 7 - note D_, 7 - notetype 7, 15, 0 - note C_, 6 - note D_, 7 - rest 5 - octave 8 - note C_, 6 - note D_, 6 - notetype 3, 12, 0 - note C_, 6 - note D_, 5 - notetype 3, 10, 0 - note C_, 6 - note D_, 9 - octave 7 - note G#, 1 - note C_, 6 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 endchannel SFX_02_17_Ch2: ; 88c5 (2:48c5) dutycycle 10 - note D_, 5 - rest 8 - note C_, 5 - note C_, 6 - note D_, 7 - note A#, 7 - note C_, 3 - note C_, 6 - note D_, 7 - note A_, 8 - unknownmusic0xf1 - note C_, 5 - note D_, 5 - note B_, 5 - octave 7 - note C_, 5 - note D_, 6 - note A#, 4 - rest 3 - note C_, 5 - note D_, 5 - note B_, 4 - note A#, 4 - note C_, 5 - note D_, 9 - rest 2 - note G#, 3 - note C_, 5 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 endchannel SFX_02_17_Ch3: ; 88e4 (2:48e4) - note D_, 13 - octave 4 - note E_, 13 - note D_, 11 - rest 8 - note F_, 13 - note D_, 13 - note B_, 7 - note E_, 13 - note D_, 16 - note A#, 3 - note F_, 13 + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 endchannel ; 0x88f1 \ No newline at end of file diff --git a/music/sfx/sfx_02_18.asm b/music/sfx/sfx_02_18.asm index 1ffb9833..4d546cbf 100644 --- a/music/sfx/sfx_02_18.asm +++ b/music/sfx/sfx_02_18.asm @@ -1,81 +1,33 @@ SFX_02_18_Ch1: ; 8c55 (2:4c55) dutycycle 240 - note D_, 5 - unknownmusic0xf7 - note A#, 1 - note C_, 7 - note D_, 9 - octave 2 - note A#, 5 - note C_, 7 - note D_, 5 - notetype 6, 10, 0 - note C_, 7 - note D_, 13 - notetype 3, 2, 0 - note C_, 7 - note D_, 9 - rest 4 - note D_, 5 - note C_, 7 - note D_, 5 - rest 3 - note D_, 1 - note C_, 7 - note D_, 9 - note B_, 2 - note C#, 1 - note C_, 7 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 endchannel SFX_02_18_Ch2: ; 8c74 (2:4c74) dutycycle 90 - note D_, 5 - octave 1 - note C_, 2 - note C_, 7 - note D_, 9 - notetype 6, 0, 3 - note C_, 7 - note D_, 5 - rest 7 - note C_, 2 - note C_, 7 - note D_, 13 - rest 4 - note G#, 2 - note C_, 6 - note D_, 9 - note B_, 4 - note G#, 4 - note C_, 6 - note D_, 5 - note B_, 3 - note G#, 3 - note C_, 6 - note D_, 9 - note A#, 2 - note G_, 2 - note C_, 6 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 endchannel SFX_02_18_Ch3: ; 8c93 (2:4c93) - note D_, 8 - notetype 6, 5, 12 - note D_, 9 - octave 2 - note E_, 13 - note D_, 5 - notetype 4, 5, 12 - note D_, 5 - notetype 4, 4, 12 - note D_, 8 - rest 4 - note E_, 13 - note D_, 9 - note A#, 2 - note F_, 13 + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 endchannel ; 0x8ca6 \ No newline at end of file diff --git a/music/sfx/sfx_02_19.asm b/music/sfx/sfx_02_19.asm index c85abea4..3cc7ae73 100644 --- a/music/sfx/sfx_02_19.asm +++ b/music/sfx/sfx_02_19.asm @@ -1,40 +1,18 @@ SFX_02_19_Ch1: ; 8a35 (2:4a35) dutycycle 10 - note D_, 7 - octave 6 - note C_, 1 - note C_, 6 - note D_, 7 - octave 5 - note G#, 1 - note C_, 6 - note D_, 7 - notetype 3, 7, 0 - note C_, 6 - note D_, 9 - note A#, 2 - note F#, 1 - note C_, 6 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 endchannel SFX_02_19_Ch2: ; 8a48 (2:4a48) dutycycle 245 - note D_, 7 - octave 6 - note G#, 3 - note C_, 5 - note D_, 7 - notetype 3, 0, 1 - note C_, 6 - note D_, 7 - note B_, 3 - octave 6 - note C_, 5 - note D_, 9 - note G#, 2 - rest 2 - note C_, 5 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 SFX_02_19_Ch3: ; 8a5a (2:4a5a) diff --git a/music/sfx/sfx_02_1a.asm b/music/sfx/sfx_02_1a.asm index 4649d2af..8b029d5c 100644 --- a/music/sfx/sfx_02_1a.asm +++ b/music/sfx/sfx_02_1a.asm @@ -1,29 +1,11 @@ SFX_02_1a_Ch1: ; 89df (2:49df) dutycycle 250 - note D_, 7 - note G#, 4 - note E_, 8 - note C_, 3 - note D_, 16 - note F#, 3 - note D_, 7 - note C_, 3 - note D_, 5 - note F_, 3 - note E_, 6 - note C_, 3 - note D_, 10 - note F#, 4 - note C_, 7 - note C_, 3 - note D_, 16 - note G#, 3 - note D_, 6 - note C_, 3 - note D_, 16 - note E_, 3 - note C_, 8 - note C_, 3 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 SFX_02_1a_Ch2: ; 89f9 (2:49f9) @@ -31,21 +13,11 @@ SFX_02_1a_Ch2: ; 89f9 (2:49f9) SFX_02_1a_Ch3: ; 89fa (2:49fa) - note D_, 9 - notetype 4, 8, 12 - note D_, 5 - octave 6 - note A_, 13 - note D_, 16 - rest 7 - note G#, 13 - note D_, 9 - octave 4 - note A#, 13 - note D_, 16 - notetype 7, 9, 12 - note D_, 16 - unknownmusic0xf2 - note A#, 13 + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 endchannel ; 0x8a0d \ No newline at end of file diff --git a/music/sfx/sfx_02_1b.asm b/music/sfx/sfx_02_1b.asm index 620b377f..8626d876 100644 --- a/music/sfx/sfx_02_1b.asm +++ b/music/sfx/sfx_02_1b.asm @@ -1,45 +1,22 @@ SFX_02_1b_Ch1: ; 8a0d (2:4a0d) dutycycle 240 - note D_, 5 - unknownmusic0xf3 - octave 8 - note C_, 7 - note D_, 16 - octave 4 - note E_, 1 - note C_, 7 - note D_, 9 - rest 2 - note D_, 1 - note C_, 7 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 endchannel SFX_02_1b_Ch2: ; 8a1c (2:4a1c) dutycycle 10 - note D_, 4 - rest 4 - note G#, 4 - note C_, 7 - note D_, 15 - note B_, 5 - note C_, 3 - note C_, 7 - note D_, 9 - note A#, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 endchannel SFX_02_1b_Ch3: ; 8a2b (2:4a2b) - note D_, 5 - notetype 3, 5, 12 - note D_, 16 - octave 2 - note E_, 13 - note D_, 9 - note B_, 2 - note F_, 13 + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 endchannel ; 0x8a35 \ No newline at end of file diff --git a/music/sfx/sfx_02_1c.asm b/music/sfx/sfx_02_1c.asm index add71761..d96c0eb8 100644 --- a/music/sfx/sfx_02_1c.asm +++ b/music/sfx/sfx_02_1c.asm @@ -1,51 +1,24 @@ SFX_02_1c_Ch1: ; 8c25 (2:4c25) dutycycle 240 - note D_, 16 - unknownmusic0xf6 - note F#, 6 - note C_, 6 - note D_, 11 - octave 4 - note G_, 13 - note C_, 6 - note D_, 4 - rest 3 - note F_, 13 - note C_, 6 - note D_, 16 - note B_, 3 - note D#, 13 - note C_, 6 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 endchannel SFX_02_1c_Ch2: ; 8c38 (2:4c38) dutycycle 90 - note D_, 15 - notetype 6, 0, 3 - note C_, 6 - note D_, 10 - note B_, 5 - note C#, 12 - note C_, 6 - note D_, 5 - note A_, 3 - unknownmusic0xfa - note C_, 5 - note D_, 16 - note A#, 3 - notetype 11, 0, 4 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 endchannel SFX_02_1c_Ch3: ; 8c4b (2:4c4b) - note D_, 13 - octave 2 - note E_, 13 - note D_, 12 - notetype 7, 5, 12 - note D_, 16 - rest 3 - note E_, 13 + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 endchannel ; 0x8c55 \ No newline at end of file diff --git a/music/sfx/sfx_02_1d.asm b/music/sfx/sfx_02_1d.asm index 3673e0cf..f5db0868 100644 --- a/music/sfx/sfx_02_1d.asm +++ b/music/sfx/sfx_02_1d.asm @@ -1,83 +1,36 @@ SFX_02_1d_Ch1: ; 872f (2:472f) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - note A#, 1 - note C_, 8 - note D_, 7 - octave 2 - note A#, 4 - note C_, 8 - note D_, 11 - unknownmusic0xf4 - note A#, 1 - note C_, 8 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 dutycycle 165 - note D_, 11 - unknownmusic0xf6 - notetype 8, 0, 7 - note D_, 5 - octave 5 - notetype 7, 0, 7 - note D_, 16 - unknownmusic0xf2 - notetype 8, 0, 7 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 endchannel SFX_02_1d_Ch2: ; 874c (2:474c) dutycycle 5 - note D_, 3 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 16 - note A#, 8 - note A#, 2 - note C_, 7 - note D_, 7 - note G#, 7 - note A#, 3 - note C_, 7 - note D_, 11 - note G_, 5 - note A#, 2 - note C_, 7 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 dutycycle 95 - note D_, 11 - note G_, 7 - notetype 6, 0, 6 - note D_, 5 - note G#, 4 - notetype 9, 0, 6 - note D_, 16 - note A#, 3 - notetype 7, 0, 6 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 endchannel SFX_02_1d_Ch3: ; 876d (2:476d) - note D_, 3 - unknownmusic0xf2 - note D#, 13 - note D_, 9 - octave 4 - note D#, 15 - note D_, 16 - notetype 7, 3, 12 - note D_, 7 - rest 6 - note D#, 12 - note D_, 7 - octave 4 - note D#, 14 - note D_, 9 - note B_, 7 - note D#, 13 - note D_, 7 - notetype 4, 3, 13 - note D_, 9 - rest 2 - note D#, 12 + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 endchannel ; 0x8786 \ No newline at end of file diff --git a/music/sfx/sfx_02_1e.asm b/music/sfx/sfx_02_1e.asm index 0932b9bc..524d67d7 100644 --- a/music/sfx/sfx_02_1e.asm +++ b/music/sfx/sfx_02_1e.asm @@ -1,94 +1,36 @@ SFX_02_1e_Ch1: ; 8bca (2:4bca) dutycycle 240 - note D_, 9 - unknownmusic0xf7 - octave 8 - note C_, 7 - note D_, 7 - octave 2 - octave 3 - note C_, 7 - note D_, 4 - unknownmusic0xf4 - octave 8 - note C_, 7 - note D_, 4 - unknownmusic0xf6 - notetype 0, 0, 6 - note D_, 4 - octave 5 - rest 1 - note C_, 7 - note D_, 5 - unknownmusic0xf2 - note B_, 1 - note C_, 7 - note D_, 16 - note A#, 3 - rest 9 - note C_, 7 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 endchannel SFX_02_1e_Ch2: ; 8be9 (2:4be9) dutycycle 5 - note D_, 4 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 9 - note A#, 8 - note A#, 2 - note C_, 7 - note D_, 7 - note G#, 7 - note A#, 4 - note C_, 7 - note D_, 4 - note G_, 5 - note A#, 2 - note C_, 7 - note D_, 4 - note G_, 7 - note A_, 2 - note C_, 7 - note D_, 4 - note G#, 4 - note G#, 3 - note C_, 7 - note D_, 5 - note A#, 3 - note G_, 2 - note C_, 7 - note D_, 16 - note G_, 3 - note G#, 10 - note C_, 7 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 endchannel SFX_02_1e_Ch3: ; 8c0c (2:4c0c) - note D_, 3 - unknownmusic0xf2 - note D#, 13 - note D_, 9 - octave 4 - note D#, 15 - note D_, 9 - notetype 7, 3, 12 - note D_, 6 - rest 6 - note D#, 12 - note D_, 4 - notetype 4, 2, 12 - note D_, 3 - note B_, 7 - note D#, 13 - note D_, 4 - note A#, 5 - note D_, 13 - note D_, 9 - note A_, 2 - note D#, 13 + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 endchannel ; 0x8c25 \ No newline at end of file diff --git a/music/sfx/sfx_02_1f.asm b/music/sfx/sfx_02_1f.asm index 715a0971..9506fb43 100644 --- a/music/sfx/sfx_02_1f.asm +++ b/music/sfx/sfx_02_1f.asm @@ -1,98 +1,38 @@ SFX_02_1f_Ch1: ; 8a5b (2:4a5b) dutycycle 204 - note D_, 5 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 5 - octave 7 - note G#, 1 - note C_, 8 - note D_, 5 - notetype 1, 4, 0 - note C_, 8 - note D_, 5 - octave 7 - note E_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 - note D_, 5 - notetype 1, 0, 0 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 5 - notetype 1, 8, 2 - note C_, 8 - note D_, 5 - rest 2 - note E_, 3 - note C_, 8 - note D_, 9 - note B_, 2 - note E_, 2 - note C_, 8 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 endchannel SFX_02_1f_Ch2: ; 8a86 (2:4a86) dutycycle 68 - note D_, 13 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 5 - octave 7 - note G#, 3 - note C_, 8 - note D_, 5 - notetype 1, 4, 1 - note C_, 8 - note D_, 5 - octave 7 - note E_, 2 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note G#, 3 - note C_, 8 - note D_, 9 - notetype 1, 0, 1 - note C_, 8 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 endchannel SFX_02_1f_Ch3: ; 8aa5 (2:4aa5) - note D_, 16 - note C_, 9 - note C_, 1 - note D_, 5 - note C_, 9 - note C_, 1 - note D_, 5 - notetype 1, 4, 12 - note D_, 5 - note B_, 2 - note D_, 13 - note D_, 5 - notetype 1, 3, 12 - note D_, 5 - note B_, 2 - note D#, 13 - note D_, 5 - rest 2 - note D_, 13 - note D_, 9 - note A#, 2 - note E_, 13 + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 endchannel ; 0x8abe \ No newline at end of file diff --git a/music/sfx/sfx_02_20.asm b/music/sfx/sfx_02_20.asm index c242647e..00923339 100644 --- a/music/sfx/sfx_02_20.asm +++ b/music/sfx/sfx_02_20.asm @@ -1,78 +1,28 @@ SFX_02_20_Ch1: ; 8abe (2:4abe) dutycycle 204 - note D_, 9 - unknownmusic0xf5 - note C_, 1 - note C_, 7 - note D_, 3 - notetype 2, 3, 8 - note C_, 7 - note D_, 3 - rest 3 - note D#, 1 - note C_, 7 - note D_, 3 - rest 3 - note D_, 9 - note C_, 7 - note D_, 3 - note B_, 3 - note D_, 1 - note C_, 7 - note D_, 3 - note B_, 3 - note C#, 1 - note C_, 7 - note D_, 3 - note A#, 3 - note C#, 9 - note C_, 7 - note D_, 3 - note B_, 3 - note C#, 1 - note C_, 7 - note D_, 9 - rest 2 - note D_, 1 - note C_, 7 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 endchannel SFX_02_20_Ch2: ; 8ae5 (2:4ae5) dutycycle 68 - note D_, 13 - rest 4 - rest 1 - note C_, 6 - note D_, 4 - note B_, 2 - unknownmusic0xf9 - note C_, 6 - note D_, 3 - note A#, 2 - unknownmusic0xf1 - note C_, 6 - note D_, 3 - note A#, 2 - unknownmusic0xe9 - note C_, 6 - note D_, 3 - note A_, 2 - octave 7 - note C_, 6 - note D_, 3 - note A_, 2 - notetype 9, 0, 5 - note D_, 3 - note G#, 2 - notetype 1, 0, 5 - note D_, 3 - note A_, 2 - notetype 9, 0, 5 - note D_, 9 - note A_, 2 - octave 7 - note C_, 6 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 SFX_02_20_Ch3: ; 8b0b (2:4b0b) diff --git a/music/sfx/sfx_02_21.asm b/music/sfx/sfx_02_21.asm index 268204a8..60ecb431 100644 --- a/music/sfx/sfx_02_21.asm +++ b/music/sfx/sfx_02_21.asm @@ -1,106 +1,41 @@ SFX_02_21_Ch1: ; 8b2a (2:4b2a) dutycycle 136 - note D_, 6 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note D_, 10 - notetype 1, 6, 0 - note C_, 7 - note D_, 6 - octave 6 - note C#, 3 - note C_, 7 - note D_, 10 - rest 2 - note D_, 3 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 1 - note C_, 7 - note D_, 7 - notetype 1, 2, 0 - note C_, 7 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 loopchannel 2, SFX_02_21_Ch1 endchannel SFX_02_21_Ch2: ; 8b49 (2:4b49) dutycycle 64 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 6 - unknownmusic0xf2 - note F_, 2 - note C_, 7 - note D_, 10 - notetype 1, 6, 1 - note C_, 7 - note D_, 6 - octave 6 - note C#, 5 - note C_, 7 - note D_, 9 - rest 2 - note D_, 5 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 2 - note C_, 7 - note D_, 13 - notetype 1, 2, 1 - note C_, 7 - note D_, 6 - octave 6 - note C#, 5 - note C_, 7 - note D_, 9 - rest 2 - note D_, 5 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 2 - note C_, 7 - note D_, 5 - notetype 1, 2, 1 - note C_, 7 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 endchannel SFX_02_21_Ch3: ; 8b78 (2:4b78) - note D_, 7 - notetype 2, 1, 12 - note D_, 10 - note B_, 2 - note D_, 13 - note D_, 9 - rest 3 - note D_, 13 - note D_, 10 - note B_, 2 - note D#, 13 - note D_, 7 - rest 3 - note D_, 13 - note D_, 10 - note A#, 3 - note D#, 13 - note D_, 8 - rest 3 - note D_, 13 - note D_, 6 - note A#, 2 - note D#, 13 - note D_, 10 - rest 3 - note D_, 13 - note D_, 5 - note A#, 2 - note D#, 13 + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 endchannel ; 0x8b97 \ No newline at end of file diff --git a/music/sfx/sfx_02_22.asm b/music/sfx/sfx_02_22.asm index 502c7f2a..3f7a2783 100644 --- a/music/sfx/sfx_02_22.asm +++ b/music/sfx/sfx_02_22.asm @@ -1,54 +1,24 @@ SFX_02_22_Ch1: ; 89af (2:49af) dutycycle 165 - note D_, 5 - octave 7 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf2 - note G#, 1 - note C_, 8 - note D_, 3 - note A_, 3 - note E_, 1 - note C_, 8 - note D_, 9 - octave 7 - note C_, 1 - note C_, 7 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 endchannel SFX_02_22_Ch2: ; 89c2 (2:49c2) dutycycle 10 - note D_, 5 - note B_, 2 - octave 7 - note C_, 7 - note D_, 4 - rest 3 - octave 7 - note C_, 7 - note D_, 4 - note F#, 3 - note G#, 2 - note C_, 7 - note D_, 9 - note B_, 2 - octave 7 - note C_, 6 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 endchannel SFX_02_22_Ch3: ; 89d5 (2:49d5) - note D_, 3 - note F#, 2 - note D#, 3 - note D_, 3 - note F#, 2 - note D_, 2 - note D_, 9 - note F#, 2 - note C#, 2 + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 endchannel ; 0x89df \ No newline at end of file diff --git a/music/sfx/sfx_02_23.asm b/music/sfx/sfx_02_23.asm index 4660b743..c7e0a345 100644 --- a/music/sfx/sfx_02_23.asm +++ b/music/sfx/sfx_02_23.asm @@ -1,75 +1,30 @@ SFX_02_23_Ch1: ; 88f1 (2:48f1) dutycycle 241 - note D_, 5 - unknownmusic0xf7 - rest 1 - note C_, 8 - note D_, 13 - octave 2 - rest 3 - note C_, 8 - note D_, 7 - note B_, 6 - note G#, 1 - note C_, 7 - note D_, 5 - rest 5 - note G_, 1 - note C_, 7 - note D_, 5 - note B_, 6 - note F#, 1 - note C_, 7 - note D_, 9 - rest 2 - note E_, 1 - note C_, 7 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 endchannel SFX_02_23_Ch2: ; 890c (2:490c) dutycycle 204 - note D_, 4 - rest 8 - note G#, 2 - note C_, 8 - note D_, 13 - note B_, 7 - note G#, 1 - note C_, 8 - note D_, 7 - note A#, 6 - note E_, 2 - note C_, 7 - note D_, 5 - rest 5 - note D#, 3 - note C_, 7 - note D_, 7 - note B_, 6 - note D_, 2 - note C_, 7 - note D_, 9 - note A#, 2 - note C_, 3 - note C_, 7 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 endchannel SFX_02_23_Ch3: ; 8927 (2:4927) - note D_, 4 - octave 4 - note D#, 13 - note D_, 13 - notetype 6, 2, 12 - note D_, 5 - octave 4 - note D#, 13 - note D_, 9 - note B_, 8 - note F_, 13 - note D_, 16 - rest 3 - note F_, 14 + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 endchannel ; 0x8937 \ No newline at end of file diff --git a/music/sfx/sfx_02_24.asm b/music/sfx/sfx_02_24.asm index d35f1fc2..f092bae9 100644 --- a/music/sfx/sfx_02_24.asm +++ b/music/sfx/sfx_02_24.asm @@ -1,83 +1,32 @@ SFX_02_24_Ch1: ; 8937 (2:4937) dutycycle 201 - note D_, 9 - unknownmusic0xf7 - note G#, 1 - note C_, 7 - note D_, 3 - unknownmusic0xf7 - note F#, 1 - note C_, 7 - note D_, 2 - octave 1 - note E_, 1 - note C_, 7 - note D_, 2 - octave 1 - note D_, 1 - note C_, 7 - note D_, 16 - notetype 1, 0, 0 - note C_, 7 - note D_, 5 - rest 8 - note E_, 1 - note C_, 8 - note D_, 5 - note A#, 8 - note D#, 1 - note C_, 8 - note D_, 16 - note A_, 2 - note D_, 1 - note C_, 8 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 endchannel SFX_02_24_Ch2: ; 895a (2:495a) dutycycle 121 - note D_, 11 - octave 1 - note G#, 3 - note C_, 7 - note D_, 3 - octave 1 - note F#, 3 - note C_, 7 - note D_, 2 - notetype 7, 4, 2 - note C_, 7 - note D_, 2 - notetype 7, 2, 2 - note C_, 7 - note D_, 16 - rest 2 - note C_, 3 - note C_, 7 - note D_, 5 - note B_, 8 - note E_, 3 - note C_, 8 - note D_, 3 - note A_, 8 - note D#, 3 - note C_, 8 - note D_, 16 - note G#, 2 - note D_, 3 - note C_, 8 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 endchannel SFX_02_24_Ch3: ; 897d (2:497d) - note D_, 5 - note G_, 5 - note D_, 2 - note D_, 5 - note G_, 5 - note C#, 1 - note D_, 5 - note G_, 2 - note D_, 1 + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 endchannel ; 0x8987 \ No newline at end of file diff --git a/music/sfx/sfx_02_25.asm b/music/sfx/sfx_02_25.asm index 83e8e020..4025d4f7 100644 --- a/music/sfx/sfx_02_25.asm +++ b/music/sfx/sfx_02_25.asm @@ -1,87 +1,35 @@ SFX_02_25_Ch1: ; 8813 (2:4813) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - note A#, 1 - note C_, 8 - note D_, 9 - octave 2 - note A#, 5 - note C_, 8 - note D_, 5 - notetype 6, 10, 0 - note C_, 8 - note D_, 16 - notetype 3, 2, 0 - note C_, 8 - note D_, 9 - rest 4 - note D_, 4 - note C_, 8 - note D_, 3 - rest 3 - note D_, 9 - note C_, 8 - note D_, 9 - note B_, 2 - note D#, 1 - note C_, 8 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 endchannel SFX_02_25_Ch2: ; 8832 (2:4832) dutycycle 10 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 7 - note A#, 8 - note E_, 2 - note C_, 8 - note D_, 9 - note G#, 7 - note E_, 4 - note C_, 8 - note D_, 5 - note G_, 7 - note E_, 2 - note C_, 8 - note D_, 14 - note G#, 4 - rest 3 - note C_, 7 - note D_, 8 - note G_, 4 - rest 2 - note C_, 7 - note D_, 4 - note G#, 3 - rest 13 - note C_, 7 - note D_, 9 - note G_, 2 - notetype 8, 0, 6 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 endchannel SFX_02_25_Ch3: ; 8855 (2:4855) - note D_, 3 - unknownmusic0xf2 - note E_, 13 - note D_, 7 - octave 2 - note D#, 11 - note D_, 5 - notetype 7, 3, 10 - note D_, 7 - notetype 6, 2, 12 - note D_, 9 - octave 3 - note D#, 13 - note D_, 13 - notetype 2, 3, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 endchannel ; 0x886b \ No newline at end of file diff --git a/music/sfx/sfx_02_26.asm b/music/sfx/sfx_02_26.asm index 134a9701..eae085f4 100644 --- a/music/sfx/sfx_02_26.asm +++ b/music/sfx/sfx_02_26.asm @@ -1,52 +1,25 @@ SFX_02_26_Ch1: ; 8d2b (2:4d2b) dutycycle 165 - note D_, 13 - unknownmusic0xf2 - note E_, 1 - note C_, 5 - note D_, 16 - octave 5 - note A#, 1 - note C_, 5 - note D_, 5 - notetype 2, 9, 0 - note C_, 5 - note D_, 9 - notetype 1, 8, 0 - note C_, 5 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 endchannel SFX_02_26_Ch2: ; 8d3e (2:4d3e) dutycycle 238 - note D_, 12 - notetype 2, 3, 8 - note C_, 5 - note D_, 15 - rest 7 - note A_, 9 - note C_, 5 - note D_, 4 - note B_, 3 - note G#, 9 - note C_, 5 - note D_, 9 - note B_, 2 - note G_, 9 - note C_, 5 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 endchannel SFX_02_26_Ch3: ; 8d51 (2:4d51) - note D_, 11 - octave 2 - note F#, 13 - note D_, 16 - notetype 2, 5, 12 - note D_, 4 - rest 3 - note F#, 13 - note D_, 9 - notetype 1, 5, 12 + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 endchannel ; 0x8d5e \ No newline at end of file diff --git a/music/sfx/sfx_02_27.asm b/music/sfx/sfx_02_27.asm index 01a33228..c019aab3 100644 --- a/music/sfx/sfx_02_27.asm +++ b/music/sfx/sfx_02_27.asm @@ -1,74 +1,31 @@ SFX_02_27_Ch1: ; 8d5e (2:4d5e) dutycycle 51 - note D_, 16 - unknownmusic0xf6 - rest 1 - note C_, 6 - note D_, 9 - octave 5 - note B_, 13 - note C_, 6 - note D_, 7 - notetype 2, 13, 0 - note C_, 6 - note D_, 7 - note B_, 3 - octave 8 - note C_, 6 - note D_, 7 - rest 3 - stereopanning 5 - note D_, 9 - note B_, 2 - note C_, 1 - note C_, 7 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 endchannel SFX_02_27_Ch2: ; 8d79 (2:4d79) dutycycle 153 - note D_, 15 - rest 7 - note B_, 2 - note C_, 5 - note D_, 8 - rest 4 - note A#, 14 - note C_, 5 - note D_, 6 - note B_, 3 - rest 2 - note C_, 5 - note D_, 9 - note A_, 3 - notetype 1, 0, 4 - note D_, 7 - note A#, 3 - octave 7 - note C_, 5 - note D_, 9 - note A_, 2 - unknownmusic0xf1 - note C_, 5 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 endchannel SFX_02_27_Ch3: ; 8d94 (2:4d94) - note D_, 11 - octave 2 - note F_, 13 - note D_, 11 - notetype 6, 6, 12 - note D_, 5 - rest 3 - note E_, 13 - note D_, 7 - notetype 3, 5, 12 - note D_, 9 - note B_, 4 - note E_, 13 - note D_, 9 - note A#, 2 - note F_, 13 + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 endchannel ; 0x8da7 \ No newline at end of file diff --git a/music/sfx/sfx_02_28.asm b/music/sfx/sfx_02_28.asm index b8d25f6c..c183df6b 100644 --- a/music/sfx/sfx_02_28.asm +++ b/music/sfx/sfx_02_28.asm @@ -1,44 +1,22 @@ SFX_02_28_Ch1: ; 8da7 (2:4da7) dutycycle 240 - note D_, 9 - octave 4 - note A_, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf5 - rest 1 - note C_, 8 - note D_, 9 - notetype 1, 13, 8 - note C_, 8 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 endchannel SFX_02_28_Ch2: ; 8db6 (2:4db6) dutycycle 165 - note D_, 11 - rest 5 - note G_, 2 - note C_, 8 - note D_, 16 - note B_, 7 - note A#, 3 - note C_, 8 - note D_, 9 - note A#, 2 - note B_, 8 - note C_, 8 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 endchannel SFX_02_28_Ch3: ; 8dc5 (2:4dc5) - note D_, 9 - octave 4 - note E_, 13 - note D_, 15 - rest 5 - note D#, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 endchannel ; 0x8dcf \ No newline at end of file diff --git a/music/sfx/sfx_02_29.asm b/music/sfx/sfx_02_29.asm index 1f857265..872fa90a 100644 --- a/music/sfx/sfx_02_29.asm +++ b/music/sfx/sfx_02_29.asm @@ -1,76 +1,31 @@ SFX_02_29_Ch1: ; 8e35 (2:4e35) dutycycle 240 - note D_, 5 - unknownmusic0xf3 - note G#, 1 - note C_, 8 - note D_, 16 - octave 1 - note C_, 1 - note C_, 8 - note D_, 9 - notetype 3, 1, 0 - note C_, 8 - note D_, 5 - rest 3 - note C_, 1 - note C_, 8 - note D_, 5 - notetype 2, 15, 0 - note C_, 7 - note D_, 9 - rest 2 - octave 8 - note C_, 7 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 endchannel SFX_02_29_Ch2: ; 8e50 (2:4e50) dutycycle 90 - note D_, 7 - rest 4 - note C_, 2 - note C_, 8 - note D_, 15 - note B_, 8 - note G#, 2 - note C_, 7 - note D_, 8 - note B_, 4 - note A_, 3 - note C_, 7 - note D_, 4 - note A#, 3 - note G#, 2 - note C_, 7 - note D_, 5 - note B_, 3 - note G_, 3 - note C_, 7 - note D_, 9 - note A#, 2 - note F#, 2 - note C_, 7 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 endchannel SFX_02_29_Ch3: ; 8e6b (2:4e6b) - note D_, 7 - octave 5 - note F_, 13 - note D_, 15 - notetype 6, 4, 12 - note D_, 7 - rest 7 - note D#, 13 - note D_, 4 - note B_, 4 - note E_, 13 - note D_, 4 - note A#, 3 - note F_, 13 - note D_, 9 - note B_, 2 - note F#, 13 + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 endchannel ; 0x8e7e \ No newline at end of file diff --git a/music/sfx/sfx_02_2a.asm b/music/sfx/sfx_02_2a.asm index ff623a70..f5313860 100644 --- a/music/sfx/sfx_02_2a.asm +++ b/music/sfx/sfx_02_2a.asm @@ -1,44 +1,22 @@ SFX_02_2a_Ch1: ; 8cc8 (2:4cc8) dutycycle 240 - note D_, 16 - notetype 7, 8, 0 - note C_, 8 - note D_, 5 - octave 2 - note A#, 1 - note C_, 8 - note D_, 16 - notetype 2, 4, 0 - note C_, 8 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 endchannel SFX_02_2a_Ch2: ; 8cd7 (2:4cd7) dutycycle 90 - note D_, 16 - rest 8 - note F_, 4 - note C_, 8 - note D_, 6 - note B_, 7 - note G_, 3 - note C_, 8 - note D_, 16 - rest 3 - note C#, 2 - note C_, 8 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 endchannel SFX_02_2a_Ch3: ; 8ce6 (2:4ce6) - note D_, 14 - unknownmusic0xf6 - note E_, 13 - note D_, 5 - octave 2 - note D#, 13 - note D_, 16 - unknownmusic0xf2 - note E_, 13 + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 endchannel ; 0x8cf0 \ No newline at end of file diff --git a/music/sfx/sfx_02_2b.asm b/music/sfx/sfx_02_2b.asm index bfc6e9ca..c0792c94 100644 --- a/music/sfx/sfx_02_2b.asm +++ b/music/sfx/sfx_02_2b.asm @@ -1,56 +1,25 @@ SFX_02_2b_Ch1: ; 8e7e (2:4e7e) dutycycle 15 - note D_, 16 - unknownmusic0xf7 - note C_, 1 - note C_, 6 - note D_, 16 - octave 1 - note C_, 9 - note C_, 6 - note D_, 9 - note B_, 5 - note G#, 1 - note C_, 5 - note D_, 16 - note A#, 3 - note F#, 1 - note C_, 5 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 endchannel SFX_02_2b_Ch2: ; 8e91 (2:4e91) dutycycle 68 - note D_, 15 - notetype 7, 8, 1 - note C_, 5 - note D_, 15 - rest 8 - note G#, 10 - note C_, 5 - note D_, 11 - note B_, 5 - note C_, 2 - note C_, 5 - note D_, 16 - rest 3 - octave 7 - note C_, 4 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 endchannel SFX_02_2b_Ch3: ; 8ea4 (2:4ea4) - note D_, 15 - unknownmusic0xf7 - note G_, 13 - note D_, 13 - unknownmusic0xf6 - note F#, 13 - note D_, 10 - octave 4 - note G_, 13 - note D_, 16 - octave 6 - note F#, 13 + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 endchannel ; 0x8eb1 \ No newline at end of file diff --git a/music/sfx/sfx_02_2c.asm b/music/sfx/sfx_02_2c.asm index b61163f9..e923c9e1 100644 --- a/music/sfx/sfx_02_2c.asm +++ b/music/sfx/sfx_02_2c.asm @@ -1,90 +1,35 @@ SFX_02_2c_Ch1: ; 8f8e (2:4f8e) dutycycle 80 - note D_, 11 - unknownmusic0xf5 - note G#, 1 - note C_, 7 - note D_, 4 - octave 6 - note A#, 1 - note C_, 7 - note D_, 4 - unknownmusic0xf2 - rest 1 - note C_, 7 - note D_, 4 - octave 6 - octave 8 - note C_, 7 - note D_, 4 - notetype 2, 0, 0 - note C_, 8 - note D_, 4 - rest 3 - octave 8 - note C_, 7 - note D_, 4 - notetype 2, 12, 0 - note C_, 7 - note D_, 9 - rest 2 - note A#, 1 - note C_, 7 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 endchannel SFX_02_2c_Ch2: ; 8fb1 (2:4fb1) dutycycle 15 - note D_, 10 - notetype 5, 3, 1 - note C_, 7 - note D_, 4 - notetype 2, 5, 2 - note C_, 7 - note D_, 4 - octave 6 - note G_, 2 - note C_, 7 - note D_, 4 - note B_, 3 - note A_, 2 - note C_, 7 - note D_, 4 - rest 3 - note B_, 3 - note C_, 7 - note D_, 4 - note B_, 3 - note A_, 2 - note C_, 7 - note D_, 4 - rest 3 - note G_, 2 - note C_, 7 - note D_, 9 - note B_, 2 - note F_, 2 - note C_, 7 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 endchannel SFX_02_2c_Ch3: ; 8fd4 (2:4fd4) - note D_, 7 - octave 5 - note E_, 13 - note D_, 5 - rest 4 - note D#, 13 - note D_, 6 - notetype 4, 3, 12 - note D_, 5 - rest 5 - note D_, 13 - note D_, 7 - note B_, 5 - note D#, 13 - note D_, 9 - rest 2 - note D_, 13 + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 endchannel ; 0x8fe7 \ No newline at end of file diff --git a/music/sfx/sfx_02_2d.asm b/music/sfx/sfx_02_2d.asm index 574b6ad2..70e71eb1 100644 --- a/music/sfx/sfx_02_2d.asm +++ b/music/sfx/sfx_02_2d.asm @@ -1,36 +1,17 @@ SFX_02_2d_Ch1: ; 8ca6 (2:4ca6) dutycycle 27 - note D_, 8 - notetype 2, 4, 0 - note C_, 8 - note D_, 16 - octave 3 - note F#, 1 - note C_, 8 - note D_, 16 - rest 2 - note D#, 1 - note C_, 8 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 endchannel SFX_02_2d_Ch2: ; 8cb5 (2:4cb5) dutycycle 129 - note D_, 3 - rest 3 - note C_, 2 - note C_, 8 - note D_, 5 - rest 3 - note C_, 9 - note C_, 8 - note D_, 16 - notetype 7, 4, 1 - note C_, 8 - note D_, 16 - note A#, 3 - note C_, 2 - note C_, 8 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 SFX_02_2d_Ch3: ; 8cc7 (2:4cc7) diff --git a/music/sfx/sfx_02_2e.asm b/music/sfx/sfx_02_2e.asm index 90a2a145..d95bfbe3 100644 --- a/music/sfx/sfx_02_2e.asm +++ b/music/sfx/sfx_02_2e.asm @@ -1,74 +1,31 @@ SFX_02_2e_Ch1: ; 8eff (2:4eff) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - note E_, 1 - note C_, 8 - note D_, 13 - octave 2 - note E_, 5 - note C_, 8 - note D_, 7 - notetype 5, 5, 0 - note C_, 8 - note D_, 5 - rest 4 - note F#, 1 - note C_, 8 - note D_, 4 - rest 4 - note G#, 1 - note C_, 8 - note D_, 9 - notetype 1, 10, 0 - note C_, 8 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 endchannel SFX_02_2e_Ch2: ; 8f1a (2:4f1a) dutycycle 10 - note D_, 7 - rest 8 - note C_, 2 - note C_, 8 - note D_, 12 - note B_, 7 - note C_, 3 - note C_, 8 - note D_, 7 - note A#, 6 - note C#, 2 - note C_, 8 - note D_, 5 - note A_, 4 - note D_, 2 - note C_, 8 - note D_, 4 - note A#, 4 - note E_, 2 - note C_, 8 - note D_, 9 - note A_, 2 - note F#, 3 - note C_, 8 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 endchannel SFX_02_2e_Ch3: ; 8f35 (2:4f35) - note D_, 4 - octave 6 - note D#, 13 - note D_, 9 - notetype 6, 4, 12 - note D_, 6 - notetype 4, 3, 12 - note D_, 13 - rest 8 - note E_, 13 - note D_, 3 - octave 6 - note D#, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 endchannel ; 0x8f48 \ No newline at end of file diff --git a/music/sfx/sfx_02_2f.asm b/music/sfx/sfx_02_2f.asm index 918ab86f..08ea2788 100644 --- a/music/sfx/sfx_02_2f.asm +++ b/music/sfx/sfx_02_2f.asm @@ -1,61 +1,27 @@ SFX_02_2f_Ch1: ; 8cf0 (2:4cf0) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - rest 1 - note C_, 7 - note D_, 16 - octave 1 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf4 - stereopanning 6 - note D_, 5 - octave 4 - octave 8 - note C_, 7 - note D_, 9 - notetype 1, 13, 0 - note C_, 7 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 endchannel SFX_02_2f_Ch2: ; 8d07 (2:4d07) dutycycle 10 - note D_, 8 - octave 2 - note G#, 2 - note C_, 7 - note D_, 15 - notetype 5, 12, 1 - note C_, 7 - note D_, 5 - rest 5 - note B_, 2 - note C_, 7 - note D_, 5 - notetype 4, 10, 1 - note C_, 7 - note D_, 9 - rest 2 - note A_, 2 - note C_, 7 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 endchannel SFX_02_2f_Ch3: ; 8d1e (2:4d1e) - note D_, 11 - note A#, 7 - note D#, 13 - note D_, 15 - note A_, 5 - note D_, 13 - note D_, 6 - note A#, 4 - note D#, 13 - note D_, 9 - note A_, 2 - note D_, 13 + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 endchannel ; 0x8d2b \ No newline at end of file diff --git a/music/sfx/sfx_02_30.asm b/music/sfx/sfx_02_30.asm index 80a392a8..7131fc1a 100644 --- a/music/sfx/sfx_02_30.asm +++ b/music/sfx/sfx_02_30.asm @@ -1,80 +1,32 @@ SFX_02_30_Ch1: ; 8eb1 (2:4eb1) dutycycle 245 - note D_, 8 - notetype 6, 14, 1 - note C_, 8 - note D_, 7 - rest 7 - octave 6 - note C_, 8 - note D_, 10 - notetype 6, 14, 1 - note C_, 8 - note D_, 8 - rest 7 - octave 8 - note C_, 8 - note D_, 6 - note B_, 7 - octave 6 - note C_, 8 - note D_, 8 - rest 7 - octave 7 - note C_, 8 - note D_, 7 - note B_, 7 - octave 8 - note C_, 8 - note D_, 9 - note A#, 2 - notetype 15, 0, 7 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 endchannel SFX_02_30_Ch2: ; 8ed4 (2:4ed4) dutycycle 68 - note D_, 7 - rest 4 - rest 10 - note C_, 8 - note D_, 7 - note B_, 4 - rest 8 - note C_, 8 - note D_, 11 - rest 5 - rest 4 - note C_, 8 - note D_, 9 - note B_, 5 - rest 8 - note C_, 8 - note D_, 7 - rest 4 - rest 10 - note C_, 8 - note D_, 16 - note A#, 3 - rest 6 - note C_, 8 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 endchannel SFX_02_30_Ch3: ; 8eef (2:4eef) - note D_, 14 - note C#, 10 - note G_, 13 - note D_, 14 - unknownmusic0xf7 - note G#, 13 - note D_, 13 - notetype 6, 7, 12 - note D_, 9 - rest 5 - note F#, 13 - note D_, 16 - note B_, 4 - note F_, 13 + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 endchannel ; 0x8eff \ No newline at end of file diff --git a/music/sfx/sfx_02_31.asm b/music/sfx/sfx_02_31.asm index 2a451e50..79d09433 100644 --- a/music/sfx/sfx_02_31.asm +++ b/music/sfx/sfx_02_31.asm @@ -1,72 +1,30 @@ SFX_02_31_Ch1: ; 8f48 (2:4f48) dutycycle 244 - note D_, 16 - stereopanning 5 - note C_, 8 - note D_, 11 - octave 8 - note C_, 1 - note C_, 8 - note D_, 7 - note B_, 5 - note C#, 1 - note C_, 8 - note D_, 5 - notetype 3, 0, 0 - note C_, 8 - note D_, 7 - note B_, 3 - note D_, 1 - note C_, 7 - note D_, 9 - note A#, 2 - note D_, 5 - note C_, 7 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 endchannel SFX_02_31_Ch2: ; 8f63 (2:4f63) dutycycle 34 - note D_, 16 - note B_, 1 - rest 4 - note C_, 7 - note D_, 11 - note A#, 1 - rest 2 - note C_, 7 - note D_, 7 - note G#, 5 - notetype 2, 0, 6 - note D_, 5 - note A_, 4 - rest 2 - note C_, 7 - note D_, 7 - note G#, 3 - octave 7 - note C_, 6 - note D_, 9 - note F#, 2 - unknownmusic0xe8 - note C_, 6 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 endchannel SFX_02_31_Ch3: ; 8f7e (2:4f7e) - note D_, 7 - octave 2 - note E_, 13 - note D_, 16 - notetype 6, 3, 12 - note D_, 11 - rest 6 - note E_, 11 - note D_, 2 - note B_, 3 - note F_, 12 - note D_, 16 - rest 3 - note E_, 13 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 endchannel ; 0x8f8e \ No newline at end of file diff --git a/music/sfx/sfx_02_32.asm b/music/sfx/sfx_02_32.asm index b58755a1..f2fbf611 100644 --- a/music/sfx/sfx_02_32.asm +++ b/music/sfx/sfx_02_32.asm @@ -1,105 +1,39 @@ SFX_02_32_Ch1: ; 8dcf (2:4dcf) dutycycle 240 - note D_, 7 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note D_, 7 - octave 6 - note E_, 1 - note C_, 7 - note D_, 7 - notetype 2, 8, 0 - note C_, 7 - note D_, 7 - octave 6 - rest 1 - note C_, 7 - note D_, 7 - notetype 2, 0, 0 - note C_, 8 - note D_, 7 - rest 3 - note E_, 1 - note C_, 8 - note D_, 7 - note B_, 3 - note G#, 1 - note C_, 8 - note D_, 9 - note A#, 2 - rest 1 - note C_, 8 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 endchannel SFX_02_32_Ch2: ; 8df2 (2:4df2) dutycycle 17 - note D_, 4 - note C_, 9 - note C_, 2 - note C_, 1 - note D_, 7 - rest 3 - rest 2 - note C_, 6 - note D_, 7 - note B_, 3 - note C_, 3 - note C_, 7 - note D_, 7 - note A#, 3 - note E_, 2 - note C_, 7 - note D_, 7 - note B_, 3 - note G#, 3 - note C_, 7 - note D_, 7 - note A#, 3 - rest 3 - note C_, 7 - note D_, 7 - note A_, 3 - note C_, 2 - note C_, 8 - note D_, 7 - note A#, 3 - note E_, 3 - note C_, 8 - note D_, 9 - note G#, 2 - note G#, 2 - note C_, 8 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 endchannel SFX_02_32_Ch3: ; 8e19 (2:4e19) - note D_, 7 - note C_, 9 - note C_, 2 - note D_, 6 - octave 6 - note F_, 13 - note D_, 6 - rest 3 - note E_, 13 - note D_, 6 - notetype 2, 3, 12 - note D_, 6 - note B_, 3 - note D_, 13 - note D_, 6 - rest 3 - note C#, 13 - note D_, 6 - note A#, 3 - note C#, 12 - note D_, 6 - note A_, 3 - note C#, 11 - note D_, 9 - note G#, 2 - note C#, 9 + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 endchannel ; 0x8e35 \ No newline at end of file diff --git a/music/sfx/sfx_02_33.asm b/music/sfx/sfx_02_33.asm index 84abb7aa..f4387a3a 100644 --- a/music/sfx/sfx_02_33.asm +++ b/music/sfx/sfx_02_33.asm @@ -1,54 +1,25 @@ SFX_02_33_Ch1: ; 8fe7 (2:4fe7) dutycycle 165 - note D_, 4 - unknownmusic0xf4 - note E_, 2 - note C_, 7 - note D_, 14 - notetype 6, 2, 1 - note C_, 8 - note D_, 9 - unknownmusic0xf4 - note C#, 10 - note C_, 8 - note D_, 9 - rest 2 - note C#, 11 - note C_, 8 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 endchannel SFX_02_33_Ch2: ; 8ffa (2:4ffa) dutycycle 204 - note D_, 5 - unknownmusic0xf4 - note G#, 1 - note C_, 6 - note D_, 15 - octave 2 - octave 8 - note C_, 7 - note D_, 9 - notetype 5, 13, 8 - note C_, 7 - note D_, 9 - notetype 1, 13, 12 - note C_, 7 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 endchannel SFX_02_33_Ch3: ; 900d (2:500d) - note D_, 6 - rest 5 - note E_, 7 - note D_, 14 - note A#, 6 - note E_, 5 - note D_, 9 - rest 5 - note E_, 6 - note D_, 9 - note B_, 2 - note E_, 5 + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 endchannel ; 0x901a \ No newline at end of file diff --git a/music/sfx/sfx_02_34.asm b/music/sfx/sfx_02_34.asm index be0bd3b7..4c2fa4cc 100644 --- a/music/sfx/sfx_02_34.asm +++ b/music/sfx/sfx_02_34.asm @@ -1,53 +1,25 @@ SFX_02_34_Ch1: ; 901a (2:501a) dutycycle 240 - note D_, 14 - unknownmusic0xf1 - note C#, 2 - note C_, 6 - note D_, 14 - octave 7 - note C#, 6 - note C_, 6 - note D_, 14 - octave 7 - note C#, 2 - note C_, 6 - note D_, 9 - notetype 1, 1, 1 - note C_, 6 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 endchannel SFX_02_34_Ch2: ; 902d (2:502d) dutycycle 21 - note D_, 13 - octave 7 - note C_, 13 - note C_, 6 - note D_, 13 - notetype 1, 1, 0 - note C_, 6 - note D_, 15 - rest 2 - note C_, 13 - note C_, 6 - note D_, 9 - rest 2 - note C_, 11 - note C_, 6 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 endchannel SFX_02_34_Ch3: ; 9040 (2:5040) - note D_, 15 - unknownmusic0xf2 - note F#, 6 - note D_, 14 - octave 6 - note F_, 6 - note D_, 15 - notetype 2, 5, 6 - note D_, 9 - notetype 1, 6, 6 + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 endchannel ; 0x904d \ No newline at end of file diff --git a/music/sfx/sfx_02_35.asm b/music/sfx/sfx_02_35.asm index 70f4a2d8..33685f61 100644 --- a/music/sfx/sfx_02_35.asm +++ b/music/sfx/sfx_02_35.asm @@ -1,69 +1,26 @@ SFX_02_35_Ch1: ; 904d (2:504d) dutycycle 27 - note D_, 4 - unknownmusic0xf3 - note F#, 5 - note C_, 6 - note D_, 3 - octave 6 - note E_, 5 - note C_, 6 - note D_, 6 - notetype 1, 2, 2 - note C_, 6 - note D_, 3 - note B_, 3 - note G#, 5 - note C_, 5 - note D_, 9 - notetype 1, 10, 2 - note C_, 5 - note D_, 4 - unknownmusic0xf3 - note D_, 5 - note C_, 6 - note D_, 5 - octave 4 - octave 4 - note C_, 5 - note D_, 9 - notetype 1, 0, 2 - note C_, 6 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 endchannel SFX_02_35_Ch2: ; 9070 (2:5070) dutycycle 204 - note D_, 4 - notetype 3, 6, 0 - note C_, 6 - note D_, 3 - rest 3 - note E_, 1 - note C_, 6 - note D_, 6 - rest 2 - note D_, 1 - note C_, 6 - note D_, 3 - note A_, 3 - note G#, 1 - note C_, 5 - note D_, 9 - rest 2 - note A#, 1 - note C_, 5 - note D_, 4 - notetype 3, 2, 0 - note C_, 6 - note D_, 4 - rest 5 - octave 8 - note C_, 5 - note D_, 9 - rest 2 - note C_, 1 - note C_, 6 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 SFX_02_35_Ch3: ; 9092 (2:5092) diff --git a/music/sfx/sfx_02_36.asm b/music/sfx/sfx_02_36.asm index 776d5d64..e648e3dd 100644 --- a/music/sfx/sfx_02_36.asm +++ b/music/sfx/sfx_02_36.asm @@ -1,56 +1,25 @@ SFX_02_36_Ch1: ; 9093 (2:5093) dutycycle 17 - note D_, 3 - note D#, 14 - note G#, 2 - note C_, 4 - note D_, 8 - unknownmusic0xf5 - note C_, 2 - note C_, 7 - note D_, 2 - rest 3 - note G#, 2 - note C_, 5 - note D_, 9 - note A_, 2 - note G#, 2 - note C_, 4 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 endchannel SFX_02_36_Ch2: ; 90a6 (2:50a6) dutycycle 238 - note D_, 3 - note D#, 15 - note B_, 1 - note C_, 6 - note D_, 8 - notetype 5, 5, 13 - note C_, 8 - note D_, 2 - note B_, 3 - note B_, 1 - note C_, 7 - note D_, 9 - note F#, 2 - note B_, 1 - note C_, 6 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 endchannel SFX_02_36_Ch3: ; 90b9 (2:50b9) - note D_, 3 - note A_, 3 - note E_, 10 - note D_, 8 - note B_, 6 - note D_, 10 - note D_, 2 - note A#, 3 - note D#, 10 - note D_, 9 - note A_, 2 - note E_, 10 + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 endchannel ; 0x90c6 \ No newline at end of file diff --git a/music/sfx/sfx_02_37.asm b/music/sfx/sfx_02_37.asm index 6a0591bb..0fc80e1a 100644 --- a/music/sfx/sfx_02_37.asm +++ b/music/sfx/sfx_02_37.asm @@ -1,59 +1,26 @@ SFX_02_37_Ch1: ; 8786 (2:4786) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - rest 1 - note C_, 8 - note D_, 7 - octave 4 - rest 2 - note C_, 8 - note D_, 11 - unknownmusic0xf6 - rest 1 - note C_, 8 - note D_, 5 - notetype 3, 12, 2 - note C_, 8 - note D_, 9 - rest 2 - rest 1 - note C_, 8 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 endchannel SFX_02_37_Ch2: ; 879d (2:479d) dutycycle 95 - note D_, 16 - note A_, 8 - note G#, 2 - note C_, 8 - note D_, 7 - note G#, 5 - note G#, 1 - note C_, 8 - note D_, 11 - note A_, 7 - note G#, 2 - note C_, 8 - note D_, 16 - note G#, 4 - note G#, 2 - note C_, 8 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 endchannel SFX_02_37_Ch3: ; 87b0 (2:47b0) - note D_, 4 - unknownmusic0xf2 - note D#, 13 - note D_, 14 - octave 2 - note D_, 13 - note D_, 16 - notetype 7, 3, 12 - note D_, 9 - rest 2 - note D_, 13 + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 endchannel ; 0x87bd \ No newline at end of file diff --git a/music/sfx/sfx_02_38.asm b/music/sfx/sfx_02_38.asm index b020e2e5..2c982a3d 100644 --- a/music/sfx/sfx_02_38.asm +++ b/music/sfx/sfx_02_38.asm @@ -1,88 +1,34 @@ SFX_02_38_Ch1: ; 87bd (2:47bd) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - note G#, 1 - note C_, 7 - note D_, 11 - octave 2 - note G#, 5 - note C_, 7 - note D_, 16 - notetype 7, 9, 0 - note C_, 7 - note D_, 9 - notetype 5, 9, 0 - note C_, 7 - note D_, 7 - rest 5 - note G#, 9 - note C_, 7 - note D_, 6 - notetype 3, 7, 0 - note C_, 7 - note D_, 5 - notetype 3, 6, 0 - note C_, 7 - note D_, 9 - rest 2 - note E_, 1 - note C_, 7 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 endchannel SFX_02_38_Ch2: ; 87e0 (2:47e0) dutycycle 5 - note D_, 16 - note B_, 8 - note E_, 2 - note C_, 7 - note D_, 11 - note A_, 7 - note E_, 3 - note C_, 7 - note D_, 16 - note A#, 8 - note F_, 2 - note C_, 7 - note D_, 9 - note A#, 6 - note F_, 2 - note C_, 7 - note D_, 7 - note A_, 5 - note E_, 8 - note C_, 7 - note D_, 6 - note A#, 4 - note D#, 2 - note C_, 7 - note D_, 5 - note A_, 4 - note D_, 3 - note C_, 7 - note D_, 9 - note G_, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 endchannel SFX_02_38_Ch3: ; 8803 (2:4803) - note D_, 16 - octave 4 - note D#, 13 - note D_, 11 - rest 8 - note E_, 13 - note D_, 11 - rest 8 - note D#, 13 - note D_, 13 - note B_, 8 - note E_, 13 - note D_, 16 - note A#, 3 - note F_, 13 + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 endchannel ; 0x8813 \ No newline at end of file diff --git a/music/sfx/sfx_02_39.asm b/music/sfx/sfx_02_39.asm index c85aa022..5aa9b436 100644 --- a/music/sfx/sfx_02_39.asm +++ b/music/sfx/sfx_02_39.asm @@ -1,63 +1,27 @@ SFX_02_39_Ch1: ; 886b (2:486b) dutycycle 165 - note D_, 7 - unknownmusic0xf4 - note E_, 1 - note C_, 8 - note D_, 16 - octave 5 - note D#, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf4 - note E_, 1 - note C_, 8 - note D_, 6 - note B_, 4 - note E_, 9 - note C_, 8 - note D_, 9 - notetype 1, 5, 0 - note C_, 8 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 endchannel SFX_02_39_Ch2: ; 8882 (2:4882) dutycycle 119 - note D_, 7 - rest 4 - note C#, 3 - note C_, 8 - note D_, 16 - note B_, 4 - note C_, 5 - note C_, 8 - note D_, 4 - rest 4 - note C#, 3 - note C_, 8 - note D_, 5 - rest 4 - note D_, 2 - note C_, 8 - note D_, 9 - note B_, 2 - note D#, 3 - note C_, 8 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 endchannel SFX_02_39_Ch3: ; 8899 (2:4899) - note D_, 9 - notetype 6, 2, 12 - note D_, 13 - rest 7 - note D#, 13 - note D_, 11 - note B_, 7 - note D_, 13 - note D_, 9 - note A_, 2 - note C#, 13 + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 endchannel ; 0x88a6 \ No newline at end of file diff --git a/music/sfx/sfx_02_3a.asm b/music/sfx/sfx_02_3a.asm index 6df6ea30..35808c35 100644 --- a/music/sfx/sfx_02_3a.asm +++ b/music/sfx/sfx_02_3a.asm @@ -1,10 +1,10 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 vibrato 6, 2, 6 duty 2 - unknownmusic0xe8 + togglecall notetype 4, 11, 1 octave 3 note G#, 2 @@ -17,7 +17,7 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77) SFX_02_3a_Ch2: ; ad8e (2:6d8e) - unknownmusic0xf8 + executemusic vibrato 8, 2, 7 duty 2 notetype 4, 12, 1 @@ -31,7 +31,7 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e) SFX_02_3a_Ch3: ; ad9e (2:6d9e) - unknownmusic0xf8 + executemusic notetype 4, 1, 0 octave 4 note B_, 1 diff --git a/music/sfx/sfx_02_3b.asm b/music/sfx/sfx_02_3b.asm index e851055d..538f2462 100644 --- a/music/sfx/sfx_02_3b.asm +++ b/music/sfx/sfx_02_3b.asm @@ -1,9 +1,9 @@ SFX_02_3b_Ch1: ; b316 (2:7316) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 5, 11, 4 octave 4 note D_, 4 @@ -26,7 +26,7 @@ SFX_02_3b_Ch1: ; b316 (2:7316) SFX_02_3b_Ch2: ; b335 (2:7335) - unknownmusic0xf8 + executemusic vibrato 8, 2, 7 duty 2 notetype 5, 12, 5 @@ -47,7 +47,7 @@ SFX_02_3b_Ch2: ; b335 (2:7335) SFX_02_3b_Ch3: ; b34d (2:734d) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 5 note F_, 4 diff --git a/music/sfx/sfx_02_3c.asm b/music/sfx/sfx_02_3c.asm index 686140e3..e695705e 100644 --- a/music/sfx/sfx_02_3c.asm +++ b/music/sfx/sfx_02_3c.asm @@ -1,18 +1,9 @@ SFX_02_3c_Ch1: ; 840a (2:440a) duty 2 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 3 - note C#, 1 - note D_, 3 - note D_, 9 - octave 6 - note C_, 1 - note C_, 3 - note C#, 1 - note C_, 9 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 endchannel ; 0x841b \ No newline at end of file diff --git a/music/sfx/sfx_02_3d.asm b/music/sfx/sfx_02_3d.asm index e251802e..206c0c35 100644 --- a/music/sfx/sfx_02_3d.asm +++ b/music/sfx/sfx_02_3d.asm @@ -1,15 +1,8 @@ SFX_02_3d_Ch1: ; 84b7 (2:44b7) duty 2 - note C#, 1 - note C#, 8 - note D_, 16 - stereopanning 240 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 endchannel ; 0x84c6 \ No newline at end of file diff --git a/music/sfx/sfx_02_3e.asm b/music/sfx/sfx_02_3e.asm index de8f673d..18d49ff3 100644 --- a/music/sfx/sfx_02_3e.asm +++ b/music/sfx/sfx_02_3e.asm @@ -1,22 +1,10 @@ SFX_02_3e_Ch1: ; 84d9 (2:44d9) duty 2 - note C#, 1 - note C#, 5 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note C#, 1 - note C#, 8 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 endchannel ; 0x84ee \ No newline at end of file diff --git a/music/sfx/sfx_02_3f.asm b/music/sfx/sfx_02_3f.asm index 2d46b12c..b7009e79 100644 --- a/music/sfx/sfx_02_3f.asm +++ b/music/sfx/sfx_02_3f.asm @@ -1,9 +1,5 @@ SFX_02_3f_Ch1: ; 83c3 (2:43c3) - note D_, 2 - octave 6 - note D#, 4 - note D_, 9 - octave 7 - note D_, 3 + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 endchannel ; 0x83ca \ No newline at end of file diff --git a/music/sfx/sfx_02_40.asm b/music/sfx/sfx_02_40.asm index 3e00e906..a5789282 100644 --- a/music/sfx/sfx_02_40.asm +++ b/music/sfx/sfx_02_40.asm @@ -1,18 +1,8 @@ SFX_02_40_Ch1: ; 8462 (2:4462) duty 2 - note D_, 1 - note A_, 2 - rest 1 - note C_, 8 - note D_, 1 - note G#, 2 - notetype 0, 0, 7 - note D_, 1 - note A_, 2 - rest 1 - note C_, 8 - note D_, 13 - note A#, 2 - notetype 0, 0, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 endchannel ; 0x8475 \ No newline at end of file diff --git a/music/sfx/sfx_02_41.asm b/music/sfx/sfx_02_41.asm index 776eb01e..4ba0eb14 100644 --- a/music/sfx/sfx_02_41.asm +++ b/music/sfx/sfx_02_41.asm @@ -1,5 +1,5 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 @@ -22,7 +22,7 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8) SFX_02_41_Ch2: ; b2e1 (2:72e1) - unknownmusic0xf8 + executemusic duty 2 notetype 5, 12, 2 octave 5 @@ -45,7 +45,7 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1) SFX_02_41_Ch3: ; b2f7 (2:72f7) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 5 note C_, 1 diff --git a/music/sfx/sfx_02_42.asm b/music/sfx/sfx_02_42.asm index 89f7e427..e9112a02 100644 --- a/music/sfx/sfx_02_42.asm +++ b/music/sfx/sfx_02_42.asm @@ -1,9 +1,9 @@ SFX_02_42_Ch1: ; b362 (2:7362) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 5, 10, 4 octave 3 note A#, 4 @@ -24,7 +24,7 @@ SFX_02_42_Ch1: ; b362 (2:7362) SFX_02_42_Ch2: ; b381 (2:7381) - unknownmusic0xf8 + executemusic vibrato 4, 2, 3 duty 2 notetype 5, 13, 1 @@ -48,7 +48,7 @@ SFX_02_42_Ch2: ; b381 (2:7381) SFX_02_42_Ch3: ; b39d (2:739d) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 4 note D#, 4 diff --git a/music/sfx/sfx_02_43.asm b/music/sfx/sfx_02_43.asm index b7bcabab..c8f88914 100644 --- a/music/sfx/sfx_02_43.asm +++ b/music/sfx/sfx_02_43.asm @@ -1,17 +1,9 @@ SFX_02_43_Ch1: ; 84c6 (2:44c6) duty 0 - note C#, 1 - note C#, 5 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 loopchannel 4, SFX_02_43_Ch1 - note D_, 16 - unknownmusic0xf3 - note C_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x20 15, 243, 0, 6 + unknownsfx0x10 8 endchannel ; 0x84d9 \ No newline at end of file diff --git a/music/sfx/sfx_02_44.asm b/music/sfx/sfx_02_44.asm index 32795c41..8ecfc89b 100644 --- a/music/sfx/sfx_02_44.asm +++ b/music/sfx/sfx_02_44.asm @@ -1,15 +1,8 @@ SFX_02_44_Ch1: ; 84ee (2:44ee) duty 2 - note C#, 1 - note C#, 6 - note D_, 16 - stereopanning 240 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 21 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 endchannel ; 0x84fd \ No newline at end of file diff --git a/music/sfx/sfx_02_45.asm b/music/sfx/sfx_02_45.asm index 9d9d99d8..d06160b0 100644 --- a/music/sfx/sfx_02_45.asm +++ b/music/sfx/sfx_02_45.asm @@ -1,44 +1,14 @@ SFX_02_45_Ch1: ; 84fd (2:44fd) duty 2 - note D_, 16 - unknownmusic0xf2 - rest 1 - note C_, 8 - note D_, 16 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 4 - note A#, 2 - note G#, 1 - note C_, 8 - note D_, 4 - note A#, 2 - note C_, 1 - note C_, 8 - note D_, 4 - note A#, 2 - note E_, 1 - note C_, 8 - note D_, 4 - note A#, 2 - note C_, 1 - note C_, 8 - note D_, 4 - note A#, 2 - note G#, 1 - note C_, 8 - note D_, 4 - note A#, 2 - note C_, 1 - note C_, 8 - note D_, 4 - note A#, 2 - rest 1 - note C_, 8 - note D_, 9 - note A#, 2 - note C_, 1 - note C_, 8 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 3, 161, 128, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 64, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 128, 7 + unknownsfx0x20 3, 161, 0, 7 + unknownsfx0x20 3, 161, 192, 7 + unknownsfx0x20 8, 161, 0, 7 endchannel ; 0x8528 \ No newline at end of file diff --git a/music/sfx/sfx_02_46.asm b/music/sfx/sfx_02_46.asm index 3d438186..64d4acce 100644 --- a/music/sfx/sfx_02_46.asm +++ b/music/sfx/sfx_02_46.asm @@ -1,17 +1,8 @@ SFX_02_46_Ch1: ; 8528 (2:4528) duty 2 - note D_, 5 - stereopanning 0 - note C_, 7 - note D_, 5 - stereopanning 0 - note C_, 5 - note D_, 5 - stereopanning 0 - note C_, 3 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 240, 0, 6 + unknownsfx0x20 4, 240, 0, 4 + unknownsfx0x20 4, 240, 0, 2 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x853b \ No newline at end of file diff --git a/music/sfx/sfx_02_47.asm b/music/sfx/sfx_02_47.asm index 6f6c8d83..afcd01eb 100644 --- a/music/sfx/sfx_02_47.asm +++ b/music/sfx/sfx_02_47.asm @@ -1,18 +1,8 @@ SFX_02_47_Ch1: ; 853b (2:453b) duty 2 - note D_, 7 - stereopanning 0 - note C_, 8 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 7 - stereopanning 0 - note C_, 8 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 6, 240, 0, 7 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 6, 240, 0, 7 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x854e \ No newline at end of file diff --git a/music/sfx/sfx_02_48.asm b/music/sfx/sfx_02_48.asm index 9ae3fbcb..0db1b90d 100644 --- a/music/sfx/sfx_02_48.asm +++ b/music/sfx/sfx_02_48.asm @@ -1,27 +1,11 @@ SFX_02_48_Ch1: ; 854e (2:454e) duty 1 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 7, 0, 0 - note C_, 7 - note D_, 16 - note B_, 8 - note G#, 1 - note C_, 6 - note D_, 16 - note G#, 8 - note C_, 1 - note C_, 6 - note D_, 16 - note E_, 8 - note G#, 1 - note C_, 5 - note D_, 16 - note C#, 8 - note C_, 1 - note C_, 5 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 6 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 5 + unknownsfx0x20 15, 71, 128, 4 + unknownsfx0x20 15, 23, 0, 4 + unknownsfx0x10 8 endchannel ; 0x8569 \ No newline at end of file diff --git a/music/sfx/sfx_02_49.asm b/music/sfx/sfx_02_49.asm index 4a9b2e48..b19c3fcc 100644 --- a/music/sfx/sfx_02_49.asm +++ b/music/sfx/sfx_02_49.asm @@ -1,24 +1,9 @@ SFX_02_49_Ch1: ; 8569 (2:4569) duty 2 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 3 - unknownmusic0xf1 - note G#, 1 - note C_, 7 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 2, 241, 128, 6 + unknownsfx0x20 1, 0, 0, 0 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 0, 0, 0 endchannel ; 0x8580 \ No newline at end of file diff --git a/music/sfx/sfx_02_4a.asm b/music/sfx/sfx_02_4a.asm index 43d498f4..278c927d 100644 --- a/music/sfx/sfx_02_4a.asm +++ b/music/sfx/sfx_02_4a.asm @@ -1,22 +1,10 @@ SFX_02_4a_Ch1: ; 8580 (2:4580) duty 2 - note C#, 1 - note D_, 13 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 6 - note C#, 1 - note D_, 3 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 6 - note C#, 1 - note C_, 9 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x10 44 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 2, 241, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x8595 \ No newline at end of file diff --git a/music/sfx/sfx_02_4b.asm b/music/sfx/sfx_02_4b.asm index 1b99ac1b..923aa8e7 100644 --- a/music/sfx/sfx_02_4b.asm +++ b/music/sfx/sfx_02_4b.asm @@ -1,27 +1,11 @@ SFX_02_4b_Ch1: ; 8595 (2:4595) duty 1 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 7, 0, 0 - note C_, 6 - note D_, 16 - note B_, 8 - note G#, 1 - note C_, 6 - note D_, 16 - note G#, 8 - note C_, 1 - note C_, 7 - note D_, 16 - note E_, 8 - note G#, 1 - note C_, 7 - note D_, 16 - note C#, 8 - note C_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 5 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 6 + unknownsfx0x20 15, 23, 0, 7 + unknownsfx0x10 8 endchannel ; 0x85b0 \ No newline at end of file diff --git a/music/sfx/sfx_02_4c.asm b/music/sfx/sfx_02_4c.asm index 0ae3c014..b9063058 100644 --- a/music/sfx/sfx_02_4c.asm +++ b/music/sfx/sfx_02_4c.asm @@ -1,27 +1,11 @@ SFX_02_4c_Ch1: ; 85b0 (2:45b0) duty 1 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 7, 0, 0 - note C_, 8 - note D_, 16 - note B_, 8 - note G#, 1 - note C_, 7 - note D_, 16 - note G#, 8 - note C_, 1 - note C_, 7 - note D_, 16 - note E_, 8 - note G#, 1 - note C_, 6 - note D_, 16 - note C#, 8 - note C_, 1 - note C_, 6 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 7 + unknownsfx0x20 15, 183, 128, 6 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 5 + unknownsfx0x20 15, 23, 0, 5 + unknownsfx0x10 8 endchannel ; 0x85cb \ No newline at end of file diff --git a/music/sfx/sfx_02_4d.asm b/music/sfx/sfx_02_4d.asm index 3e60d6e4..1d492dde 100644 --- a/music/sfx/sfx_02_4d.asm +++ b/music/sfx/sfx_02_4d.asm @@ -1,11 +1,7 @@ SFX_02_4d_Ch1: ; 85cb (2:45cb) duty 1 - note C#, 1 - note C#, 7 - note D_, 16 - notetype 2, 0, 0 - note C_, 6 - note C#, 1 - note C_, 9 + unknownsfx0x10 22 + unknownsfx0x20 15, 210, 0, 5 + unknownsfx0x10 8 endchannel ; 0x85d6 \ No newline at end of file diff --git a/music/sfx/sfx_02_4e.asm b/music/sfx/sfx_02_4e.asm index 1102cad9..b690ee55 100644 --- a/music/sfx/sfx_02_4e.asm +++ b/music/sfx/sfx_02_4e.asm @@ -1,12 +1,7 @@ SFX_02_4e_Ch1: ; 85d6 (2:45d6) duty 2 - note C#, 1 - note A_, 6 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 5 - note C#, 1 - note C_, 9 + unknownsfx0x10 149 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 endchannel ; 0x85e1 \ No newline at end of file diff --git a/music/sfx/sfx_02_4f.asm b/music/sfx/sfx_02_4f.asm index 5aab75b4..32ebf8cc 100644 --- a/music/sfx/sfx_02_4f.asm +++ b/music/sfx/sfx_02_4f.asm @@ -1,15 +1,7 @@ SFX_02_4f_Ch1: ; 85e1 (2:45e1) - note D_, 3 - unknownmusic0xf1 - note D#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - unknownmusic0xf1 - note D_, 3 - note D_, 2 - note C_, 1 - note C_, 1 + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 1, 0, 0 endchannel ; 0x85ee \ No newline at end of file diff --git a/music/sfx/sfx_02_50.asm b/music/sfx/sfx_02_50.asm index 6e600616..023b255f 100644 --- a/music/sfx/sfx_02_50.asm +++ b/music/sfx/sfx_02_50.asm @@ -1,50 +1,19 @@ SFX_02_50_Ch1: ; 85ee (2:45ee) - note D_, 3 - unknownmusic0xf1 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note A#, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - notetype 1, 1, 2 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note G#, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note B_, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note F#, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note A_, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note E_, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 + unknownnoise0x20 2, 241, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 161, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 209, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 129, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 177, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 97, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 145, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 65, 18 + unknownnoise0x20 2, 0, 0 endchannel ; 0x861f \ No newline at end of file diff --git a/music/sfx/sfx_02_51.asm b/music/sfx/sfx_02_51.asm index aa66d484..956fb558 100644 --- a/music/sfx/sfx_02_51.asm +++ b/music/sfx/sfx_02_51.asm @@ -1,41 +1,19 @@ SFX_02_51_Ch1: ; 861f (2:461f) duty 3 - note C#, 1 - note F_, 11 - note D_, 5 - stereopanning 0 - note C_, 6 - note C#, 1 - note C_, 9 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x10 90 + unknownsfx0x20 4, 240, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 1, 0, 0, 0 endchannel SFX_02_51_Ch2: ; 8636 (2:4636) duty 3 - note D_, 5 - stereopanning 1 - note C_, 5 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 1 - note C_, 5 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 240, 1, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 1, 4 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x8649 \ No newline at end of file diff --git a/music/sfx/sfx_02_52.asm b/music/sfx/sfx_02_52.asm index d3da600a..9534b08d 100644 --- a/music/sfx/sfx_02_52.asm +++ b/music/sfx/sfx_02_52.asm @@ -1,11 +1,7 @@ SFX_02_52_Ch1: ; 8649 (2:4649) duty 0 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 2, 0, 0 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 210, 0, 7 + unknownsfx0x10 8 endchannel ; 0x8654 \ No newline at end of file diff --git a/music/sfx/sfx_02_53.asm b/music/sfx/sfx_02_53.asm index e880dd42..4b739723 100644 --- a/music/sfx/sfx_02_53.asm +++ b/music/sfx/sfx_02_53.asm @@ -1,27 +1,11 @@ SFX_02_53_Ch1: ; 8654 (2:4654) - note D_, 5 - note A#, 3 - note D_, 4 - note D_, 9 - unknownmusic0xf1 - note D#, 5 - note D_, 16 - note C_, 1 - note C_, 1 - note D_, 3 - unknownmusic0xf7 - note D_, 5 - note D_, 3 - unknownmusic0xf7 - note D#, 5 - note D_, 5 - unknownmusic0xf7 - note E_, 5 - note D_, 9 - unknownmusic0xf4 - note F_, 6 - note D_, 9 - unknownmusic0xf1 - note E_, 5 + unknownnoise0x20 4, 162, 35 + unknownnoise0x20 8, 241, 52 + unknownnoise0x20 15, 0, 0 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 endchannel ; 0x866d \ No newline at end of file diff --git a/music/sfx/sfx_02_54.asm b/music/sfx/sfx_02_54.asm index dd793701..4f3343fb 100644 --- a/music/sfx/sfx_02_54.asm +++ b/music/sfx/sfx_02_54.asm @@ -1,55 +1,23 @@ SFX_02_54_Ch1: ; 866d (2:466d) duty 2 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 6 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 242, 0, 5 endchannel SFX_02_54_Ch2: ; 868c (2:468c) duty 3 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note G#, 3 - note C_, 5 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 242, 130, 4 endchannel ; 0x86ab \ No newline at end of file diff --git a/music/sfx/sfx_02_55.asm b/music/sfx/sfx_02_55.asm index e2123a28..ec138968 100644 --- a/music/sfx/sfx_02_55.asm +++ b/music/sfx/sfx_02_55.asm @@ -1,30 +1,13 @@ SFX_02_55_Ch1: ; 86ab (2:46ab) duty 1 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 6 - note C#, 1 - note D_, 3 - note D_, 5 - octave 6 - note C_, 1 - note C_, 6 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 8 - note C#, 1 - note D_, 3 - note D_, 16 - octave 6 - note C_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 4, 226, 0, 5 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 7 + unknownsfx0x10 34 + unknownsfx0x20 15, 226, 0, 7 + unknownsfx0x10 8 endchannel ; 0x86c8 \ No newline at end of file diff --git a/music/sfx/sfx_02_56.asm b/music/sfx/sfx_02_56.asm index 83087d24..5dfab306 100644 --- a/music/sfx/sfx_02_56.asm +++ b/music/sfx/sfx_02_56.asm @@ -1,18 +1,8 @@ SFX_02_56_Ch1: ; 83e1 (2:43e1) - note D_, 3 - unknownmusic0xf7 - note D_, 5 - note D_, 3 - unknownmusic0xf7 - note D#, 5 - note D_, 5 - unknownmusic0xf7 - note E_, 5 - note D_, 9 - unknownmusic0xf4 - note F_, 6 - note D_, 9 - unknownmusic0xf1 - note E_, 5 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 endchannel ; 0x83f1 \ No newline at end of file diff --git a/music/sfx/sfx_02_57.asm b/music/sfx/sfx_02_57.asm index 1da59f79..1b7e4237 100644 --- a/music/sfx/sfx_02_57.asm +++ b/music/sfx/sfx_02_57.asm @@ -1,8 +1,5 @@ SFX_02_57_Ch1: ; 83f1 (2:43f1) - note D_, 10 - unknownmusic0xf1 - note E_, 5 - note D_, 9 - notetype 1, 4, 3 + unknownnoise0x20 9, 241, 68 + unknownnoise0x20 8, 209, 67 endchannel ; 0x83f8 \ No newline at end of file diff --git a/music/sfx/sfx_02_58.asm b/music/sfx/sfx_02_58.asm index 53e0431d..b98ad41e 100644 --- a/music/sfx/sfx_02_58.asm +++ b/music/sfx/sfx_02_58.asm @@ -1,21 +1,12 @@ SFX_02_58_Ch1: ; 83f8 (2:43f8) duty 2 - note D_, 9 - octave 7 - note E_, 1 - note C_, 8 + unknownsfx0x20 8, 225, 64, 7 endchannel SFX_02_58_Ch2: ; 83ff (2:43ff) duty 2 - note D_, 3 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 9 - note B_, 2 - note E_, 2 - note C_, 8 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 8, 177, 65, 7 endchannel ; 0x840a \ No newline at end of file diff --git a/music/sfx/sfx_02_59.asm b/music/sfx/sfx_02_59.asm index 7ded7c7e..a4985d1f 100644 --- a/music/sfx/sfx_02_59.asm +++ b/music/sfx/sfx_02_59.asm @@ -1,21 +1,12 @@ SFX_02_59_Ch1: ; 841b (2:441b) duty 2 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 + unknownsfx0x20 4, 241, 128, 7 endchannel SFX_02_59_Ch2: ; 8422 (2:4422) duty 2 - note D_, 2 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - note A#, 2 - note F#, 2 - note C_, 8 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 161, 97, 7 endchannel ; 0x842d \ No newline at end of file diff --git a/music/sfx/sfx_02_5a.asm b/music/sfx/sfx_02_5a.asm index c0e428fc..a9bb7f69 100644 --- a/music/sfx/sfx_02_5a.asm +++ b/music/sfx/sfx_02_5a.asm @@ -1,29 +1,14 @@ SFX_02_5a_Ch1: ; 842d (2:442d) duty 2 - note D_, 5 - octave 7 - note C_, 1 - note C_, 8 - note D_, 9 - unknownmusic0xf2 - octave 8 - note C_, 8 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 8, 242, 224, 7 endchannel SFX_02_5a_Ch2: ; 8438 (2:4438) duty 2 - note D_, 2 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - note A_, 2 - rest 2 - note C_, 7 - note D_, 9 - note A#, 3 - note A#, 2 - note C_, 8 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 145, 193, 6 + unknownsfx0x20 8, 162, 161, 7 endchannel ; 0x8447 \ No newline at end of file diff --git a/music/sfx/sfx_02_5b.asm b/music/sfx/sfx_02_5b.asm index 992857e9..e14879ed 100644 --- a/music/sfx/sfx_02_5b.asm +++ b/music/sfx/sfx_02_5b.asm @@ -1,12 +1,7 @@ SFX_02_5b_Ch1: ; 8447 (2:4447) duty 2 - note C#, 1 - note F_, 11 - note D_, 16 - unknownmusic0xf1 - note C_, 1 - note C_, 4 - note C#, 1 - note C_, 9 + unknownsfx0x10 90 + unknownsfx0x20 15, 241, 0, 3 + unknownsfx0x10 8 endchannel ; 0x8452 \ No newline at end of file diff --git a/music/sfx/sfx_02_5c.asm b/music/sfx/sfx_02_5c.asm index a7e98039..34866769 100644 --- a/music/sfx/sfx_02_5c.asm +++ b/music/sfx/sfx_02_5c.asm @@ -1,18 +1,8 @@ SFX_02_5c_Ch1: ; 8452 (2:4452) - note D_, 3 - unknownmusic0xf1 - note F_, 5 - note D_, 13 - note G_, 2 - note D_, 4 - note D_, 3 - note B_, 2 - note F_, 5 - note D_, 13 - note F#, 2 - note D_, 4 - note D_, 7 - note E_, 2 - note F_, 5 + unknownnoise0x20 2, 241, 84 + unknownnoise0x20 12, 113, 35 + unknownnoise0x20 2, 177, 84 + unknownnoise0x20 12, 97, 35 + unknownnoise0x20 6, 65, 84 endchannel ; 0x8462 \ No newline at end of file diff --git a/music/sfx/sfx_02_5d.asm b/music/sfx/sfx_02_5d.asm index c76cf8c7..2a05d5dd 100644 --- a/music/sfx/sfx_02_5d.asm +++ b/music/sfx/sfx_02_5d.asm @@ -1,67 +1,24 @@ SFX_02_5d_Ch1: ; 8475 (2:4475) duty 2 - note D_, 5 - unknownmusic0xf4 - note C_, 1 - note C_, 8 - note D_, 3 - octave 4 - note C_, 1 - note C_, 7 - note D_, 3 - octave 4 - note G#, 1 - note C_, 7 - note D_, 3 - octave 4 - rest 1 - note C_, 7 - note D_, 3 - octave 4 - note C_, 1 - note C_, 8 - note D_, 3 - octave 4 - note A#, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf2 - octave 8 - note C_, 8 + unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 2, 228, 0, 6 + unknownsfx0x20 2, 228, 128, 6 + unknownsfx0x20 2, 228, 192, 6 + unknownsfx0x20 2, 228, 0, 7 + unknownsfx0x20 2, 228, 160, 7 + unknownsfx0x20 15, 242, 224, 7 endchannel SFX_02_5d_Ch2: ; 8494 (2:4494) duty 2 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 3 - notetype 4, 0, 1 - note C_, 8 - note D_, 3 - rest 5 - note C_, 2 - note C_, 7 - note D_, 3 - rest 5 - note G#, 2 - note C_, 7 - note D_, 3 - rest 5 - rest 2 - note C_, 7 - note D_, 3 - rest 5 - note C_, 2 - note C_, 8 - note D_, 3 - rest 5 - note A#, 2 - note C_, 8 - note D_, 16 - notetype 2, 14, 1 - note C_, 8 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 2, 212, 1, 7 + unknownsfx0x20 2, 196, 1, 6 + unknownsfx0x20 2, 196, 129, 6 + unknownsfx0x20 2, 196, 193, 6 + unknownsfx0x20 2, 196, 1, 7 + unknownsfx0x20 2, 196, 161, 7 + unknownsfx0x20 15, 210, 225, 7 endchannel ; 0x84b7 \ No newline at end of file diff --git a/music/sfx/sfx_02_5e.asm b/music/sfx/sfx_02_5e.asm index ad47ebf0..8b2b7a82 100644 --- a/music/sfx/sfx_02_5e.asm +++ b/music/sfx/sfx_02_5e.asm @@ -8,12 +8,9 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca) note A_, 2 note G_, 2 octave 6 - note C_, 4 - note C_, 2 - note D_, 2 - note C_, 2 - octave 5 - note G_, 2 + db $03 + db $01 + unknownsfx0x20 1, 1, 227, 113 note A_, 2 note F_, 2 note G_, 8 diff --git a/music/sfx/sfx_02_5f.asm b/music/sfx/sfx_02_5f.asm index 60421533..48c6539e 100644 --- a/music/sfx/sfx_02_5f.asm +++ b/music/sfx/sfx_02_5f.asm @@ -1,28 +1,10 @@ SFX_02_5f_Ch1: ; 86c8 (2:46c8) duty 2 - note D_, 16 - unknownmusic0xf3 - note D#, 1 - note C_, 8 - note D_, 9 - note F#, 6 - note D#, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf4 - note C_, 1 - note C_, 8 - note D_, 16 - note G_, 5 - note C_, 1 - note C_, 8 - note D_, 16 - note E_, 5 - note C_, 1 - note C_, 8 - note D_, 16 - note D_, 5 - note C_, 1 - note C_, 8 + unknownsfx0x20 15, 243, 48, 7 + unknownsfx0x20 8, 101, 48, 7 + unknownsfx0x20 15, 244, 0, 7 + unknownsfx0x20 15, 116, 0, 7 + unknownsfx0x20 15, 68, 0, 7 + unknownsfx0x20 15, 36, 0, 7 endchannel ; 0x86e3 \ No newline at end of file diff --git a/music/sfx/sfx_08_01.asm b/music/sfx/sfx_08_01.asm index 43c13dbb..e5e03793 100644 --- a/music/sfx/sfx_08_01.asm +++ b/music/sfx/sfx_08_01.asm @@ -1,6 +1,4 @@ SFX_08_01_Ch1: ; 202fd (8:42fd) - note D_, 1 - rest 2 - note D#, 4 + unknownnoise0x20 0, 193, 51 endchannel ; 0x20301 \ No newline at end of file diff --git a/music/sfx/sfx_08_02.asm b/music/sfx/sfx_08_02.asm index 1870aa00..d86123b5 100644 --- a/music/sfx/sfx_08_02.asm +++ b/music/sfx/sfx_08_02.asm @@ -1,6 +1,4 @@ SFX_08_02_Ch1: ; 20301 (8:4301) - note D_, 1 - note B_, 2 - note D#, 4 + unknownnoise0x20 0, 177, 51 endchannel ; 0x20305 \ No newline at end of file diff --git a/music/sfx/sfx_08_03.asm b/music/sfx/sfx_08_03.asm index 0fcd83b0..9b29488f 100644 --- a/music/sfx/sfx_08_03.asm +++ b/music/sfx/sfx_08_03.asm @@ -1,6 +1,4 @@ SFX_08_03_Ch1: ; 20305 (8:4305) - note D_, 1 - note A#, 2 - note D#, 4 + unknownnoise0x20 0, 161, 51 endchannel ; 0x20309 \ No newline at end of file diff --git a/music/sfx/sfx_08_04.asm b/music/sfx/sfx_08_04.asm index 98d759c6..63c3b508 100644 --- a/music/sfx/sfx_08_04.asm +++ b/music/sfx/sfx_08_04.asm @@ -1,6 +1,4 @@ SFX_08_04_Ch1: ; 20309 (8:4309) - note D_, 1 - note G#, 2 - note D#, 4 + unknownnoise0x20 0, 129, 51 endchannel ; 0x2030d \ No newline at end of file diff --git a/music/sfx/sfx_08_05.asm b/music/sfx/sfx_08_05.asm index 44cd722f..6fcd5f68 100644 --- a/music/sfx/sfx_08_05.asm +++ b/music/sfx/sfx_08_05.asm @@ -1,21 +1,9 @@ SFX_08_05_Ch1: ; 2030d (8:430d) - note D_, 8 - note G#, 5 - note D#, 8 - note D_, 7 - note G#, 5 - note D#, 7 - note D_, 6 - note G#, 4 - note D#, 6 - note D_, 5 - note G#, 4 - note D#, 5 - note D_, 4 - note G#, 3 - note D#, 4 - note D_, 3 - note G#, 2 - note D#, 3 + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 endchannel ; 0x20320 \ No newline at end of file diff --git a/music/sfx/sfx_08_06.asm b/music/sfx/sfx_08_06.asm index 94a1eb2f..6e8c2b8c 100644 --- a/music/sfx/sfx_08_06.asm +++ b/music/sfx/sfx_08_06.asm @@ -1,6 +1,4 @@ SFX_08_06_Ch1: ; 20320 (8:4320) - note D_, 1 - note F_, 2 - note D_, 11 + unknownnoise0x20 0, 81, 42 endchannel ; 0x20324 \ No newline at end of file diff --git a/music/sfx/sfx_08_07.asm b/music/sfx/sfx_08_07.asm index c285d3f5..5281cc7b 100644 --- a/music/sfx/sfx_08_07.asm +++ b/music/sfx/sfx_08_07.asm @@ -1,9 +1,5 @@ SFX_08_07_Ch1: ; 20324 (8:4324) - note D_, 2 - note E_, 2 - note D_, 12 - note D_, 1 - note F#, 2 - note D_, 11 + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 endchannel ; 0x2032b \ No newline at end of file diff --git a/music/sfx/sfx_08_08.asm b/music/sfx/sfx_08_08.asm index 0db7649d..4d28817b 100644 --- a/music/sfx/sfx_08_08.asm +++ b/music/sfx/sfx_08_08.asm @@ -1,6 +1,4 @@ SFX_08_08_Ch1: ; 2032b (8:432b) - note D_, 1 - note G#, 2 - note C#, 1 + unknownnoise0x20 0, 129, 16 endchannel ; 0x2032f \ No newline at end of file diff --git a/music/sfx/sfx_08_09.asm b/music/sfx/sfx_08_09.asm index 90879433..94eac4b0 100644 --- a/music/sfx/sfx_08_09.asm +++ b/music/sfx/sfx_08_09.asm @@ -1,6 +1,4 @@ SFX_08_09_Ch1: ; 2032f (8:432f) - note D_, 1 - note G#, 3 - note D_, 4 + unknownnoise0x20 0, 130, 35 endchannel ; 0x20333 \ No newline at end of file diff --git a/music/sfx/sfx_08_0a.asm b/music/sfx/sfx_08_0a.asm index dc0d06c0..c7a3a090 100644 --- a/music/sfx/sfx_08_0a.asm +++ b/music/sfx/sfx_08_0a.asm @@ -1,6 +1,4 @@ SFX_08_0a_Ch1: ; 20333 (8:4333) - note D_, 1 - note G#, 3 - note D_, 6 + unknownnoise0x20 0, 130, 37 endchannel ; 0x20337 \ No newline at end of file diff --git a/music/sfx/sfx_08_0b.asm b/music/sfx/sfx_08_0b.asm index d22a3e40..8010f4c9 100644 --- a/music/sfx/sfx_08_0b.asm +++ b/music/sfx/sfx_08_0b.asm @@ -1,6 +1,4 @@ SFX_08_0b_Ch1: ; 20337 (8:4337) - note D_, 1 - note G#, 3 - note D_, 7 + unknownnoise0x20 0, 130, 38 endchannel ; 0x2033b \ No newline at end of file diff --git a/music/sfx/sfx_08_0c.asm b/music/sfx/sfx_08_0c.asm index 90db61bd..8a87cf9a 100644 --- a/music/sfx/sfx_08_0c.asm +++ b/music/sfx/sfx_08_0c.asm @@ -1,6 +1,4 @@ SFX_08_0c_Ch1: ; 2033b (8:433b) - note D_, 1 - note A#, 2 - note C#, 1 + unknownnoise0x20 0, 161, 16 endchannel ; 0x2033f \ No newline at end of file diff --git a/music/sfx/sfx_08_0d.asm b/music/sfx/sfx_08_0d.asm index 96335764..d5997986 100644 --- a/music/sfx/sfx_08_0d.asm +++ b/music/sfx/sfx_08_0d.asm @@ -1,6 +1,4 @@ SFX_08_0d_Ch1: ; 2033f (8:433f) - note D_, 1 - note A#, 3 - note C#, 2 + unknownnoise0x20 0, 162, 17 endchannel ; 0x20343 \ No newline at end of file diff --git a/music/sfx/sfx_08_0e.asm b/music/sfx/sfx_08_0e.asm index 4e7074a0..f98ceb2e 100644 --- a/music/sfx/sfx_08_0e.asm +++ b/music/sfx/sfx_08_0e.asm @@ -1,6 +1,4 @@ SFX_08_0e_Ch1: ; 20343 (8:4343) - note D_, 1 - note A#, 3 - note F_, 1 + unknownnoise0x20 0, 162, 80 endchannel ; 0x20347 \ No newline at end of file diff --git a/music/sfx/sfx_08_0f.asm b/music/sfx/sfx_08_0f.asm index 233785da..22452696 100644 --- a/music/sfx/sfx_08_0f.asm +++ b/music/sfx/sfx_08_0f.asm @@ -1,9 +1,5 @@ SFX_08_0f_Ch1: ; 20347 (8:4347) - note D_, 1 - note A#, 2 - note C#, 9 - note D_, 1 - note D#, 2 - note D#, 4 + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 endchannel ; 0x2034e \ No newline at end of file diff --git a/music/sfx/sfx_08_10.asm b/music/sfx/sfx_08_10.asm index bd950a44..cc94f730 100644 --- a/music/sfx/sfx_08_10.asm +++ b/music/sfx/sfx_08_10.asm @@ -1,9 +1,5 @@ SFX_08_10_Ch1: ; 2034e (8:434e) - note D_, 3 - note A_, 2 - note D_, 9 - note D_, 1 - note G_, 2 - note C#, 9 + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 endchannel ; 0x20355 \ No newline at end of file diff --git a/music/sfx/sfx_08_11.asm b/music/sfx/sfx_08_11.asm index e082f04a..7ac28d21 100644 --- a/music/sfx/sfx_08_11.asm +++ b/music/sfx/sfx_08_11.asm @@ -1,6 +1,4 @@ SFX_08_11_Ch1: ; 20355 (8:4355) - note D_, 1 - note A_, 2 - note D_, 3 + unknownnoise0x20 0, 145, 34 endchannel ; 0x20359 \ No newline at end of file diff --git a/music/sfx/sfx_08_12.asm b/music/sfx/sfx_08_12.asm index 33465cb2..3d5bebad 100644 --- a/music/sfx/sfx_08_12.asm +++ b/music/sfx/sfx_08_12.asm @@ -1,6 +1,4 @@ SFX_08_12_Ch1: ; 20359 (8:4359) - note D_, 1 - note G_, 2 - note D_, 3 + unknownnoise0x20 0, 113, 34 endchannel ; 0x2035d \ No newline at end of file diff --git a/music/sfx/sfx_08_13.asm b/music/sfx/sfx_08_13.asm index 6af5c28a..e6712805 100644 --- a/music/sfx/sfx_08_13.asm +++ b/music/sfx/sfx_08_13.asm @@ -1,6 +1,4 @@ SFX_08_13_Ch1: ; 2035d (8:435d) - note D_, 1 - note F#, 2 - note D_, 3 + unknownnoise0x20 0, 97, 34 endchannel ; 0x20361 \ No newline at end of file diff --git a/music/sfx/sfx_08_14.asm b/music/sfx/sfx_08_14.asm index a7726bfb..b037b6a1 100644 --- a/music/sfx/sfx_08_14.asm +++ b/music/sfx/sfx_08_14.asm @@ -1,46 +1,22 @@ SFX_08_14_Ch1: ; 20c2f (8:4c2f) dutycycle 245 - note D_, 5 - unknownmusic0xf3 - note C#, 9 - note C_, 8 - note D_, 16 - octave 3 - note A_, 9 - note C_, 8 - note D_, 9 - note A_, 2 - note F_, 9 - note C_, 8 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 endchannel SFX_08_14_Ch2: ; 20c3e (8:4c3e) dutycycle 160 - note D_, 6 - note B_, 4 - note C_, 9 - note C_, 8 - note D_, 16 - rest 6 - note G#, 9 - note C_, 8 - note D_, 9 - note G_, 2 - note E_, 9 - note C_, 8 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 endchannel SFX_08_14_Ch3: ; 20c4d (8:4c4d) - note D_, 4 - note A#, 2 - note C#, 13 - note D_, 15 - note A_, 5 - note D_, 13 - note D_, 9 - note G#, 2 - note C#, 13 + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 endchannel ; 0x20c57 \ No newline at end of file diff --git a/music/sfx/sfx_08_15.asm b/music/sfx/sfx_08_15.asm index fc856df2..40cacf00 100644 --- a/music/sfx/sfx_08_15.asm +++ b/music/sfx/sfx_08_15.asm @@ -1,55 +1,25 @@ SFX_08_15_Ch1: ; 20e3f (8:4e3f) dutycycle 160 - note D_, 5 - unknownmusic0xf3 - note C_, 1 - note C_, 7 - note D_, 9 - notetype 5, 6, 0 - note C_, 8 - note D_, 4 - octave 6 - note D_, 1 - note C_, 8 - note D_, 9 - notetype 1, 1, 0 - note C_, 8 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 endchannel SFX_08_15_Ch2: ; 20e52 (8:4e52) dutycycle 90 - note D_, 6 - note B_, 4 - unknownmusic0xf1 - note C_, 7 - note D_, 8 - rest 6 - note F_, 3 - note C_, 8 - note D_, 4 - note A#, 3 - note C#, 2 - note C_, 8 - note D_, 9 - note B_, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 endchannel SFX_08_15_Ch3: ; 20e65 (8:4e65) - note D_, 4 - note A#, 3 - note D#, 13 - note D_, 13 - note A_, 5 - note D_, 13 - note D_, 4 - note G#, 3 - note C#, 13 - note D_, 9 - note G_, 2 - note D_, 13 + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 endchannel ; 0x20e72 \ No newline at end of file diff --git a/music/sfx/sfx_08_16.asm b/music/sfx/sfx_08_16.asm index b34a3287..bbe80ddb 100644 --- a/music/sfx/sfx_08_16.asm +++ b/music/sfx/sfx_08_16.asm @@ -1,33 +1,16 @@ SFX_08_16_Ch1: ; 20db4 (8:4db4) duty 0 - note D_, 9 - unknownmusic0xf5 - note G#, 1 - note C_, 5 - note D_, 3 - octave 7 - octave 8 - note C_, 6 - note D_, 9 - notetype 1, 13, 12 - note C_, 6 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 endchannel SFX_08_16_Ch2: ; 20dc3 (8:4dc3) dutycycle 165 - note D_, 8 - note A_, 6 - note E_, 2 - note C_, 5 - note D_, 3 - note G#, 2 - note D_, 2 - note C_, 6 - note D_, 9 - note F#, 2 - note C#, 11 - note C_, 6 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 SFX_08_16_Ch3: ; 20dd1 (8:4dd1) diff --git a/music/sfx/sfx_08_17.asm b/music/sfx/sfx_08_17.asm index 46d47843..03587fa4 100644 --- a/music/sfx/sfx_08_17.asm +++ b/music/sfx/sfx_08_17.asm @@ -1,78 +1,31 @@ SFX_08_17_Ch1: ; 20b4e (8:4b4e) dutycycle 240 - note D_, 5 - unknownmusic0xf7 - note C_, 9 - note C_, 7 - note D_, 7 - octave 2 - note C_, 1 - note C_, 7 - note D_, 7 - notetype 7, 15, 0 - note C_, 6 - note D_, 7 - rest 5 - octave 8 - note C_, 6 - note D_, 6 - notetype 3, 12, 0 - note C_, 6 - note D_, 5 - notetype 3, 10, 0 - note C_, 6 - note D_, 9 - octave 7 - note G#, 1 - note C_, 6 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 endchannel SFX_08_17_Ch2: ; 20b6d (8:4b6d) dutycycle 10 - note D_, 5 - rest 8 - note C_, 5 - note C_, 6 - note D_, 7 - note A#, 7 - note C_, 3 - note C_, 6 - note D_, 7 - note A_, 8 - unknownmusic0xf1 - note C_, 5 - note D_, 5 - note B_, 5 - octave 7 - note C_, 5 - note D_, 6 - note A#, 4 - rest 3 - note C_, 5 - note D_, 5 - note B_, 4 - note A#, 4 - note C_, 5 - note D_, 9 - rest 2 - note G#, 3 - note C_, 5 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 endchannel SFX_08_17_Ch3: ; 20b8c (8:4b8c) - note D_, 13 - octave 4 - note E_, 13 - note D_, 11 - rest 8 - note F_, 13 - note D_, 13 - note B_, 7 - note E_, 13 - note D_, 16 - note A#, 3 - note F_, 13 + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 endchannel ; 0x20b99 \ No newline at end of file diff --git a/music/sfx/sfx_08_18.asm b/music/sfx/sfx_08_18.asm index 55fc8cb6..b1e97f95 100644 --- a/music/sfx/sfx_08_18.asm +++ b/music/sfx/sfx_08_18.asm @@ -1,81 +1,33 @@ SFX_08_18_Ch1: ; 20efd (8:4efd) dutycycle 240 - note D_, 5 - unknownmusic0xf7 - note A#, 1 - note C_, 7 - note D_, 9 - octave 2 - note A#, 5 - note C_, 7 - note D_, 5 - notetype 6, 10, 0 - note C_, 7 - note D_, 13 - notetype 3, 2, 0 - note C_, 7 - note D_, 9 - rest 4 - note D_, 5 - note C_, 7 - note D_, 5 - rest 3 - note D_, 1 - note C_, 7 - note D_, 9 - note B_, 2 - note C#, 1 - note C_, 7 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 endchannel SFX_08_18_Ch2: ; 20f1c (8:4f1c) dutycycle 90 - note D_, 5 - octave 1 - note C_, 2 - note C_, 7 - note D_, 9 - notetype 6, 0, 3 - note C_, 7 - note D_, 5 - rest 7 - note C_, 2 - note C_, 7 - note D_, 13 - rest 4 - note G#, 2 - note C_, 6 - note D_, 9 - note B_, 4 - note G#, 4 - note C_, 6 - note D_, 5 - note B_, 3 - note G#, 3 - note C_, 6 - note D_, 9 - note A#, 2 - note G_, 2 - note C_, 6 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 endchannel SFX_08_18_Ch3: ; 20f3b (8:4f3b) - note D_, 8 - notetype 6, 5, 12 - note D_, 9 - octave 2 - note E_, 13 - note D_, 5 - notetype 4, 5, 12 - note D_, 5 - notetype 4, 4, 12 - note D_, 8 - rest 4 - note E_, 13 - note D_, 9 - note A#, 2 - note F_, 13 + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 endchannel ; 0x20f4e \ No newline at end of file diff --git a/music/sfx/sfx_08_19.asm b/music/sfx/sfx_08_19.asm index ed88daf3..097796bc 100644 --- a/music/sfx/sfx_08_19.asm +++ b/music/sfx/sfx_08_19.asm @@ -1,40 +1,18 @@ SFX_08_19_Ch1: ; 20cdd (8:4cdd) dutycycle 10 - note D_, 7 - octave 6 - note C_, 1 - note C_, 6 - note D_, 7 - octave 5 - note G#, 1 - note C_, 6 - note D_, 7 - notetype 3, 7, 0 - note C_, 6 - note D_, 9 - note A#, 2 - note F#, 1 - note C_, 6 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 endchannel SFX_08_19_Ch2: ; 20cf0 (8:4cf0) dutycycle 245 - note D_, 7 - octave 6 - note G#, 3 - note C_, 5 - note D_, 7 - notetype 3, 0, 1 - note C_, 6 - note D_, 7 - note B_, 3 - octave 6 - note C_, 5 - note D_, 9 - note G#, 2 - rest 2 - note C_, 5 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 SFX_08_19_Ch3: ; 20d02 (8:4d02) diff --git a/music/sfx/sfx_08_1a.asm b/music/sfx/sfx_08_1a.asm index 0c96762e..089460e4 100644 --- a/music/sfx/sfx_08_1a.asm +++ b/music/sfx/sfx_08_1a.asm @@ -1,29 +1,11 @@ SFX_08_1a_Ch1: ; 20c87 (8:4c87) dutycycle 250 - note D_, 7 - note G#, 4 - note E_, 8 - note C_, 3 - note D_, 16 - note F#, 3 - note D_, 7 - note C_, 3 - note D_, 5 - note F_, 3 - note E_, 6 - note C_, 3 - note D_, 10 - note F#, 4 - note C_, 7 - note C_, 3 - note D_, 16 - note G#, 3 - note D_, 6 - note C_, 3 - note D_, 16 - note E_, 3 - note C_, 8 - note C_, 3 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 SFX_08_1a_Ch2: ; 20ca1 (8:4ca1) @@ -31,21 +13,11 @@ SFX_08_1a_Ch2: ; 20ca1 (8:4ca1) SFX_08_1a_Ch3: ; 20ca2 (8:4ca2) - note D_, 9 - notetype 4, 8, 12 - note D_, 5 - octave 6 - note A_, 13 - note D_, 16 - rest 7 - note G#, 13 - note D_, 9 - octave 4 - note A#, 13 - note D_, 16 - notetype 7, 9, 12 - note D_, 16 - unknownmusic0xf2 - note A#, 13 + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 endchannel ; 0x20cb5 \ No newline at end of file diff --git a/music/sfx/sfx_08_1b.asm b/music/sfx/sfx_08_1b.asm index 1d63d05e..1eec17f5 100644 --- a/music/sfx/sfx_08_1b.asm +++ b/music/sfx/sfx_08_1b.asm @@ -1,45 +1,22 @@ SFX_08_1b_Ch1: ; 20cb5 (8:4cb5) dutycycle 240 - note D_, 5 - unknownmusic0xf3 - octave 8 - note C_, 7 - note D_, 16 - octave 4 - note E_, 1 - note C_, 7 - note D_, 9 - rest 2 - note D_, 1 - note C_, 7 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 endchannel SFX_08_1b_Ch2: ; 20cc4 (8:4cc4) dutycycle 10 - note D_, 4 - rest 4 - note G#, 4 - note C_, 7 - note D_, 15 - note B_, 5 - note C_, 3 - note C_, 7 - note D_, 9 - note A#, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 endchannel SFX_08_1b_Ch3: ; 20cd3 (8:4cd3) - note D_, 5 - notetype 3, 5, 12 - note D_, 16 - octave 2 - note E_, 13 - note D_, 9 - note B_, 2 - note F_, 13 + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 endchannel ; 0x20cdd \ No newline at end of file diff --git a/music/sfx/sfx_08_1c.asm b/music/sfx/sfx_08_1c.asm index 0f01428f..ec6b03a7 100644 --- a/music/sfx/sfx_08_1c.asm +++ b/music/sfx/sfx_08_1c.asm @@ -1,51 +1,24 @@ SFX_08_1c_Ch1: ; 20ecd (8:4ecd) dutycycle 240 - note D_, 16 - unknownmusic0xf6 - note F#, 6 - note C_, 6 - note D_, 11 - octave 4 - note G_, 13 - note C_, 6 - note D_, 4 - rest 3 - note F_, 13 - note C_, 6 - note D_, 16 - note B_, 3 - note D#, 13 - note C_, 6 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 endchannel SFX_08_1c_Ch2: ; 20ee0 (8:4ee0) dutycycle 90 - note D_, 15 - notetype 6, 0, 3 - note C_, 6 - note D_, 10 - note B_, 5 - note C#, 12 - note C_, 6 - note D_, 5 - note A_, 3 - unknownmusic0xfa - note C_, 5 - note D_, 16 - note A#, 3 - notetype 11, 0, 4 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 endchannel SFX_08_1c_Ch3: ; 20ef3 (8:4ef3) - note D_, 13 - octave 2 - note E_, 13 - note D_, 12 - notetype 7, 5, 12 - note D_, 16 - rest 3 - note E_, 13 + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 endchannel ; 0x20efd \ No newline at end of file diff --git a/music/sfx/sfx_08_1d.asm b/music/sfx/sfx_08_1d.asm index ea7c944d..7162b031 100644 --- a/music/sfx/sfx_08_1d.asm +++ b/music/sfx/sfx_08_1d.asm @@ -1,83 +1,36 @@ SFX_08_1d_Ch1: ; 209d7 (8:49d7) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - note A#, 1 - note C_, 8 - note D_, 7 - octave 2 - note A#, 4 - note C_, 8 - note D_, 11 - unknownmusic0xf4 - note A#, 1 - note C_, 8 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 dutycycle 165 - note D_, 11 - unknownmusic0xf6 - notetype 8, 0, 7 - note D_, 5 - octave 5 - notetype 7, 0, 7 - note D_, 16 - unknownmusic0xf2 - notetype 8, 0, 7 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 endchannel SFX_08_1d_Ch2: ; 209f4 (8:49f4) dutycycle 5 - note D_, 3 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 16 - note A#, 8 - note A#, 2 - note C_, 7 - note D_, 7 - note G#, 7 - note A#, 3 - note C_, 7 - note D_, 11 - note G_, 5 - note A#, 2 - note C_, 7 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 dutycycle 95 - note D_, 11 - note G_, 7 - notetype 6, 0, 6 - note D_, 5 - note G#, 4 - notetype 9, 0, 6 - note D_, 16 - note A#, 3 - notetype 7, 0, 6 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 endchannel SFX_08_1d_Ch3: ; 20a15 (8:4a15) - note D_, 3 - unknownmusic0xf2 - note D#, 13 - note D_, 9 - octave 4 - note D#, 15 - note D_, 16 - notetype 7, 3, 12 - note D_, 7 - rest 6 - note D#, 12 - note D_, 7 - octave 4 - note D#, 14 - note D_, 9 - note B_, 7 - note D#, 13 - note D_, 7 - notetype 4, 3, 13 - note D_, 9 - rest 2 - note D#, 12 + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 endchannel ; 0x20a2e \ No newline at end of file diff --git a/music/sfx/sfx_08_1e.asm b/music/sfx/sfx_08_1e.asm index 8b116c46..13475f11 100644 --- a/music/sfx/sfx_08_1e.asm +++ b/music/sfx/sfx_08_1e.asm @@ -1,94 +1,36 @@ SFX_08_1e_Ch1: ; 20e72 (8:4e72) dutycycle 240 - note D_, 9 - unknownmusic0xf7 - octave 8 - note C_, 7 - note D_, 7 - octave 2 - octave 3 - note C_, 7 - note D_, 4 - unknownmusic0xf4 - octave 8 - note C_, 7 - note D_, 4 - unknownmusic0xf6 - notetype 0, 0, 6 - note D_, 4 - octave 5 - rest 1 - note C_, 7 - note D_, 5 - unknownmusic0xf2 - note B_, 1 - note C_, 7 - note D_, 16 - note A#, 3 - rest 9 - note C_, 7 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 endchannel SFX_08_1e_Ch2: ; 20e91 (8:4e91) dutycycle 5 - note D_, 4 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 9 - note A#, 8 - note A#, 2 - note C_, 7 - note D_, 7 - note G#, 7 - note A#, 4 - note C_, 7 - note D_, 4 - note G_, 5 - note A#, 2 - note C_, 7 - note D_, 4 - note G_, 7 - note A_, 2 - note C_, 7 - note D_, 4 - note G#, 4 - note G#, 3 - note C_, 7 - note D_, 5 - note A#, 3 - note G_, 2 - note C_, 7 - note D_, 16 - note G_, 3 - note G#, 10 - note C_, 7 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 endchannel SFX_08_1e_Ch3: ; 20eb4 (8:4eb4) - note D_, 3 - unknownmusic0xf2 - note D#, 13 - note D_, 9 - octave 4 - note D#, 15 - note D_, 9 - notetype 7, 3, 12 - note D_, 6 - rest 6 - note D#, 12 - note D_, 4 - notetype 4, 2, 12 - note D_, 3 - note B_, 7 - note D#, 13 - note D_, 4 - note A#, 5 - note D_, 13 - note D_, 9 - note A_, 2 - note D#, 13 + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 endchannel ; 0x20ecd \ No newline at end of file diff --git a/music/sfx/sfx_08_1f.asm b/music/sfx/sfx_08_1f.asm index 081b729c..a882c512 100644 --- a/music/sfx/sfx_08_1f.asm +++ b/music/sfx/sfx_08_1f.asm @@ -1,98 +1,38 @@ SFX_08_1f_Ch1: ; 20d03 (8:4d03) dutycycle 204 - note D_, 5 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 5 - octave 7 - note G#, 1 - note C_, 8 - note D_, 5 - notetype 1, 4, 0 - note C_, 8 - note D_, 5 - octave 7 - note E_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 - note D_, 5 - notetype 1, 0, 0 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 5 - notetype 1, 8, 2 - note C_, 8 - note D_, 5 - rest 2 - note E_, 3 - note C_, 8 - note D_, 9 - note B_, 2 - note E_, 2 - note C_, 8 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 endchannel SFX_08_1f_Ch2: ; 20d2e (8:4d2e) dutycycle 68 - note D_, 13 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 5 - octave 7 - note G#, 3 - note C_, 8 - note D_, 5 - notetype 1, 4, 1 - note C_, 8 - note D_, 5 - octave 7 - note E_, 2 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note G#, 3 - note C_, 8 - note D_, 9 - notetype 1, 0, 1 - note C_, 8 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 endchannel SFX_08_1f_Ch3: ; 20d4d (8:4d4d) - note D_, 16 - note C_, 9 - note C_, 1 - note D_, 5 - note C_, 9 - note C_, 1 - note D_, 5 - notetype 1, 4, 12 - note D_, 5 - note B_, 2 - note D_, 13 - note D_, 5 - notetype 1, 3, 12 - note D_, 5 - note B_, 2 - note D#, 13 - note D_, 5 - rest 2 - note D_, 13 - note D_, 9 - note A#, 2 - note E_, 13 + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 endchannel ; 0x20d66 \ No newline at end of file diff --git a/music/sfx/sfx_08_20.asm b/music/sfx/sfx_08_20.asm index 94432f09..94a54b0a 100644 --- a/music/sfx/sfx_08_20.asm +++ b/music/sfx/sfx_08_20.asm @@ -1,78 +1,28 @@ SFX_08_20_Ch1: ; 20d66 (8:4d66) dutycycle 204 - note D_, 9 - unknownmusic0xf5 - note C_, 1 - note C_, 7 - note D_, 3 - notetype 2, 3, 8 - note C_, 7 - note D_, 3 - rest 3 - note D#, 1 - note C_, 7 - note D_, 3 - rest 3 - note D_, 9 - note C_, 7 - note D_, 3 - note B_, 3 - note D_, 1 - note C_, 7 - note D_, 3 - note B_, 3 - note C#, 1 - note C_, 7 - note D_, 3 - note A#, 3 - note C#, 9 - note C_, 7 - note D_, 3 - note B_, 3 - note C#, 1 - note C_, 7 - note D_, 9 - rest 2 - note D_, 1 - note C_, 7 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 endchannel SFX_08_20_Ch2: ; 20d8d (8:4d8d) dutycycle 68 - note D_, 13 - rest 4 - rest 1 - note C_, 6 - note D_, 4 - note B_, 2 - unknownmusic0xf9 - note C_, 6 - note D_, 3 - note A#, 2 - unknownmusic0xf1 - note C_, 6 - note D_, 3 - note A#, 2 - unknownmusic0xe9 - note C_, 6 - note D_, 3 - note A_, 2 - octave 7 - note C_, 6 - note D_, 3 - note A_, 2 - notetype 9, 0, 5 - note D_, 3 - note G#, 2 - notetype 1, 0, 5 - note D_, 3 - note A_, 2 - notetype 9, 0, 5 - note D_, 9 - note A_, 2 - octave 7 - note C_, 6 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 SFX_08_20_Ch3: ; 20db3 (8:4db3) diff --git a/music/sfx/sfx_08_21.asm b/music/sfx/sfx_08_21.asm index d6cadd3b..4bfaac76 100644 --- a/music/sfx/sfx_08_21.asm +++ b/music/sfx/sfx_08_21.asm @@ -1,106 +1,41 @@ SFX_08_21_Ch1: ; 20dd2 (8:4dd2) dutycycle 136 - note D_, 6 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note D_, 10 - notetype 1, 6, 0 - note C_, 7 - note D_, 6 - octave 6 - note C#, 3 - note C_, 7 - note D_, 10 - rest 2 - note D_, 3 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 1 - note C_, 7 - note D_, 7 - notetype 1, 2, 0 - note C_, 7 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 loopchannel 2, SFX_08_21_Ch1 endchannel SFX_08_21_Ch2: ; 20df1 (8:4df1) dutycycle 64 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 6 - unknownmusic0xf2 - note F_, 2 - note C_, 7 - note D_, 10 - notetype 1, 6, 1 - note C_, 7 - note D_, 6 - octave 6 - note C#, 5 - note C_, 7 - note D_, 9 - rest 2 - note D_, 5 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 2 - note C_, 7 - note D_, 13 - notetype 1, 2, 1 - note C_, 7 - note D_, 6 - octave 6 - note C#, 5 - note C_, 7 - note D_, 9 - rest 2 - note D_, 5 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 2 - note C_, 7 - note D_, 5 - notetype 1, 2, 1 - note C_, 7 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 endchannel SFX_08_21_Ch3: ; 20e20 (8:4e20) - note D_, 7 - notetype 2, 1, 12 - note D_, 10 - note B_, 2 - note D_, 13 - note D_, 9 - rest 3 - note D_, 13 - note D_, 10 - note B_, 2 - note D#, 13 - note D_, 7 - rest 3 - note D_, 13 - note D_, 10 - note A#, 3 - note D#, 13 - note D_, 8 - rest 3 - note D_, 13 - note D_, 6 - note A#, 2 - note D#, 13 - note D_, 10 - rest 3 - note D_, 13 - note D_, 5 - note A#, 2 - note D#, 13 + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 endchannel ; 0x20e3f \ No newline at end of file diff --git a/music/sfx/sfx_08_22.asm b/music/sfx/sfx_08_22.asm index 5e2c3b20..b922acb3 100644 --- a/music/sfx/sfx_08_22.asm +++ b/music/sfx/sfx_08_22.asm @@ -1,54 +1,24 @@ SFX_08_22_Ch1: ; 20c57 (8:4c57) dutycycle 165 - note D_, 5 - octave 7 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf2 - note G#, 1 - note C_, 8 - note D_, 3 - note A_, 3 - note E_, 1 - note C_, 8 - note D_, 9 - octave 7 - note C_, 1 - note C_, 7 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 endchannel SFX_08_22_Ch2: ; 20c6a (8:4c6a) dutycycle 10 - note D_, 5 - note B_, 2 - octave 7 - note C_, 7 - note D_, 4 - rest 3 - octave 7 - note C_, 7 - note D_, 4 - note F#, 3 - note G#, 2 - note C_, 7 - note D_, 9 - note B_, 2 - octave 7 - note C_, 6 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 endchannel SFX_08_22_Ch3: ; 20c7d (8:4c7d) - note D_, 3 - note F#, 2 - note D#, 3 - note D_, 3 - note F#, 2 - note D_, 2 - note D_, 9 - note F#, 2 - note C#, 2 + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 endchannel ; 0x20c87 \ No newline at end of file diff --git a/music/sfx/sfx_08_23.asm b/music/sfx/sfx_08_23.asm index 90edadb7..9a78abd2 100644 --- a/music/sfx/sfx_08_23.asm +++ b/music/sfx/sfx_08_23.asm @@ -1,75 +1,30 @@ SFX_08_23_Ch1: ; 20b99 (8:4b99) dutycycle 241 - note D_, 5 - unknownmusic0xf7 - rest 1 - note C_, 8 - note D_, 13 - octave 2 - rest 3 - note C_, 8 - note D_, 7 - note B_, 6 - note G#, 1 - note C_, 7 - note D_, 5 - rest 5 - note G_, 1 - note C_, 7 - note D_, 5 - note B_, 6 - note F#, 1 - note C_, 7 - note D_, 9 - rest 2 - note E_, 1 - note C_, 7 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 endchannel SFX_08_23_Ch2: ; 20bb4 (8:4bb4) dutycycle 204 - note D_, 4 - rest 8 - note G#, 2 - note C_, 8 - note D_, 13 - note B_, 7 - note G#, 1 - note C_, 8 - note D_, 7 - note A#, 6 - note E_, 2 - note C_, 7 - note D_, 5 - rest 5 - note D#, 3 - note C_, 7 - note D_, 7 - note B_, 6 - note D_, 2 - note C_, 7 - note D_, 9 - note A#, 2 - note C_, 3 - note C_, 7 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 endchannel SFX_08_23_Ch3: ; 20bcf (8:4bcf) - note D_, 4 - octave 4 - note D#, 13 - note D_, 13 - notetype 6, 2, 12 - note D_, 5 - octave 4 - note D#, 13 - note D_, 9 - note B_, 8 - note F_, 13 - note D_, 16 - rest 3 - note F_, 14 + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 endchannel ; 0x20bdf \ No newline at end of file diff --git a/music/sfx/sfx_08_24.asm b/music/sfx/sfx_08_24.asm index be3be69d..2bdc4e9d 100644 --- a/music/sfx/sfx_08_24.asm +++ b/music/sfx/sfx_08_24.asm @@ -1,83 +1,32 @@ SFX_08_24_Ch1: ; 20bdf (8:4bdf) dutycycle 201 - note D_, 9 - unknownmusic0xf7 - note G#, 1 - note C_, 7 - note D_, 3 - unknownmusic0xf7 - note F#, 1 - note C_, 7 - note D_, 2 - octave 1 - note E_, 1 - note C_, 7 - note D_, 2 - octave 1 - note D_, 1 - note C_, 7 - note D_, 16 - notetype 1, 0, 0 - note C_, 7 - note D_, 5 - rest 8 - note E_, 1 - note C_, 8 - note D_, 5 - note A#, 8 - note D#, 1 - note C_, 8 - note D_, 16 - note A_, 2 - note D_, 1 - note C_, 8 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 endchannel SFX_08_24_Ch2: ; 20c02 (8:4c02) dutycycle 121 - note D_, 11 - octave 1 - note G#, 3 - note C_, 7 - note D_, 3 - octave 1 - note F#, 3 - note C_, 7 - note D_, 2 - notetype 7, 4, 2 - note C_, 7 - note D_, 2 - notetype 7, 2, 2 - note C_, 7 - note D_, 16 - rest 2 - note C_, 3 - note C_, 7 - note D_, 5 - note B_, 8 - note E_, 3 - note C_, 8 - note D_, 3 - note A_, 8 - note D#, 3 - note C_, 8 - note D_, 16 - note G#, 2 - note D_, 3 - note C_, 8 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 endchannel SFX_08_24_Ch3: ; 20c25 (8:4c25) - note D_, 5 - note G_, 5 - note D_, 2 - note D_, 5 - note G_, 5 - note C#, 1 - note D_, 5 - note G_, 2 - note D_, 1 + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 endchannel ; 0x20c2f \ No newline at end of file diff --git a/music/sfx/sfx_08_25.asm b/music/sfx/sfx_08_25.asm index ab680595..84f8f816 100644 --- a/music/sfx/sfx_08_25.asm +++ b/music/sfx/sfx_08_25.asm @@ -1,87 +1,35 @@ SFX_08_25_Ch1: ; 20abb (8:4abb) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - note A#, 1 - note C_, 8 - note D_, 9 - octave 2 - note A#, 5 - note C_, 8 - note D_, 5 - notetype 6, 10, 0 - note C_, 8 - note D_, 16 - notetype 3, 2, 0 - note C_, 8 - note D_, 9 - rest 4 - note D_, 4 - note C_, 8 - note D_, 3 - rest 3 - note D_, 9 - note C_, 8 - note D_, 9 - note B_, 2 - note D#, 1 - note C_, 8 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 endchannel SFX_08_25_Ch2: ; 20ada (8:4ada) dutycycle 10 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 7 - note A#, 8 - note E_, 2 - note C_, 8 - note D_, 9 - note G#, 7 - note E_, 4 - note C_, 8 - note D_, 5 - note G_, 7 - note E_, 2 - note C_, 8 - note D_, 14 - note G#, 4 - rest 3 - note C_, 7 - note D_, 8 - note G_, 4 - rest 2 - note C_, 7 - note D_, 4 - note G#, 3 - rest 13 - note C_, 7 - note D_, 9 - note G_, 2 - notetype 8, 0, 6 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 endchannel SFX_08_25_Ch3: ; 20afd (8:4afd) - note D_, 3 - unknownmusic0xf2 - note E_, 13 - note D_, 7 - octave 2 - note D#, 11 - note D_, 5 - notetype 7, 3, 10 - note D_, 7 - notetype 6, 2, 12 - note D_, 9 - octave 3 - note D#, 13 - note D_, 13 - notetype 2, 3, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 endchannel ; 0x20b13 \ No newline at end of file diff --git a/music/sfx/sfx_08_26.asm b/music/sfx/sfx_08_26.asm index 5b886f93..90ae7cb9 100644 --- a/music/sfx/sfx_08_26.asm +++ b/music/sfx/sfx_08_26.asm @@ -1,52 +1,25 @@ SFX_08_26_Ch1: ; 20fd3 (8:4fd3) dutycycle 165 - note D_, 13 - unknownmusic0xf2 - note E_, 1 - note C_, 5 - note D_, 16 - octave 5 - note A#, 1 - note C_, 5 - note D_, 5 - notetype 2, 9, 0 - note C_, 5 - note D_, 9 - notetype 1, 8, 0 - note C_, 5 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 endchannel SFX_08_26_Ch2: ; 20fe6 (8:4fe6) dutycycle 238 - note D_, 12 - notetype 2, 3, 8 - note C_, 5 - note D_, 15 - rest 7 - note A_, 9 - note C_, 5 - note D_, 4 - note B_, 3 - note G#, 9 - note C_, 5 - note D_, 9 - note B_, 2 - note G_, 9 - note C_, 5 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 endchannel SFX_08_26_Ch3: ; 20ff9 (8:4ff9) - note D_, 11 - octave 2 - note F#, 13 - note D_, 16 - notetype 2, 5, 12 - note D_, 4 - rest 3 - note F#, 13 - note D_, 9 - notetype 1, 5, 12 + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 endchannel ; 0x21006 \ No newline at end of file diff --git a/music/sfx/sfx_08_27.asm b/music/sfx/sfx_08_27.asm index 8599f13a..6eb9474d 100644 --- a/music/sfx/sfx_08_27.asm +++ b/music/sfx/sfx_08_27.asm @@ -1,74 +1,31 @@ SFX_08_27_Ch1: ; 21006 (8:5006) dutycycle 51 - note D_, 16 - unknownmusic0xf6 - rest 1 - note C_, 6 - note D_, 9 - octave 5 - note B_, 13 - note C_, 6 - note D_, 7 - notetype 2, 13, 0 - note C_, 6 - note D_, 7 - note B_, 3 - octave 8 - note C_, 6 - note D_, 7 - rest 3 - stereopanning 5 - note D_, 9 - note B_, 2 - note C_, 1 - note C_, 7 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 endchannel SFX_08_27_Ch2: ; 21021 (8:5021) dutycycle 153 - note D_, 15 - rest 7 - note B_, 2 - note C_, 5 - note D_, 8 - rest 4 - note A#, 14 - note C_, 5 - note D_, 6 - note B_, 3 - rest 2 - note C_, 5 - note D_, 9 - note A_, 3 - notetype 1, 0, 4 - note D_, 7 - note A#, 3 - octave 7 - note C_, 5 - note D_, 9 - note A_, 2 - unknownmusic0xf1 - note C_, 5 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 endchannel SFX_08_27_Ch3: ; 2103c (8:503c) - note D_, 11 - octave 2 - note F_, 13 - note D_, 11 - notetype 6, 6, 12 - note D_, 5 - rest 3 - note E_, 13 - note D_, 7 - notetype 3, 5, 12 - note D_, 9 - note B_, 4 - note E_, 13 - note D_, 9 - note A#, 2 - note F_, 13 + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 endchannel ; 0x2104f \ No newline at end of file diff --git a/music/sfx/sfx_08_28.asm b/music/sfx/sfx_08_28.asm index 78931129..2d6b2a3c 100644 --- a/music/sfx/sfx_08_28.asm +++ b/music/sfx/sfx_08_28.asm @@ -1,44 +1,22 @@ SFX_08_28_Ch1: ; 2104f (8:504f) dutycycle 240 - note D_, 9 - octave 4 - note A_, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf5 - rest 1 - note C_, 8 - note D_, 9 - notetype 1, 13, 8 - note C_, 8 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 endchannel SFX_08_28_Ch2: ; 2105e (8:505e) dutycycle 165 - note D_, 11 - rest 5 - note G_, 2 - note C_, 8 - note D_, 16 - note B_, 7 - note A#, 3 - note C_, 8 - note D_, 9 - note A#, 2 - note B_, 8 - note C_, 8 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 endchannel SFX_08_28_Ch3: ; 2106d (8:506d) - note D_, 9 - octave 4 - note E_, 13 - note D_, 15 - rest 5 - note D#, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 endchannel ; 0x21077 \ No newline at end of file diff --git a/music/sfx/sfx_08_29.asm b/music/sfx/sfx_08_29.asm index 58a91cb0..66842f0a 100644 --- a/music/sfx/sfx_08_29.asm +++ b/music/sfx/sfx_08_29.asm @@ -1,76 +1,31 @@ SFX_08_29_Ch1: ; 210dd (8:50dd) dutycycle 240 - note D_, 5 - unknownmusic0xf3 - note G#, 1 - note C_, 8 - note D_, 16 - octave 1 - note C_, 1 - note C_, 8 - note D_, 9 - notetype 3, 1, 0 - note C_, 8 - note D_, 5 - rest 3 - note C_, 1 - note C_, 8 - note D_, 5 - notetype 2, 15, 0 - note C_, 7 - note D_, 9 - rest 2 - octave 8 - note C_, 7 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 endchannel SFX_08_29_Ch2: ; 210f8 (8:50f8) dutycycle 90 - note D_, 7 - rest 4 - note C_, 2 - note C_, 8 - note D_, 15 - note B_, 8 - note G#, 2 - note C_, 7 - note D_, 8 - note B_, 4 - note A_, 3 - note C_, 7 - note D_, 4 - note A#, 3 - note G#, 2 - note C_, 7 - note D_, 5 - note B_, 3 - note G_, 3 - note C_, 7 - note D_, 9 - note A#, 2 - note F#, 2 - note C_, 7 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 endchannel SFX_08_29_Ch3: ; 21113 (8:5113) - note D_, 7 - octave 5 - note F_, 13 - note D_, 15 - notetype 6, 4, 12 - note D_, 7 - rest 7 - note D#, 13 - note D_, 4 - note B_, 4 - note E_, 13 - note D_, 4 - note A#, 3 - note F_, 13 - note D_, 9 - note B_, 2 - note F#, 13 + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 endchannel ; 0x21126 \ No newline at end of file diff --git a/music/sfx/sfx_08_2a.asm b/music/sfx/sfx_08_2a.asm index 6d7ef179..d3494708 100644 --- a/music/sfx/sfx_08_2a.asm +++ b/music/sfx/sfx_08_2a.asm @@ -1,44 +1,22 @@ SFX_08_2a_Ch1: ; 20f70 (8:4f70) dutycycle 240 - note D_, 16 - notetype 7, 8, 0 - note C_, 8 - note D_, 5 - octave 2 - note A#, 1 - note C_, 8 - note D_, 16 - notetype 2, 4, 0 - note C_, 8 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 endchannel SFX_08_2a_Ch2: ; 20f7f (8:4f7f) dutycycle 90 - note D_, 16 - rest 8 - note F_, 4 - note C_, 8 - note D_, 6 - note B_, 7 - note G_, 3 - note C_, 8 - note D_, 16 - rest 3 - note C#, 2 - note C_, 8 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 endchannel SFX_08_2a_Ch3: ; 20f8e (8:4f8e) - note D_, 14 - unknownmusic0xf6 - note E_, 13 - note D_, 5 - octave 2 - note D#, 13 - note D_, 16 - unknownmusic0xf2 - note E_, 13 + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 endchannel ; 0x20f98 \ No newline at end of file diff --git a/music/sfx/sfx_08_2b.asm b/music/sfx/sfx_08_2b.asm index 6e2e7127..301c9712 100644 --- a/music/sfx/sfx_08_2b.asm +++ b/music/sfx/sfx_08_2b.asm @@ -1,56 +1,25 @@ SFX_08_2b_Ch1: ; 21126 (8:5126) dutycycle 15 - note D_, 16 - unknownmusic0xf7 - note C_, 1 - note C_, 6 - note D_, 16 - octave 1 - note C_, 9 - note C_, 6 - note D_, 9 - note B_, 5 - note G#, 1 - note C_, 5 - note D_, 16 - note A#, 3 - note F#, 1 - note C_, 5 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 endchannel SFX_08_2b_Ch2: ; 21139 (8:5139) dutycycle 68 - note D_, 15 - notetype 7, 8, 1 - note C_, 5 - note D_, 15 - rest 8 - note G#, 10 - note C_, 5 - note D_, 11 - note B_, 5 - note C_, 2 - note C_, 5 - note D_, 16 - rest 3 - octave 7 - note C_, 4 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 endchannel SFX_08_2b_Ch3: ; 2114c (8:514c) - note D_, 15 - unknownmusic0xf7 - note G_, 13 - note D_, 13 - unknownmusic0xf6 - note F#, 13 - note D_, 10 - octave 4 - note G_, 13 - note D_, 16 - octave 6 - note F#, 13 + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 endchannel ; 0x21159 \ No newline at end of file diff --git a/music/sfx/sfx_08_2c.asm b/music/sfx/sfx_08_2c.asm index 02479f52..d3844d4a 100644 --- a/music/sfx/sfx_08_2c.asm +++ b/music/sfx/sfx_08_2c.asm @@ -1,90 +1,35 @@ SFX_08_2c_Ch1: ; 21236 (8:5236) dutycycle 80 - note D_, 11 - unknownmusic0xf5 - note G#, 1 - note C_, 7 - note D_, 4 - octave 6 - note A#, 1 - note C_, 7 - note D_, 4 - unknownmusic0xf2 - rest 1 - note C_, 7 - note D_, 4 - octave 6 - octave 8 - note C_, 7 - note D_, 4 - notetype 2, 0, 0 - note C_, 8 - note D_, 4 - rest 3 - octave 8 - note C_, 7 - note D_, 4 - notetype 2, 12, 0 - note C_, 7 - note D_, 9 - rest 2 - note A#, 1 - note C_, 7 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 endchannel SFX_08_2c_Ch2: ; 21259 (8:5259) dutycycle 15 - note D_, 10 - notetype 5, 3, 1 - note C_, 7 - note D_, 4 - notetype 2, 5, 2 - note C_, 7 - note D_, 4 - octave 6 - note G_, 2 - note C_, 7 - note D_, 4 - note B_, 3 - note A_, 2 - note C_, 7 - note D_, 4 - rest 3 - note B_, 3 - note C_, 7 - note D_, 4 - note B_, 3 - note A_, 2 - note C_, 7 - note D_, 4 - rest 3 - note G_, 2 - note C_, 7 - note D_, 9 - note B_, 2 - note F_, 2 - note C_, 7 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 endchannel SFX_08_2c_Ch3: ; 2127c (8:527c) - note D_, 7 - octave 5 - note E_, 13 - note D_, 5 - rest 4 - note D#, 13 - note D_, 6 - notetype 4, 3, 12 - note D_, 5 - rest 5 - note D_, 13 - note D_, 7 - note B_, 5 - note D#, 13 - note D_, 9 - rest 2 - note D_, 13 + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 endchannel ; 0x2128f \ No newline at end of file diff --git a/music/sfx/sfx_08_2d.asm b/music/sfx/sfx_08_2d.asm index 3d6aaa3e..3e28d648 100644 --- a/music/sfx/sfx_08_2d.asm +++ b/music/sfx/sfx_08_2d.asm @@ -1,36 +1,17 @@ SFX_08_2d_Ch1: ; 20f4e (8:4f4e) dutycycle 27 - note D_, 8 - notetype 2, 4, 0 - note C_, 8 - note D_, 16 - octave 3 - note F#, 1 - note C_, 8 - note D_, 16 - rest 2 - note D#, 1 - note C_, 8 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 endchannel SFX_08_2d_Ch2: ; 20f5d (8:4f5d) dutycycle 129 - note D_, 3 - rest 3 - note C_, 2 - note C_, 8 - note D_, 5 - rest 3 - note C_, 9 - note C_, 8 - note D_, 16 - notetype 7, 4, 1 - note C_, 8 - note D_, 16 - note A#, 3 - note C_, 2 - note C_, 8 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 SFX_08_2d_Ch3: ; 20f6f (8:4f6f) diff --git a/music/sfx/sfx_08_2e.asm b/music/sfx/sfx_08_2e.asm index e20f9d69..fea62a2f 100644 --- a/music/sfx/sfx_08_2e.asm +++ b/music/sfx/sfx_08_2e.asm @@ -1,74 +1,31 @@ SFX_08_2e_Ch1: ; 211a7 (8:51a7) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - note E_, 1 - note C_, 8 - note D_, 13 - octave 2 - note E_, 5 - note C_, 8 - note D_, 7 - notetype 5, 5, 0 - note C_, 8 - note D_, 5 - rest 4 - note F#, 1 - note C_, 8 - note D_, 4 - rest 4 - note G#, 1 - note C_, 8 - note D_, 9 - notetype 1, 10, 0 - note C_, 8 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 endchannel SFX_08_2e_Ch2: ; 211c2 (8:51c2) dutycycle 10 - note D_, 7 - rest 8 - note C_, 2 - note C_, 8 - note D_, 12 - note B_, 7 - note C_, 3 - note C_, 8 - note D_, 7 - note A#, 6 - note C#, 2 - note C_, 8 - note D_, 5 - note A_, 4 - note D_, 2 - note C_, 8 - note D_, 4 - note A#, 4 - note E_, 2 - note C_, 8 - note D_, 9 - note A_, 2 - note F#, 3 - note C_, 8 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 endchannel SFX_08_2e_Ch3: ; 211dd (8:51dd) - note D_, 4 - octave 6 - note D#, 13 - note D_, 9 - notetype 6, 4, 12 - note D_, 6 - notetype 4, 3, 12 - note D_, 13 - rest 8 - note E_, 13 - note D_, 3 - octave 6 - note D#, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 endchannel ; 0x211f0 \ No newline at end of file diff --git a/music/sfx/sfx_08_2f.asm b/music/sfx/sfx_08_2f.asm index e72aae9f..fcfa40e0 100644 --- a/music/sfx/sfx_08_2f.asm +++ b/music/sfx/sfx_08_2f.asm @@ -1,61 +1,27 @@ SFX_08_2f_Ch1: ; 20f98 (8:4f98) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - rest 1 - note C_, 7 - note D_, 16 - octave 1 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf4 - stereopanning 6 - note D_, 5 - octave 4 - octave 8 - note C_, 7 - note D_, 9 - notetype 1, 13, 0 - note C_, 7 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 endchannel SFX_08_2f_Ch2: ; 20faf (8:4faf) dutycycle 10 - note D_, 8 - octave 2 - note G#, 2 - note C_, 7 - note D_, 15 - notetype 5, 12, 1 - note C_, 7 - note D_, 5 - rest 5 - note B_, 2 - note C_, 7 - note D_, 5 - notetype 4, 10, 1 - note C_, 7 - note D_, 9 - rest 2 - note A_, 2 - note C_, 7 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 endchannel SFX_08_2f_Ch3: ; 20fc6 (8:4fc6) - note D_, 11 - note A#, 7 - note D#, 13 - note D_, 15 - note A_, 5 - note D_, 13 - note D_, 6 - note A#, 4 - note D#, 13 - note D_, 9 - note A_, 2 - note D_, 13 + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 endchannel ; 0x20fd3 \ No newline at end of file diff --git a/music/sfx/sfx_08_30.asm b/music/sfx/sfx_08_30.asm index 55ed2640..600b72f2 100644 --- a/music/sfx/sfx_08_30.asm +++ b/music/sfx/sfx_08_30.asm @@ -1,80 +1,32 @@ SFX_08_30_Ch1: ; 21159 (8:5159) dutycycle 245 - note D_, 8 - notetype 6, 14, 1 - note C_, 8 - note D_, 7 - rest 7 - octave 6 - note C_, 8 - note D_, 10 - notetype 6, 14, 1 - note C_, 8 - note D_, 8 - rest 7 - octave 8 - note C_, 8 - note D_, 6 - note B_, 7 - octave 6 - note C_, 8 - note D_, 8 - rest 7 - octave 7 - note C_, 8 - note D_, 7 - note B_, 7 - octave 8 - note C_, 8 - note D_, 9 - note A#, 2 - notetype 15, 0, 7 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 endchannel SFX_08_30_Ch2: ; 2117c (8:517c) dutycycle 68 - note D_, 7 - rest 4 - rest 10 - note C_, 8 - note D_, 7 - note B_, 4 - rest 8 - note C_, 8 - note D_, 11 - rest 5 - rest 4 - note C_, 8 - note D_, 9 - note B_, 5 - rest 8 - note C_, 8 - note D_, 7 - rest 4 - rest 10 - note C_, 8 - note D_, 16 - note A#, 3 - rest 6 - note C_, 8 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 endchannel SFX_08_30_Ch3: ; 21197 (8:5197) - note D_, 14 - note C#, 10 - note G_, 13 - note D_, 14 - unknownmusic0xf7 - note G#, 13 - note D_, 13 - notetype 6, 7, 12 - note D_, 9 - rest 5 - note F#, 13 - note D_, 16 - note B_, 4 - note F_, 13 + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 endchannel ; 0x211a7 \ No newline at end of file diff --git a/music/sfx/sfx_08_31.asm b/music/sfx/sfx_08_31.asm index 26caae0f..d43791b0 100644 --- a/music/sfx/sfx_08_31.asm +++ b/music/sfx/sfx_08_31.asm @@ -1,72 +1,30 @@ SFX_08_31_Ch1: ; 211f0 (8:51f0) dutycycle 244 - note D_, 16 - stereopanning 5 - note C_, 8 - note D_, 11 - octave 8 - note C_, 1 - note C_, 8 - note D_, 7 - note B_, 5 - note C#, 1 - note C_, 8 - note D_, 5 - notetype 3, 0, 0 - note C_, 8 - note D_, 7 - note B_, 3 - note D_, 1 - note C_, 7 - note D_, 9 - note A#, 2 - note D_, 5 - note C_, 7 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 endchannel SFX_08_31_Ch2: ; 2120b (8:520b) dutycycle 34 - note D_, 16 - note B_, 1 - rest 4 - note C_, 7 - note D_, 11 - note A#, 1 - rest 2 - note C_, 7 - note D_, 7 - note G#, 5 - notetype 2, 0, 6 - note D_, 5 - note A_, 4 - rest 2 - note C_, 7 - note D_, 7 - note G#, 3 - octave 7 - note C_, 6 - note D_, 9 - note F#, 2 - unknownmusic0xe8 - note C_, 6 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 endchannel SFX_08_31_Ch3: ; 21226 (8:5226) - note D_, 7 - octave 2 - note E_, 13 - note D_, 16 - notetype 6, 3, 12 - note D_, 11 - rest 6 - note E_, 11 - note D_, 2 - note B_, 3 - note F_, 12 - note D_, 16 - rest 3 - note E_, 13 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 endchannel ; 0x21236 \ No newline at end of file diff --git a/music/sfx/sfx_08_32.asm b/music/sfx/sfx_08_32.asm index a3787989..886df035 100644 --- a/music/sfx/sfx_08_32.asm +++ b/music/sfx/sfx_08_32.asm @@ -1,105 +1,39 @@ SFX_08_32_Ch1: ; 21077 (8:5077) dutycycle 240 - note D_, 7 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note D_, 7 - octave 6 - note E_, 1 - note C_, 7 - note D_, 7 - notetype 2, 8, 0 - note C_, 7 - note D_, 7 - octave 6 - rest 1 - note C_, 7 - note D_, 7 - notetype 2, 0, 0 - note C_, 8 - note D_, 7 - rest 3 - note E_, 1 - note C_, 8 - note D_, 7 - note B_, 3 - note G#, 1 - note C_, 8 - note D_, 9 - note A#, 2 - rest 1 - note C_, 8 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 endchannel SFX_08_32_Ch2: ; 2109a (8:509a) dutycycle 17 - note D_, 4 - note C_, 9 - note C_, 2 - note C_, 1 - note D_, 7 - rest 3 - rest 2 - note C_, 6 - note D_, 7 - note B_, 3 - note C_, 3 - note C_, 7 - note D_, 7 - note A#, 3 - note E_, 2 - note C_, 7 - note D_, 7 - note B_, 3 - note G#, 3 - note C_, 7 - note D_, 7 - note A#, 3 - rest 3 - note C_, 7 - note D_, 7 - note A_, 3 - note C_, 2 - note C_, 8 - note D_, 7 - note A#, 3 - note E_, 3 - note C_, 8 - note D_, 9 - note G#, 2 - note G#, 2 - note C_, 8 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 endchannel SFX_08_32_Ch3: ; 210c1 (8:50c1) - note D_, 7 - note C_, 9 - note C_, 2 - note D_, 6 - octave 6 - note F_, 13 - note D_, 6 - rest 3 - note E_, 13 - note D_, 6 - notetype 2, 3, 12 - note D_, 6 - note B_, 3 - note D_, 13 - note D_, 6 - rest 3 - note C#, 13 - note D_, 6 - note A#, 3 - note C#, 12 - note D_, 6 - note A_, 3 - note C#, 11 - note D_, 9 - note G#, 2 - note C#, 9 + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 endchannel ; 0x210dd \ No newline at end of file diff --git a/music/sfx/sfx_08_33.asm b/music/sfx/sfx_08_33.asm index 63e69ae1..098dd501 100644 --- a/music/sfx/sfx_08_33.asm +++ b/music/sfx/sfx_08_33.asm @@ -1,54 +1,25 @@ SFX_08_33_Ch1: ; 2128f (8:528f) dutycycle 165 - note D_, 4 - unknownmusic0xf4 - note E_, 2 - note C_, 7 - note D_, 14 - notetype 6, 2, 1 - note C_, 8 - note D_, 9 - unknownmusic0xf4 - note C#, 10 - note C_, 8 - note D_, 9 - rest 2 - note C#, 11 - note C_, 8 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 endchannel SFX_08_33_Ch2: ; 212a2 (8:52a2) dutycycle 204 - note D_, 5 - unknownmusic0xf4 - note G#, 1 - note C_, 6 - note D_, 15 - octave 2 - octave 8 - note C_, 7 - note D_, 9 - notetype 5, 13, 8 - note C_, 7 - note D_, 9 - notetype 1, 13, 12 - note C_, 7 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 endchannel SFX_08_33_Ch3: ; 212b5 (8:52b5) - note D_, 6 - rest 5 - note E_, 7 - note D_, 14 - note A#, 6 - note E_, 5 - note D_, 9 - rest 5 - note E_, 6 - note D_, 9 - note B_, 2 - note E_, 5 + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 endchannel ; 0x212c2 \ No newline at end of file diff --git a/music/sfx/sfx_08_34.asm b/music/sfx/sfx_08_34.asm index c0fe0578..f355ed72 100644 --- a/music/sfx/sfx_08_34.asm +++ b/music/sfx/sfx_08_34.asm @@ -1,53 +1,25 @@ SFX_08_34_Ch1: ; 212c2 (8:52c2) dutycycle 240 - note D_, 14 - unknownmusic0xf1 - note C#, 2 - note C_, 6 - note D_, 14 - octave 7 - note C#, 6 - note C_, 6 - note D_, 14 - octave 7 - note C#, 2 - note C_, 6 - note D_, 9 - notetype 1, 1, 1 - note C_, 6 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 endchannel SFX_08_34_Ch2: ; 212d5 (8:52d5) dutycycle 21 - note D_, 13 - octave 7 - note C_, 13 - note C_, 6 - note D_, 13 - notetype 1, 1, 0 - note C_, 6 - note D_, 15 - rest 2 - note C_, 13 - note C_, 6 - note D_, 9 - rest 2 - note C_, 11 - note C_, 6 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 endchannel SFX_08_34_Ch3: ; 212e8 (8:52e8) - note D_, 15 - unknownmusic0xf2 - note F#, 6 - note D_, 14 - octave 6 - note F_, 6 - note D_, 15 - notetype 2, 5, 6 - note D_, 9 - notetype 1, 6, 6 + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 endchannel ; 0x212f5 \ No newline at end of file diff --git a/music/sfx/sfx_08_35.asm b/music/sfx/sfx_08_35.asm index 32f9b26d..d55d627c 100644 --- a/music/sfx/sfx_08_35.asm +++ b/music/sfx/sfx_08_35.asm @@ -1,69 +1,26 @@ SFX_08_35_Ch1: ; 212f5 (8:52f5) dutycycle 27 - note D_, 4 - unknownmusic0xf3 - note F#, 5 - note C_, 6 - note D_, 3 - octave 6 - note E_, 5 - note C_, 6 - note D_, 6 - notetype 1, 2, 2 - note C_, 6 - note D_, 3 - note B_, 3 - note G#, 5 - note C_, 5 - note D_, 9 - notetype 1, 10, 2 - note C_, 5 - note D_, 4 - unknownmusic0xf3 - note D_, 5 - note C_, 6 - note D_, 5 - octave 4 - octave 4 - note C_, 5 - note D_, 9 - notetype 1, 0, 2 - note C_, 6 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 endchannel SFX_08_35_Ch2: ; 21318 (8:5318) dutycycle 204 - note D_, 4 - notetype 3, 6, 0 - note C_, 6 - note D_, 3 - rest 3 - note E_, 1 - note C_, 6 - note D_, 6 - rest 2 - note D_, 1 - note C_, 6 - note D_, 3 - note A_, 3 - note G#, 1 - note C_, 5 - note D_, 9 - rest 2 - note A#, 1 - note C_, 5 - note D_, 4 - notetype 3, 2, 0 - note C_, 6 - note D_, 4 - rest 5 - octave 8 - note C_, 5 - note D_, 9 - rest 2 - note C_, 1 - note C_, 6 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 SFX_08_35_Ch3: ; 2133a (8:533a) diff --git a/music/sfx/sfx_08_36.asm b/music/sfx/sfx_08_36.asm index 507667a0..f51a37a0 100644 --- a/music/sfx/sfx_08_36.asm +++ b/music/sfx/sfx_08_36.asm @@ -1,56 +1,25 @@ SFX_08_36_Ch1: ; 2133b (8:533b) dutycycle 17 - note D_, 3 - note D#, 14 - note G#, 2 - note C_, 4 - note D_, 8 - unknownmusic0xf5 - note C_, 2 - note C_, 7 - note D_, 2 - rest 3 - note G#, 2 - note C_, 5 - note D_, 9 - note A_, 2 - note G#, 2 - note C_, 4 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 endchannel SFX_08_36_Ch2: ; 2134e (8:534e) dutycycle 238 - note D_, 3 - note D#, 15 - note B_, 1 - note C_, 6 - note D_, 8 - notetype 5, 5, 13 - note C_, 8 - note D_, 2 - note B_, 3 - note B_, 1 - note C_, 7 - note D_, 9 - note F#, 2 - note B_, 1 - note C_, 6 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 endchannel SFX_08_36_Ch3: ; 21361 (8:5361) - note D_, 3 - note A_, 3 - note E_, 10 - note D_, 8 - note B_, 6 - note D_, 10 - note D_, 2 - note A#, 3 - note D#, 10 - note D_, 9 - note A_, 2 - note E_, 10 + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 endchannel ; 0x2136e \ No newline at end of file diff --git a/music/sfx/sfx_08_37.asm b/music/sfx/sfx_08_37.asm index 2805e7d5..813c4504 100644 --- a/music/sfx/sfx_08_37.asm +++ b/music/sfx/sfx_08_37.asm @@ -1,59 +1,26 @@ SFX_08_37_Ch1: ; 20a2e (8:4a2e) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - rest 1 - note C_, 8 - note D_, 7 - octave 4 - rest 2 - note C_, 8 - note D_, 11 - unknownmusic0xf6 - rest 1 - note C_, 8 - note D_, 5 - notetype 3, 12, 2 - note C_, 8 - note D_, 9 - rest 2 - rest 1 - note C_, 8 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 endchannel SFX_08_37_Ch2: ; 20a45 (8:4a45) dutycycle 95 - note D_, 16 - note A_, 8 - note G#, 2 - note C_, 8 - note D_, 7 - note G#, 5 - note G#, 1 - note C_, 8 - note D_, 11 - note A_, 7 - note G#, 2 - note C_, 8 - note D_, 16 - note G#, 4 - note G#, 2 - note C_, 8 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 endchannel SFX_08_37_Ch3: ; 20a58 (8:4a58) - note D_, 4 - unknownmusic0xf2 - note D#, 13 - note D_, 14 - octave 2 - note D_, 13 - note D_, 16 - notetype 7, 3, 12 - note D_, 9 - rest 2 - note D_, 13 + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 endchannel ; 0x20a65 \ No newline at end of file diff --git a/music/sfx/sfx_08_38.asm b/music/sfx/sfx_08_38.asm index 96dbc74b..b162539e 100644 --- a/music/sfx/sfx_08_38.asm +++ b/music/sfx/sfx_08_38.asm @@ -1,88 +1,34 @@ SFX_08_38_Ch1: ; 20a65 (8:4a65) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - note G#, 1 - note C_, 7 - note D_, 11 - octave 2 - note G#, 5 - note C_, 7 - note D_, 16 - notetype 7, 9, 0 - note C_, 7 - note D_, 9 - notetype 5, 9, 0 - note C_, 7 - note D_, 7 - rest 5 - note G#, 9 - note C_, 7 - note D_, 6 - notetype 3, 7, 0 - note C_, 7 - note D_, 5 - notetype 3, 6, 0 - note C_, 7 - note D_, 9 - rest 2 - note E_, 1 - note C_, 7 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 endchannel SFX_08_38_Ch2: ; 20a88 (8:4a88) dutycycle 5 - note D_, 16 - note B_, 8 - note E_, 2 - note C_, 7 - note D_, 11 - note A_, 7 - note E_, 3 - note C_, 7 - note D_, 16 - note A#, 8 - note F_, 2 - note C_, 7 - note D_, 9 - note A#, 6 - note F_, 2 - note C_, 7 - note D_, 7 - note A_, 5 - note E_, 8 - note C_, 7 - note D_, 6 - note A#, 4 - note D#, 2 - note C_, 7 - note D_, 5 - note A_, 4 - note D_, 3 - note C_, 7 - note D_, 9 - note G_, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 endchannel SFX_08_38_Ch3: ; 20aab (8:4aab) - note D_, 16 - octave 4 - note D#, 13 - note D_, 11 - rest 8 - note E_, 13 - note D_, 11 - rest 8 - note D#, 13 - note D_, 13 - note B_, 8 - note E_, 13 - note D_, 16 - note A#, 3 - note F_, 13 + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 endchannel ; 0x20abb \ No newline at end of file diff --git a/music/sfx/sfx_08_39.asm b/music/sfx/sfx_08_39.asm index c145e5a1..ecce76f2 100644 --- a/music/sfx/sfx_08_39.asm +++ b/music/sfx/sfx_08_39.asm @@ -1,63 +1,27 @@ SFX_08_39_Ch1: ; 20b13 (8:4b13) dutycycle 165 - note D_, 7 - unknownmusic0xf4 - note E_, 1 - note C_, 8 - note D_, 16 - octave 5 - note D#, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf4 - note E_, 1 - note C_, 8 - note D_, 6 - note B_, 4 - note E_, 9 - note C_, 8 - note D_, 9 - notetype 1, 5, 0 - note C_, 8 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 endchannel SFX_08_39_Ch2: ; 20b2a (8:4b2a) dutycycle 119 - note D_, 7 - rest 4 - note C#, 3 - note C_, 8 - note D_, 16 - note B_, 4 - note C_, 5 - note C_, 8 - note D_, 4 - rest 4 - note C#, 3 - note C_, 8 - note D_, 5 - rest 4 - note D_, 2 - note C_, 8 - note D_, 9 - note B_, 2 - note D#, 3 - note C_, 8 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 endchannel SFX_08_39_Ch3: ; 20b41 (8:4b41) - note D_, 9 - notetype 6, 2, 12 - note D_, 13 - rest 7 - note D#, 13 - note D_, 11 - note B_, 7 - note D_, 13 - note D_, 9 - note A_, 2 - note C#, 13 + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 endchannel ; 0x20b4e \ No newline at end of file diff --git a/music/sfx/sfx_08_3a.asm b/music/sfx/sfx_08_3a.asm index 7518cf8c..b7791942 100644 --- a/music/sfx/sfx_08_3a.asm +++ b/music/sfx/sfx_08_3a.asm @@ -1,9 +1,9 @@ SFX_08_3a_Ch1: ; 2397d (8:797d) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 6, 11, 4 octave 4 note F_, 4 @@ -21,7 +21,7 @@ SFX_08_3a_Ch1: ; 2397d (8:797d) SFX_08_3a_Ch2: ; 23998 (8:7998) - unknownmusic0xf8 + executemusic vibrato 4, 2, 2 duty 2 notetype 6, 12, 4 @@ -41,7 +41,7 @@ SFX_08_3a_Ch2: ; 23998 (8:7998) SFX_08_3a_Ch3: ; 239b0 (8:79b0) - unknownmusic0xf8 + executemusic notetype 6, 1, 0 octave 5 note A_, 4 diff --git a/music/sfx/sfx_08_3b.asm b/music/sfx/sfx_08_3b.asm index 2369ecaf..cd123b01 100644 --- a/music/sfx/sfx_08_3b.asm +++ b/music/sfx/sfx_08_3b.asm @@ -1,9 +1,9 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 5, 11, 4 octave 4 note D_, 4 @@ -26,7 +26,7 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7) SFX_08_3b_Ch2: ; 239e6 (8:79e6) - unknownmusic0xf8 + executemusic vibrato 8, 2, 7 duty 2 notetype 5, 12, 5 @@ -47,7 +47,7 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6) SFX_08_3b_Ch3: ; 239fe (8:79fe) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 5 note F_, 4 diff --git a/music/sfx/sfx_08_3c.asm b/music/sfx/sfx_08_3c.asm index f9b3a5ec..e9ebca58 100644 --- a/music/sfx/sfx_08_3c.asm +++ b/music/sfx/sfx_08_3c.asm @@ -1,18 +1,9 @@ SFX_08_3c_Ch1: ; 203dd (8:43dd) duty 2 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 3 - note C#, 1 - note D_, 3 - note D_, 9 - octave 6 - note C_, 1 - note C_, 3 - note C#, 1 - note C_, 9 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 endchannel ; 0x203ee \ No newline at end of file diff --git a/music/sfx/sfx_08_3d.asm b/music/sfx/sfx_08_3d.asm index d2a9539b..c2d411af 100644 --- a/music/sfx/sfx_08_3d.asm +++ b/music/sfx/sfx_08_3d.asm @@ -1,15 +1,8 @@ SFX_08_3d_Ch1: ; 203ee (8:43ee) duty 2 - note C#, 1 - note C#, 8 - note D_, 16 - stereopanning 240 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 endchannel ; 0x203fd \ No newline at end of file diff --git a/music/sfx/sfx_08_3e.asm b/music/sfx/sfx_08_3e.asm index c16790aa..3ac78576 100644 --- a/music/sfx/sfx_08_3e.asm +++ b/music/sfx/sfx_08_3e.asm @@ -1,22 +1,10 @@ SFX_08_3e_Ch1: ; 203fd (8:43fd) duty 2 - note C#, 1 - note C#, 5 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note C#, 1 - note C#, 8 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 endchannel ; 0x20412 \ No newline at end of file diff --git a/music/sfx/sfx_08_3f.asm b/music/sfx/sfx_08_3f.asm index 3f706555..a834f917 100644 --- a/music/sfx/sfx_08_3f.asm +++ b/music/sfx/sfx_08_3f.asm @@ -1,9 +1,5 @@ SFX_08_3f_Ch1: ; 203d6 (8:43d6) - note D_, 2 - octave 6 - note D#, 4 - note D_, 9 - octave 7 - note D_, 3 + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 endchannel ; 0x203dd \ No newline at end of file diff --git a/music/sfx/sfx_08_40.asm b/music/sfx/sfx_08_40.asm index dc67553e..7603a54a 100644 --- a/music/sfx/sfx_08_40.asm +++ b/music/sfx/sfx_08_40.asm @@ -1,18 +1,8 @@ SFX_08_40_Ch1: ; 203c3 (8:43c3) duty 2 - note D_, 1 - note A_, 2 - rest 1 - note C_, 8 - note D_, 1 - note G#, 2 - notetype 0, 0, 7 - note D_, 1 - note A_, 2 - rest 1 - note C_, 8 - note D_, 13 - note A#, 2 - notetype 0, 0, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 endchannel ; 0x203d6 \ No newline at end of file diff --git a/music/sfx/sfx_08_41.asm b/music/sfx/sfx_08_41.asm index a381cec1..f4825bb4 100644 --- a/music/sfx/sfx_08_41.asm +++ b/music/sfx/sfx_08_41.asm @@ -1,19 +1,12 @@ SFX_08_41_Ch1: ; 2042d (8:442d) duty 2 - note C#, 1 - note D_, 16 - note D_, 16 - unknownmusic0xf2 - note G#, 1 - note C_, 8 + unknownsfx0x10 47 + unknownsfx0x20 15, 242, 128, 7 endchannel SFX_08_41_Ch2: ; 20436 (8:4436) duty 2 - note D_, 16 - rest 3 - note G#, 3 - note C_, 8 + unknownsfx0x20 15, 194, 130, 7 endchannel ; 0x2043d \ No newline at end of file diff --git a/music/sfx/sfx_08_42.asm b/music/sfx/sfx_08_42.asm index af0f7057..43232843 100644 --- a/music/sfx/sfx_08_42.asm +++ b/music/sfx/sfx_08_42.asm @@ -1,19 +1,12 @@ SFX_08_42_Ch1: ; 2043d (8:443d) duty 2 - note C#, 1 - note C#, 7 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 5 - note C#, 1 - note C_, 9 + unknownsfx0x10 22 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 endchannel SFX_08_42_Ch2: ; 20448 (8:4448) - note D_, 16 - note A#, 3 - note D_, 3 + unknownnoise0x20 15, 162, 34 endchannel ; 0x2044c \ No newline at end of file diff --git a/music/sfx/sfx_08_43.asm b/music/sfx/sfx_08_43.asm index ffecddf0..53b1676d 100644 --- a/music/sfx/sfx_08_43.asm +++ b/music/sfx/sfx_08_43.asm @@ -1,21 +1,12 @@ SFX_08_43_Ch1: ; 2044c (8:444c) - note D_, 16 - notetype 1, 0, 0 - note C_, 3 - note C#, 1 - note C_, 9 + unknownsfx0x20 15, 209, 0, 2 + unknownsfx0x10 8 endchannel SFX_08_43_Ch2: ; 20453 (8:4453) - note D_, 5 - unknownmusic0xf5 - note D#, 4 - note D_, 9 - unknownmusic0xf4 - note D_, 3 - note D_, 16 - unknownmusic0xf2 - note D_, 2 + unknownnoise0x20 4, 245, 51 + unknownnoise0x20 8, 244, 34 + unknownnoise0x20 15, 242, 33 endchannel ; 0x2045d \ No newline at end of file diff --git a/music/sfx/sfx_08_44.asm b/music/sfx/sfx_08_44.asm index 66f9afff..59a587bb 100644 --- a/music/sfx/sfx_08_44.asm +++ b/music/sfx/sfx_08_44.asm @@ -1,36 +1,14 @@ SFX_08_44_Ch1: ; 2045d (8:445d) - note D_, 3 - note F#, 2 - note D_, 4 - note D_, 3 - note A#, 2 - note D#, 4 - note D_, 3 - rest 2 - note D#, 4 - note D_, 3 - note F_, 2 - note C#, 2 - note D_, 3 - unknownmusic0xf1 - note D#, 4 - note D_, 3 - note E_, 2 - note C#, 2 - note D_, 3 - rest 2 - note D#, 4 - note D_, 3 - note D#, 2 - note C#, 2 - note D_, 3 - note G#, 2 - note D#, 4 - note D_, 3 - note D#, 2 - note C#, 2 - note D_, 9 - note E_, 2 - note D#, 4 + unknownnoise0x20 2, 97, 35 + unknownnoise0x20 2, 161, 51 + unknownnoise0x20 2, 193, 51 + unknownnoise0x20 2, 81, 17 + unknownnoise0x20 2, 241, 51 + unknownnoise0x20 2, 65, 17 + unknownnoise0x20 2, 193, 51 + unknownnoise0x20 2, 49, 17 + unknownnoise0x20 2, 129, 51 + unknownnoise0x20 2, 49, 17 + unknownnoise0x20 8, 65, 51 endchannel ; 0x2047f \ No newline at end of file diff --git a/music/sfx/sfx_08_45.asm b/music/sfx/sfx_08_45.asm index b20379c1..5b22cbcc 100644 --- a/music/sfx/sfx_08_45.asm +++ b/music/sfx/sfx_08_45.asm @@ -1,30 +1,16 @@ SFX_08_45_Ch1: ; 2047f (8:447f) duty 2 - note C#, 1 - note E_, 5 - note D_, 16 - stereopanning 240 - note C_, 5 - note C#, 1 - note C#, 8 - note D_, 16 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 68 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 endchannel SFX_08_45_Ch2: ; 20490 (8:4490) duty 2 - note D_, 16 - note A_, 3 - note C_, 1 - note C_, 7 - note D_, 16 - note A_, 3 - note G#, 3 - note C_, 8 + unknownsfx0x20 15, 146, 0, 6 + unknownsfx0x20 15, 146, 130, 7 endchannel ; 0x2049b \ No newline at end of file diff --git a/music/sfx/sfx_08_46.asm b/music/sfx/sfx_08_46.asm index 31d73ddf..5f2b9d33 100644 --- a/music/sfx/sfx_08_46.asm +++ b/music/sfx/sfx_08_46.asm @@ -1,9 +1,9 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall notetype 6, 11, 2 octave 3 note E_, 2 @@ -23,7 +23,7 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13) SFX_08_46_Ch2: ; 23a2e (8:7a2e) - unknownmusic0xf8 + executemusic duty 2 notetype 6, 12, 2 octave 4 @@ -45,7 +45,7 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e) SFX_08_46_Ch3: ; 23a44 (8:7a44) - unknownmusic0xf8 + executemusic notetype 6, 1, 0 octave 4 note B_, 2 diff --git a/music/sfx/sfx_08_47.asm b/music/sfx/sfx_08_47.asm index ccee9e41..87e76a17 100644 --- a/music/sfx/sfx_08_47.asm +++ b/music/sfx/sfx_08_47.asm @@ -1,6 +1,4 @@ SFX_08_47_Ch1: ; 204aa (8:44aa) - note D_, 3 - note A#, 2 - note C#, 3 + unknownnoise0x20 2, 161, 18 endchannel ; 0x204ae \ No newline at end of file diff --git a/music/sfx/sfx_08_48.asm b/music/sfx/sfx_08_48.asm index 91fa31f9..ace8ada4 100644 --- a/music/sfx/sfx_08_48.asm +++ b/music/sfx/sfx_08_48.asm @@ -1,12 +1,7 @@ SFX_08_48_Ch1: ; 204ae (8:44ae) duty 1 - note C#, 1 - note A#, 16 - note D_, 16 - unknownmusic0xf2 - note G#, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 175 + unknownsfx0x20 15, 242, 128, 7 + unknownsfx0x10 8 endchannel ; 0x204b9 \ No newline at end of file diff --git a/music/sfx/sfx_08_49.asm b/music/sfx/sfx_08_49.asm index 321d1c76..6219a615 100644 --- a/music/sfx/sfx_08_49.asm +++ b/music/sfx/sfx_08_49.asm @@ -1,12 +1,7 @@ SFX_08_49_Ch1: ; 204b9 (8:44b9) duty 1 - note C#, 1 - note A_, 8 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 6 - note C#, 1 - note C_, 9 + unknownsfx0x10 151 + unknownsfx0x20 15, 242, 0, 5 + unknownsfx0x10 8 endchannel ; 0x204c4 \ No newline at end of file diff --git a/music/sfx/sfx_08_4a.asm b/music/sfx/sfx_08_4a.asm index f173ce6e..3ebc3281 100644 --- a/music/sfx/sfx_08_4a.asm +++ b/music/sfx/sfx_08_4a.asm @@ -1,6 +1,4 @@ SFX_08_4a_Ch1: ; 204c4 (8:44c4) - note D_, 3 - note A#, 2 - note D_, 3 + unknownnoise0x20 2, 161, 34 endchannel ; 0x204c8 \ No newline at end of file diff --git a/music/sfx/sfx_08_4b.asm b/music/sfx/sfx_08_4b.asm index 5e9afc92..980af0c9 100644 --- a/music/sfx/sfx_08_4b.asm +++ b/music/sfx/sfx_08_4b.asm @@ -1,6 +1,4 @@ SFX_08_4b_Ch1: ; 204c8 (8:44c8) - note D_, 9 - unknownmusic0xf1 - note F_, 5 + unknownnoise0x20 8, 241, 84 endchannel ; 0x204cc \ No newline at end of file diff --git a/music/sfx/sfx_08_4c.asm b/music/sfx/sfx_08_4c.asm index cf0b4d4c..f7f32305 100644 --- a/music/sfx/sfx_08_4c.asm +++ b/music/sfx/sfx_08_4c.asm @@ -1,7 +1,6 @@ SFX_08_4c_Ch1: ; 204cc (8:44cc) - note D_, 16 - note G#, 16 - note C#, 2 - note D_, 5 + unknownnoise0x20 15, 143, 17 + unknownnoise0x20 4, 255, 18 + unknownnoise0x20 10, 241, 85 endchannel -; 0x204d1 \ No newline at end of file +; 0x204d6 \ No newline at end of file diff --git a/music/sfx/sfx_08_4d.asm b/music/sfx/sfx_08_4d.asm index cf07f9fa..da4fa223 100644 --- a/music/sfx/sfx_08_4d.asm +++ b/music/sfx/sfx_08_4d.asm @@ -1,12 +1,6 @@ SFX_08_4d_Ch1: ; 204d6 (8:44d6) - note D_, 16 - note G#, 16 - note D#, 5 - note D_, 9 - unknownmusic0xf2 - note D#, 6 - note D_, 11 - unknownmusic0xf1 - note F_, 6 + unknownnoise0x20 15, 143, 52 + unknownnoise0x20 8, 242, 53 + unknownnoise0x20 10, 241, 85 endchannel ; 0x204e0 \ No newline at end of file diff --git a/music/sfx/sfx_08_4e.asm b/music/sfx/sfx_08_4e.asm index 7eee197a..f371f7ee 100644 --- a/music/sfx/sfx_08_4e.asm +++ b/music/sfx/sfx_08_4e.asm @@ -1,9 +1,5 @@ SFX_08_4e_Ch1: ; 204e0 (8:44e0) - note D_, 16 - note A_, 16 - note D_, 4 - note D_, 9 - unknownmusic0xf1 - note D_, 2 + unknownnoise0x20 15, 159, 35 + unknownnoise0x20 8, 241, 33 endchannel ; 0x204e7 \ No newline at end of file diff --git a/music/sfx/sfx_08_4f.asm b/music/sfx/sfx_08_4f.asm index e9d1c359..3200b9aa 100644 --- a/music/sfx/sfx_08_4f.asm +++ b/music/sfx/sfx_08_4f.asm @@ -1,15 +1,7 @@ SFX_08_4f_Ch1: ; 204e7 (8:44e7) - note D_, 3 - octave 7 - note E_, 12 - note D_, 11 - unknownmusic0xf1 - note E_, 5 - note D_, 3 - octave 7 - note D#, 11 - note D_, 7 - unknownmusic0xf1 - note D#, 5 + unknownnoise0x20 2, 225, 75 + unknownnoise0x20 10, 241, 68 + unknownnoise0x20 2, 225, 58 + unknownnoise0x20 6, 241, 52 endchannel ; 0x204f4 \ No newline at end of file diff --git a/music/sfx/sfx_08_50.asm b/music/sfx/sfx_08_50.asm index dc8bd7b5..176da9c1 100644 --- a/music/sfx/sfx_08_50.asm +++ b/music/sfx/sfx_08_50.asm @@ -1,12 +1,6 @@ SFX_08_50_Ch1: ; 204f4 (8:44f4) - note D_, 3 - unknownmusic0xf4 - note E_, 5 - note D_, 3 - unknownmusic0xf4 - note C#, 5 - note D_, 16 - unknownmusic0xf1 - note D#, 3 + unknownnoise0x20 2, 244, 68 + unknownnoise0x20 2, 244, 20 + unknownnoise0x20 15, 241, 50 endchannel ; 0x204fe \ No newline at end of file diff --git a/music/sfx/sfx_08_51.asm b/music/sfx/sfx_08_51.asm index 4f318e55..85cd06bb 100644 --- a/music/sfx/sfx_08_51.asm +++ b/music/sfx/sfx_08_51.asm @@ -1,15 +1,7 @@ SFX_08_51_Ch1: ; 204fe (8:44fe) - note D_, 5 - note G#, 16 - note F_, 6 - note D_, 3 - unknownmusic0xf4 - note E_, 5 - note D_, 9 - unknownmusic0xf4 - note D_, 3 - note D_, 16 - unknownmusic0xf2 - note D_, 2 + unknownnoise0x20 4, 143, 85 + unknownnoise0x20 2, 244, 68 + unknownnoise0x20 8, 244, 34 + unknownnoise0x20 15, 242, 33 endchannel ; 0x2050b \ No newline at end of file diff --git a/music/sfx/sfx_08_52.asm b/music/sfx/sfx_08_52.asm index e063a800..d5ca41b6 100644 --- a/music/sfx/sfx_08_52.asm +++ b/music/sfx/sfx_08_52.asm @@ -1,13 +1,7 @@ SFX_08_52_Ch1: ; 2050b (8:450b) - note D_, 9 - note E_, 16 - note D_, 4 - note D_, 5 - rest 5 - note D_, 3 - note D_, 7 - unknownmusic0xf2 - note D_, 4 + unknownnoise0x20 8, 79, 35 + unknownnoise0x20 4, 196, 34 + unknownnoise0x20 6, 242, 35 loopchannel 4, SFX_08_52_Ch1 endchannel ; 0x20519 \ No newline at end of file diff --git a/music/sfx/sfx_08_53.asm b/music/sfx/sfx_08_53.asm index 843bc854..07215881 100644 --- a/music/sfx/sfx_08_53.asm +++ b/music/sfx/sfx_08_53.asm @@ -1,15 +1,7 @@ SFX_08_53_Ch1: ; 20519 (8:4519) - note D_, 9 - note E_, 16 - note D#, 4 - note D_, 5 - rest 5 - note D_, 3 - note D_, 7 - unknownmusic0xf2 - note D_, 4 - note D_, 16 - unknownmusic0xf2 - note D_, 3 + unknownnoise0x20 8, 79, 51 + unknownnoise0x20 4, 196, 34 + unknownnoise0x20 6, 242, 35 + unknownnoise0x20 15, 242, 34 endchannel ; 0x20526 \ No newline at end of file diff --git a/music/sfx/sfx_08_54.asm b/music/sfx/sfx_08_54.asm index d4782e63..019cb3a1 100644 --- a/music/sfx/sfx_08_54.asm +++ b/music/sfx/sfx_08_54.asm @@ -1,4 +1,7 @@ SFX_08_54_Ch1: ; 20526 (8:4526) - note D_, 9 + unknownnoise0x20 8, 255, 50 + unknownnoise0x20 8, 244, 67 + unknownnoise0x20 8, 242, 84 + unknownnoise0x20 8, 241, 101 endchannel -; 0x20528 \ No newline at end of file +; 0x20533 \ No newline at end of file diff --git a/music/sfx/sfx_08_55.asm b/music/sfx/sfx_08_55.asm index 42b458bd..93049b71 100644 --- a/music/sfx/sfx_08_55.asm +++ b/music/sfx/sfx_08_55.asm @@ -1,27 +1,11 @@ SFX_08_55_Ch1: ; 20533 (8:4533) - note D_, 2 - rest 3 - note D#, 4 - note D_, 3 - unknownmusic0xf2 - note D_, 2 - note D_, 2 - octave 6 - note D#, 4 - note D_, 2 - rest 3 - note D#, 3 - note D_, 2 - note A_, 3 - note C#, 3 - note D_, 2 - note B_, 3 - note D#, 2 - note D_, 13 - note A_, 2 - note C#, 1 - note D_, 9 - unknownmusic0xf2 - note E_, 2 + unknownnoise0x20 1, 194, 51 + unknownnoise0x20 2, 242, 33 + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 1, 194, 50 + unknownnoise0x20 1, 146, 18 + unknownnoise0x20 1, 178, 49 + unknownnoise0x20 12, 145, 16 + unknownnoise0x20 8, 242, 65 endchannel ; 0x2054c \ No newline at end of file diff --git a/music/sfx/sfx_08_56.asm b/music/sfx/sfx_08_56.asm index c23300e8..05d62e90 100644 --- a/music/sfx/sfx_08_56.asm +++ b/music/sfx/sfx_08_56.asm @@ -1,12 +1,6 @@ SFX_08_56_Ch1: ; 2054c (8:454c) - note D_, 2 - note A_, 5 - note D_, 4 - note D_, 2 - note B_, 5 - note D_, 3 - note D_, 9 - unknownmusic0xf1 - note E_, 5 + unknownnoise0x20 1, 148, 35 + unknownnoise0x20 1, 180, 34 + unknownnoise0x20 8, 241, 68 endchannel ; 0x20556 \ No newline at end of file diff --git a/music/sfx/sfx_08_57.asm b/music/sfx/sfx_08_57.asm index 17bb63cf..d8fa8880 100644 --- a/music/sfx/sfx_08_57.asm +++ b/music/sfx/sfx_08_57.asm @@ -1,15 +1,7 @@ SFX_08_57_Ch1: ; 20556 (8:4556) - note D_, 3 - note A_, 5 - note D#, 4 - note D_, 5 - note B_, 5 - note D_, 3 - note D_, 5 - unknownmusic0xf1 - note E_, 5 - note D_, 9 - unknownmusic0xf1 - note F_, 6 + unknownnoise0x20 2, 148, 51 + unknownnoise0x20 4, 180, 34 + unknownnoise0x20 4, 241, 68 + unknownnoise0x20 8, 241, 85 endchannel ; 0x20563 \ No newline at end of file diff --git a/music/sfx/sfx_08_58.asm b/music/sfx/sfx_08_58.asm index 6fa45bf9..66a07ba4 100644 --- a/music/sfx/sfx_08_58.asm +++ b/music/sfx/sfx_08_58.asm @@ -1,4 +1,5 @@ SFX_08_58_Ch1: ; 20563 (8:4563) - note D_, 5 + unknownnoise0x20 4, 255, 85 + unknownnoise0x20 8, 241, 101 endchannel -; 0x20565 \ No newline at end of file +; 0x2056a \ No newline at end of file diff --git a/music/sfx/sfx_08_59.asm b/music/sfx/sfx_08_59.asm index 816645fa..b67845d6 100644 --- a/music/sfx/sfx_08_59.asm +++ b/music/sfx/sfx_08_59.asm @@ -1,12 +1,6 @@ SFX_08_59_Ch1: ; 2056a (8:456a) - note D_, 3 - note G#, 5 - note E_, 4 - note D_, 3 - rest 5 - note D_, 3 - note D_, 9 - unknownmusic0xf2 - note D#, 5 + unknownnoise0x20 2, 132, 67 + unknownnoise0x20 2, 196, 34 + unknownnoise0x20 8, 242, 52 endchannel ; 0x20574 \ No newline at end of file diff --git a/music/sfx/sfx_08_5a.asm b/music/sfx/sfx_08_5a.asm index b8ca6acf..6d9994ab 100644 --- a/music/sfx/sfx_08_5a.asm +++ b/music/sfx/sfx_08_5a.asm @@ -1,9 +1,5 @@ SFX_08_5a_Ch1: ; 20574 (8:4574) - note D_, 5 - unknownmusic0xf1 - note D#, 5 - note D_, 16 - unknownmusic0xf2 - note F#, 5 + unknownnoise0x20 4, 241, 52 + unknownnoise0x20 15, 242, 100 endchannel ; 0x2057b \ No newline at end of file diff --git a/music/sfx/sfx_08_5b.asm b/music/sfx/sfx_08_5b.asm index a9e523aa..2a1cc2fa 100644 --- a/music/sfx/sfx_08_5b.asm +++ b/music/sfx/sfx_08_5b.asm @@ -1,9 +1,5 @@ SFX_08_5b_Ch1: ; 2057b (8:457b) - note D_, 3 - unknownmusic0xf1 - note D_, 3 - note D_, 16 - unknownmusic0xf2 - note C#, 3 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 15, 242, 18 endchannel ; 0x20582 \ No newline at end of file diff --git a/music/sfx/sfx_08_5c.asm b/music/sfx/sfx_08_5c.asm index c805b30a..f395fa7e 100644 --- a/music/sfx/sfx_08_5c.asm +++ b/music/sfx/sfx_08_5c.asm @@ -1,12 +1,6 @@ SFX_08_5c_Ch1: ; 20582 (8:4582) - note D_, 3 - rest 3 - note C_, 2 - note D_, 16 - unknownmusic0xf4 - note C_, 2 - note D_, 16 - unknownmusic0xf2 - note C_, 2 + unknownnoise0x20 2, 194, 1 + unknownnoise0x20 15, 244, 1 + unknownnoise0x20 15, 242, 1 endchannel ; 0x2058c \ No newline at end of file diff --git a/music/sfx/sfx_08_5d.asm b/music/sfx/sfx_08_5d.asm index 255186fb..2b54b1b9 100644 --- a/music/sfx/sfx_08_5d.asm +++ b/music/sfx/sfx_08_5d.asm @@ -1,9 +1,5 @@ SFX_08_5d_Ch1: ; 2058c (8:458c) - note D_, 9 - unknownmusic0xf1 - note D#, 3 - note D_, 9 - unknownmusic0xf1 - note D#, 4 + unknownnoise0x20 8, 241, 50 + unknownnoise0x20 8, 241, 51 endchannel ; 0x20593 \ No newline at end of file diff --git a/music/sfx/sfx_08_5e.asm b/music/sfx/sfx_08_5e.asm index 34a6e139..24159908 100644 --- a/music/sfx/sfx_08_5e.asm +++ b/music/sfx/sfx_08_5e.asm @@ -1,32 +1,17 @@ SFX_08_5e_Ch1: ; 20593 (8:4593) duty 0 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 3 - note C#, 1 - note D_, 3 - note D_, 9 - octave 6 - note C_, 1 - note C_, 3 - note C#, 1 - note C_, 9 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 endchannel SFX_08_5e_Ch2: ; 205a4 (8:45a4) - note D_, 1 - notetype 1, 4, 2 - note D_, 5 - note A#, 2 - note D#, 3 - note D_, 1 - notetype 1, 2, 2 - note D_, 7 - note A#, 2 - note D#, 3 + unknownnoise0x20 0, 209, 66 + unknownnoise0x20 4, 161, 50 + unknownnoise0x20 0, 209, 34 + unknownnoise0x20 6, 161, 50 endchannel ; 0x205b1 \ No newline at end of file diff --git a/music/sfx/sfx_08_5f.asm b/music/sfx/sfx_08_5f.asm index d2d1fac1..b8084264 100644 --- a/music/sfx/sfx_08_5f.asm +++ b/music/sfx/sfx_08_5f.asm @@ -1,15 +1,7 @@ SFX_08_5f_Ch1: ; 205b1 (8:45b1) - note D_, 4 - note A_, 3 - note D#, 2 - note D_, 4 - note B_, 3 - note D#, 3 - note D_, 4 - rest 3 - note D#, 4 - note D_, 9 - unknownmusic0xf1 - note F_, 5 + unknownnoise0x20 3, 146, 49 + unknownnoise0x20 3, 178, 50 + unknownnoise0x20 3, 194, 51 + unknownnoise0x20 8, 241, 84 endchannel ; 0x205be \ No newline at end of file diff --git a/music/sfx/sfx_08_60.asm b/music/sfx/sfx_08_60.asm index 098157b8..fcf2bb8b 100644 --- a/music/sfx/sfx_08_60.asm +++ b/music/sfx/sfx_08_60.asm @@ -1,9 +1,5 @@ SFX_08_60_Ch1: ; 205be (8:45be) - note D_, 13 - unknownmusic0xf1 - note F_, 5 - note D_, 9 - unknownmusic0xf1 - note F#, 5 + unknownnoise0x20 12, 241, 84 + unknownnoise0x20 8, 241, 100 endchannel ; 0x205c5 \ No newline at end of file diff --git a/music/sfx/sfx_08_61.asm b/music/sfx/sfx_08_61.asm index 7d2b29f7..39c12c1e 100644 --- a/music/sfx/sfx_08_61.asm +++ b/music/sfx/sfx_08_61.asm @@ -1,18 +1,8 @@ SFX_08_61_Ch1: ; 205c5 (8:45c5) - note D_, 3 - unknownmusic0xf1 - note D#, 4 - note D_, 3 - rest 2 - note D#, 3 - note D_, 3 - note A#, 2 - note D#, 2 - note D_, 16 - note G#, 3 - note D#, 3 - note D_, 9 - unknownmusic0xf1 - note D#, 5 + unknownnoise0x20 2, 241, 51 + unknownnoise0x20 2, 193, 50 + unknownnoise0x20 2, 161, 49 + unknownnoise0x20 15, 130, 50 + unknownnoise0x20 8, 241, 52 endchannel ; 0x205d5 \ No newline at end of file diff --git a/music/sfx/sfx_08_62.asm b/music/sfx/sfx_08_62.asm index d407221f..13f4b95a 100644 --- a/music/sfx/sfx_08_62.asm +++ b/music/sfx/sfx_08_62.asm @@ -1,8 +1,5 @@ SFX_08_62_Ch1: ; 205d5 (8:45d5) - note D_, 3 - notetype 2, 3, 2 - note D_, 16 - unknownmusic0xf2 - note E_, 4 + unknownnoise0x20 2, 210, 50 + unknownnoise0x20 15, 242, 67 endchannel ; 0x205dc \ No newline at end of file diff --git a/music/sfx/sfx_08_63.asm b/music/sfx/sfx_08_63.asm index 0f0497e6..bd5b9e2f 100644 --- a/music/sfx/sfx_08_63.asm +++ b/music/sfx/sfx_08_63.asm @@ -1,18 +1,8 @@ SFX_08_63_Ch1: ; 205dc (8:45dc) - note D_, 3 - unknownmusic0xf2 - note E_, 4 - note D_, 5 - note B_, 6 - note D#, 3 - note D_, 10 - note G#, 7 - note D#, 2 - note D_, 8 - note F#, 5 - note C_, 1 - note D_, 16 - unknownmusic0xf2 - note F_, 6 + unknownnoise0x20 2, 242, 67 + unknownnoise0x20 4, 181, 50 + unknownnoise0x20 9, 134, 49 + unknownnoise0x20 7, 100, 0 + unknownnoise0x20 15, 242, 85 endchannel ; 0x205ec \ No newline at end of file diff --git a/music/sfx/sfx_08_64.asm b/music/sfx/sfx_08_64.asm index 9394994a..b615919f 100644 --- a/music/sfx/sfx_08_64.asm +++ b/music/sfx/sfx_08_64.asm @@ -1,22 +1,13 @@ SFX_08_64_Ch1: ; 205ec (8:45ec) duty 1 - note C#, 1 - note A_, 8 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 151 + unknownsfx0x20 15, 242, 0, 7 + unknownsfx0x10 8 endchannel SFX_08_64_Ch2: ; 205f7 (8:45f7) - note D_, 16 - note D#, 16 - note D_, 3 - note D_, 16 - unknownmusic0xf2 - note D_, 2 + unknownnoise0x20 15, 63, 34 + unknownnoise0x20 15, 242, 33 endchannel ; 0x205fe \ No newline at end of file diff --git a/music/sfx/sfx_08_65.asm b/music/sfx/sfx_08_65.asm index 62f0e283..e0368e06 100644 --- a/music/sfx/sfx_08_65.asm +++ b/music/sfx/sfx_08_65.asm @@ -1,18 +1,8 @@ SFX_08_65_Ch1: ; 205fe (8:45fe) - note D_, 16 - note E_, 16 - note E_, 2 - note D_, 9 - note G#, 16 - note E_, 2 - note D_, 9 - rest 16 - note E_, 2 - note D_, 9 - unknownmusic0xf2 - note E_, 3 - note D_, 16 - unknownmusic0xf2 - note E_, 2 + unknownnoise0x20 15, 79, 65 + unknownnoise0x20 8, 143, 65 + unknownnoise0x20 8, 207, 65 + unknownnoise0x20 8, 242, 66 + unknownnoise0x20 15, 242, 65 endchannel ; 0x2060e \ No newline at end of file diff --git a/music/sfx/sfx_08_66.asm b/music/sfx/sfx_08_66.asm index 23ddd755..07f1ab05 100644 --- a/music/sfx/sfx_08_66.asm +++ b/music/sfx/sfx_08_66.asm @@ -1,4 +1,10 @@ SFX_08_66_Ch1: ; 2060e (8:460e) - note D_, 11 + unknownnoise0x20 10, 255, 80 + unknownnoise0x20 15, 255, 81 + unknownnoise0x20 8, 242, 81 + unknownnoise0x20 6, 255, 82 + unknownnoise0x20 6, 255, 83 + unknownnoise0x20 8, 255, 84 + unknownnoise0x20 15, 242, 84 endchannel -; 0x20610 \ No newline at end of file +; 0x20624 \ No newline at end of file diff --git a/music/sfx/sfx_08_67.asm b/music/sfx/sfx_08_67.asm index dd3c4b3f..aa327873 100644 --- a/music/sfx/sfx_08_67.asm +++ b/music/sfx/sfx_08_67.asm @@ -1,48 +1,28 @@ SFX_08_67_Ch1: ; 20624 (8:4624) duty 2 - note D_, 16 - note D#, 16 - rest 1 - note C_, 8 + unknownsfx0x20 15, 63, 192, 7 SFX_08_67_branch_2062a: - note D_, 16 - notetype 15, 12, 0 - note C_, 8 + unknownsfx0x20 15, 223, 192, 7 loopchannel 4, SFX_08_67_branch_2062a - note D_, 16 - notetype 1, 12, 0 - note C_, 8 + unknownsfx0x20 15, 209, 192, 7 endchannel SFX_08_67_Ch2: ; 20637 (8:4637) dutycycle 179 - note D_, 16 - note D_, 16 - rest 9 - note C_, 8 + unknownsfx0x20 15, 47, 200, 7 SFX_08_67_branch_2063d: - note D_, 16 - rest 16 - rest 8 - note C_, 8 + unknownsfx0x20 15, 207, 199, 7 loopchannel 4, SFX_08_67_branch_2063d - note D_, 16 - rest 2 - rest 9 - note C_, 8 + unknownsfx0x20 15, 193, 200, 7 endchannel SFX_08_67_Ch3: ; 2064a (8:464a) - note D_, 4 - note A_, 8 - note C#, 3 - note D_, 4 - note A#, 2 - note C#, 2 + unknownnoise0x20 3, 151, 18 + unknownnoise0x20 3, 161, 17 loopchannel 10, SFX_08_67_Ch3 endchannel ; 0x20655 \ No newline at end of file diff --git a/music/sfx/sfx_08_68.asm b/music/sfx/sfx_08_68.asm index 04130056..efa46f92 100644 --- a/music/sfx/sfx_08_68.asm +++ b/music/sfx/sfx_08_68.asm @@ -1,36 +1,22 @@ SFX_08_68_Ch1: ; 20655 (8:4655) duty 0 - note D_, 1 - unknownmusic0xf1 - rest 1 - note C_, 8 - note D_, 1 - unknownmusic0xf1 - note C_, 1 - note C_, 8 + unknownsfx0x20 0, 241, 192, 7 + unknownsfx0x20 0, 241, 0, 7 loopchannel 12, SFX_08_68_Ch1 endchannel SFX_08_68_Ch2: ; 20664 (8:4664) dutycycle 179 - note D_, 1 - octave 7 - rest 2 - note C_, 8 - note D_, 1 - octave 7 - note C_, 2 - note C_, 8 + unknownsfx0x20 0, 225, 193, 7 + unknownsfx0x20 0, 225, 1, 7 loopchannel 12, SFX_08_68_Ch2 endchannel SFX_08_68_Ch3: ; 20673 (8:4673) - note D_, 2 - notetype 1, 4, 9 - note D_, 2 - notetype 1, 2, 9 + unknownnoise0x20 1, 209, 73 + unknownnoise0x20 1, 209, 41 loopchannel 6, SFX_08_68_Ch3 endchannel ; 0x2067e \ No newline at end of file diff --git a/music/sfx/sfx_08_69.asm b/music/sfx/sfx_08_69.asm index f4477964..26395cfa 100644 --- a/music/sfx/sfx_08_69.asm +++ b/music/sfx/sfx_08_69.asm @@ -1,40 +1,19 @@ SFX_08_69_Ch1: ; 2067e (8:467e) dutycycle 201 - note D_, 12 - unknownmusic0xf3 - note D_, 1 - note C_, 2 - note D_, 10 - notetype 3, 5, 0 - note C_, 2 + unknownsfx0x20 11, 243, 32, 1 + unknownsfx0x20 9, 211, 80, 1 loopchannel 5, SFX_08_69_Ch1 - note D_, 9 - octave 5 - note D#, 1 - note C_, 2 - note D_, 16 - rest 3 - note C#, 1 - note C_, 2 + unknownsfx0x20 8, 227, 48, 1 + unknownsfx0x20 15, 194, 16, 1 endchannel SFX_08_69_Ch2: ; 20695 (8:4695) - note D_, 11 - unknownmusic0xf3 - note D#, 6 - note D_, 15 - unknownmusic0xf6 - note E_, 6 + unknownnoise0x20 10, 243, 53 + unknownnoise0x20 14, 246, 69 loopchannel 4, SFX_08_69_Ch2 - note D_, 13 - unknownmusic0xf4 - note B_, 13 - note D_, 13 - unknownmusic0xf5 - note A_, 13 - note D_, 16 - unknownmusic0xf4 - note A#, 13 + unknownnoise0x20 12, 244, 188 + unknownnoise0x20 12, 245, 156 + unknownnoise0x20 15, 244, 172 endchannel ; 0x206a9 \ No newline at end of file diff --git a/music/sfx/sfx_08_6a.asm b/music/sfx/sfx_08_6a.asm index 6d56b533..efe39d5d 100644 --- a/music/sfx/sfx_08_6a.asm +++ b/music/sfx/sfx_08_6a.asm @@ -1,62 +1,29 @@ SFX_08_6a_Ch1: ; 206a9 (8:46a9) dutycycle 57 - note D_, 5 - unknownmusic0xf4 - note C_, 1 - note C_, 7 - note D_, 4 - rest 5 - note C_, 1 - note C_, 6 - note D_, 6 - note B_, 6 - note C_, 1 - note C_, 7 - note D_, 14 - octave 6 - rest 1 - note C_, 7 + unknownsfx0x20 4, 244, 0, 6 + unknownsfx0x20 3, 196, 0, 5 + unknownsfx0x20 5, 181, 0, 6 + unknownsfx0x20 13, 226, 192, 6 loopchannel 3, SFX_08_6a_Ch1 - note D_, 9 - notetype 1, 0, 0 - note C_, 7 + unknownsfx0x20 8, 209, 0, 6 endchannel SFX_08_6a_Ch2: ; 206c4 (8:46c4) dutycycle 141 - note D_, 6 - octave 4 - octave 8 - note C_, 6 - note D_, 5 - note B_, 5 - octave 8 - note C_, 5 - note D_, 7 - note A#, 6 - unknownmusic0xe8 - note C_, 6 - note D_, 15 - notetype 1, 10, 0 - note C_, 7 + unknownsfx0x20 5, 228, 224, 5 + unknownsfx0x20 4, 180, 224, 4 + unknownsfx0x20 6, 165, 232, 5 + unknownsfx0x20 14, 209, 160, 6 loopchannel 3, SFX_08_6a_Ch2 endchannel SFX_08_6a_Ch3: ; 206db (8:46db) - note D_, 6 - rest 4 - note D#, 4 - note D_, 4 - note A_, 3 - note E_, 4 - note D_, 11 - note B_, 6 - note D#, 4 - note D_, 16 - rest 4 - note D#, 3 + unknownnoise0x20 5, 195, 51 + unknownnoise0x20 3, 146, 67 + unknownnoise0x20 10, 181, 51 + unknownnoise0x20 15, 195, 50 loopchannel 2, SFX_08_6a_Ch3 endchannel ; 0x206ec \ No newline at end of file diff --git a/music/sfx/sfx_08_6b.asm b/music/sfx/sfx_08_6b.asm index 6b50fcf3..d0491d28 100644 --- a/music/sfx/sfx_08_6b.asm +++ b/music/sfx/sfx_08_6b.asm @@ -1,51 +1,22 @@ SFX_08_6b_Ch1: ; 206ec (8:46ec) dutycycle 210 - note D_, 4 - note G#, 2 - note C_, 1 - note C_, 4 - note D_, 4 - rest 2 - note C_, 1 - note C_, 5 - note D_, 4 - unknownmusic0xf1 - note C_, 1 - note C_, 6 - note D_, 4 - note B_, 2 - note C_, 1 - note C_, 5 - note D_, 4 - note G_, 2 - note C_, 1 - note C_, 4 + unknownsfx0x20 3, 129, 0, 3 + unknownsfx0x20 3, 193, 0, 4 + unknownsfx0x20 3, 241, 0, 5 + unknownsfx0x20 3, 177, 0, 4 + unknownsfx0x20 3, 113, 0, 3 loopchannel 5, SFX_08_6b_Ch1 - note D_, 9 - note G#, 2 - note C_, 1 - note C_, 5 + unknownsfx0x20 8, 129, 0, 4 endchannel SFX_08_6b_Ch2: ; 2070b (8:470b) - note D_, 4 - note F#, 3 - note D_, 3 - note D_, 4 - note A#, 3 - note D#, 3 - note D_, 4 - notetype 2, 3, 3 - note D_, 4 - note A_, 3 - note D_, 4 - note D_, 4 - note F_, 3 - note C#, 3 + unknownnoise0x20 3, 98, 34 + unknownnoise0x20 3, 162, 50 + unknownnoise0x20 3, 210, 51 + unknownnoise0x20 3, 146, 35 + unknownnoise0x20 3, 82, 18 loopchannel 5, SFX_08_6b_Ch2 - note D_, 9 - note G#, 2 - note C#, 3 + unknownnoise0x20 8, 129, 18 endchannel ; 0x20722 \ No newline at end of file diff --git a/music/sfx/sfx_08_6c.asm b/music/sfx/sfx_08_6c.asm index 96ce3e45..c9a020cd 100644 --- a/music/sfx/sfx_08_6c.asm +++ b/music/sfx/sfx_08_6c.asm @@ -1,52 +1,26 @@ SFX_08_6c_Ch1: ; 20722 (8:4722) dutycycle 57 - note D_, 16 - unknownmusic0xf4 - note C_, 1 - note C_, 6 - note D_, 16 - rest 5 - note C_, 1 - note C_, 5 - note D_, 16 - octave 6 - rest 1 - note C_, 6 + unknownsfx0x20 15, 244, 0, 5 + unknownsfx0x20 15, 196, 0, 4 + unknownsfx0x20 15, 226, 192, 5 loopchannel 3, SFX_08_6c_Ch1 endchannel SFX_08_6c_Ch2: ; 20735 (8:4735) dutycycle 141 - note D_, 8 - octave 4 - note D#, 1 - note C_, 5 - note D_, 16 - note B_, 5 - note D#, 1 - note C_, 4 - note D_, 16 - note A#, 3 - note D#, 9 - note C_, 5 + unknownsfx0x20 7, 228, 48, 4 + unknownsfx0x20 15, 180, 48, 3 + unknownsfx0x20 15, 162, 56, 4 loopchannel 4, SFX_08_6c_Ch2 endchannel SFX_08_6c_Ch3: ; 20748 (8:4748) - note D_, 10 - unknownmusic0xf4 - note E_, 5 - note D_, 10 - unknownmusic0xf2 - note E_, 4 - note D_, 16 - unknownmusic0xf4 - note E_, 3 - note D_, 16 - unknownmusic0xf4 - note E_, 2 + unknownnoise0x20 9, 244, 68 + unknownnoise0x20 9, 242, 67 + unknownnoise0x20 15, 244, 66 + unknownnoise0x20 15, 244, 65 loopchannel 3, SFX_08_6c_Ch3 endchannel ; 0x20759 \ No newline at end of file diff --git a/music/sfx/sfx_08_6d.asm b/music/sfx/sfx_08_6d.asm index 3b90f524..6e94d9eb 100644 --- a/music/sfx/sfx_08_6d.asm +++ b/music/sfx/sfx_08_6d.asm @@ -1,52 +1,26 @@ SFX_08_6d_Ch1: ; 20759 (8:4759) dutycycle 161 - note D_, 11 - unknownmusic0xf1 - note E_, 1 - note C_, 7 - note D_, 11 - unknownmusic0xf3 - note G#, 1 - note C_, 7 - note D_, 11 - unknownmusic0xf2 - note D_, 1 - note C_, 7 + unknownsfx0x20 10, 241, 64, 6 + unknownsfx0x20 10, 243, 128, 6 + unknownsfx0x20 10, 242, 32, 6 loopchannel 4, SFX_08_6d_Ch1 - note D_, 11 - unknownmusic0xf1 - note E_, 1 - note C_, 7 + unknownsfx0x20 10, 241, 64, 6 endchannel SFX_08_6d_Ch2: ; 20770 (8:4770) dutycycle 179 - note D_, 11 - unknownmusic0xf3 - note G_, 2 - note C_, 6 - note D_, 8 - octave 5 - note D#, 2 - note C_, 6 - note D_, 11 - unknownmusic0xf1 - note F_, 2 - note C_, 6 + unknownsfx0x20 10, 243, 113, 5 + unknownsfx0x20 7, 227, 49, 5 + unknownsfx0x20 10, 241, 81, 5 loopchannel 4, SFX_08_6d_Ch2 - note D_, 11 - unknownmusic0xf1 - note G_, 2 - note C_, 6 + unknownsfx0x20 10, 241, 113, 5 endchannel SFX_08_6d_Ch3: ; 20787 (8:4787) - note D_, 3 - notetype 1, 4, 10 - note D_, 3 - notetype 2, 2, 10 + unknownnoise0x20 2, 209, 74 + unknownnoise0x20 2, 210, 42 loopchannel 21, SFX_08_6d_Ch3 endchannel ; 0x20792 \ No newline at end of file diff --git a/music/sfx/sfx_08_6e.asm b/music/sfx/sfx_08_6e.asm index b38e9fbf..3f0a40d5 100644 --- a/music/sfx/sfx_08_6e.asm +++ b/music/sfx/sfx_08_6e.asm @@ -1,55 +1,28 @@ SFX_08_6e_Ch1: ; 20792 (8:4792) duty 0 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 3 - note D_, 4 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note C_, 1 - note C_, 6 - note D_, 6 - unknownmusic0xf1 - stereopanning 7 + unknownsfx0x20 2, 241, 0, 2 + unknownsfx0x20 3, 241, 0, 7 + unknownsfx0x20 4, 241, 0, 5 + unknownsfx0x20 5, 241, 240, 7 loopchannel 8, SFX_08_6e_Ch1 endchannel SFX_08_6e_Ch2: ; 207a9 (8:47a9) dutycycle 179 - note D_, 3 - octave 7 - note C_, 3 - note C_, 4 - note D_, 4 - octave 7 - unknownmusic0xf2 - note C_, 8 - note D_, 5 - octave 7 - note C_, 3 - note C_, 7 - note D_, 6 - octave 7 - note C_, 3 - note C_, 8 + unknownsfx0x20 2, 225, 2, 3 + unknownsfx0x20 3, 225, 242, 7 + unknownsfx0x20 4, 225, 2, 6 + unknownsfx0x20 5, 225, 2, 7 loopchannel 8, SFX_08_6e_Ch2 endchannel SFX_08_6e_Ch3: ; 207c0 (8:47c0) - note D_, 3 - notetype 3, 1, 0 - note D_, 4 - notetype 3, 1, 1 - note D_, 3 - notetype 2, 1, 0 - note D_, 6 - notetype 2, 1, 2 + unknownnoise0x20 2, 211, 16 + unknownnoise0x20 3, 211, 17 + unknownnoise0x20 2, 210, 16 + unknownnoise0x20 5, 210, 18 loopchannel 9, SFX_08_6e_Ch3 endchannel ; 0x207d1 \ No newline at end of file diff --git a/music/sfx/sfx_08_6f.asm b/music/sfx/sfx_08_6f.asm index 2235fbaf..bb5ca6e8 100644 --- a/music/sfx/sfx_08_6f.asm +++ b/music/sfx/sfx_08_6f.asm @@ -1,31 +1,22 @@ SFX_08_6f_Ch1: ; 207d1 (8:47d1) dutycycle 43 - note D_, 4 - unknownmusic0xf1 - stereopanning 7 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 3 + unknownsfx0x20 3, 241, 240, 7 + unknownsfx0x20 4, 242, 0, 2 loopchannel 8, SFX_08_6f_Ch1 endchannel SFX_08_6f_Ch2: ; 207e0 (8:47e0) dutycycle 179 - note D_, 5 - octave 6 - note C_, 3 - note C_, 3 - note D_, 5 - octave 7 - octave 6 - note C_, 8 + unknownsfx0x20 4, 226, 2, 2 + unknownsfx0x20 4, 225, 226, 7 loopchannel 9, SFX_08_6f_Ch2 endchannel SFX_08_6f_Ch3: ; 207ef (8:47ef) - note D_, 5 + unknownnoise0x20 4, 255, 67 + unknownnoise0x20 4, 242, 68 + loopchannel 9, SFX_08_6f_Ch3 endchannel -; 0x207f1 \ No newline at end of file +; 0x207fa \ No newline at end of file diff --git a/music/sfx/sfx_08_70.asm b/music/sfx/sfx_08_70.asm index 6a94b64d..01c90d9a 100644 --- a/music/sfx/sfx_08_70.asm +++ b/music/sfx/sfx_08_70.asm @@ -1,83 +1,33 @@ SFX_08_70_Ch1: ; 207fa (8:47fa) duty 2 - note C#, 1 - unknownmusic0xf7 - note D_, 9 - rest 5 - note B_, 14 - note C_, 8 - note D_, 9 - rest 5 - note B_, 15 - note C_, 8 - note D_, 9 - rest 5 - note B_, 16 - note C_, 8 - note D_, 9 - rest 5 - rest 1 - note C_, 8 - note D_, 16 - rest 5 - rest 2 - note C_, 8 - note D_, 16 - unknownmusic0xf2 - rest 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 247 + unknownsfx0x20 8, 196, 189, 7 + unknownsfx0x20 8, 196, 190, 7 + unknownsfx0x20 8, 196, 191, 7 + unknownsfx0x20 8, 196, 192, 7 + unknownsfx0x20 15, 196, 193, 7 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x10 8 endchannel SFX_08_70_Ch2: ; 20819 (8:4819) duty 2 - note D_, 9 - rest 5 - note G_, 1 - note C_, 8 - note D_, 9 - rest 5 - note F#, 2 - note C_, 8 - note D_, 9 - rest 5 - note F#, 3 - note C_, 8 - note D_, 9 - rest 5 - note F#, 4 - note C_, 8 - note D_, 16 - rest 5 - note F#, 5 - note C_, 8 - note D_, 16 - unknownmusic0xf2 - note F#, 5 - note C_, 8 + unknownsfx0x20 8, 196, 112, 7 + unknownsfx0x20 8, 196, 97, 7 + unknownsfx0x20 8, 196, 98, 7 + unknownsfx0x20 8, 196, 99, 7 + unknownsfx0x20 15, 196, 100, 7 + unknownsfx0x20 15, 242, 100, 7 endchannel SFX_08_70_Ch3: ; 20834 (8:4834) - note D_, 16 - note D#, 16 - note C#, 5 - note D_, 16 - rest 16 - note C#, 4 - note D_, 16 - rest 16 - note C#, 3 - note D_, 16 - rest 16 - note C#, 2 - note D_, 16 - rest 16 - note C#, 1 - note D_, 16 - rest 3 - note C#, 1 + unknownnoise0x20 15, 63, 20 + unknownnoise0x20 15, 207, 19 + unknownnoise0x20 15, 207, 18 + unknownnoise0x20 15, 207, 17 + unknownnoise0x20 15, 207, 16 + unknownnoise0x20 15, 194, 16 endchannel ; 0x20847 \ No newline at end of file diff --git a/music/sfx/sfx_08_71.asm b/music/sfx/sfx_08_71.asm index 4ff045ea..a594e0be 100644 --- a/music/sfx/sfx_08_71.asm +++ b/music/sfx/sfx_08_71.asm @@ -1,30 +1,19 @@ SFX_08_71_Ch1: ; 20847 (8:4847) duty 2 - note D_, 16 - endchannel - octave 8 - note C_, 8 - note D_, 16 - endchannel - octave 8 - note C_, 8 - note D_, 16 - endchannel - octave 8 - note C_, 8 - note D_, 16 - endchannel - octave 8 - note C_, 8 - note D_, 16 - unknownmusic0xf2 - octave 8 - note C_, 8 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 255, 224, 7 + unknownsfx0x20 15, 242, 224, 7 endchannel SFX_08_71_Ch2: ; 2085e (8:485e) duty 3 - note D_, 16 + unknownsfx0x20 15, 255, 226, 7 + unknownsfx0x20 15, 255, 225, 7 + unknownsfx0x20 15, 255, 226, 7 + unknownsfx0x20 15, 255, 225, 7 + unknownsfx0x20 15, 242, 226, 7 endchannel -; 0x20862 \ No newline at end of file +; 0x20875 \ No newline at end of file diff --git a/music/sfx/sfx_08_72.asm b/music/sfx/sfx_08_72.asm index 9af4e8fa..cfd83636 100644 --- a/music/sfx/sfx_08_72.asm +++ b/music/sfx/sfx_08_72.asm @@ -1,21 +1,13 @@ SFX_08_72_Ch1: ; 20875 (8:4875) duty 2 - note C#, 1 - note A#, 16 - note D_, 9 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 175 + unknownsfx0x20 8, 241, 0, 7 + unknownsfx0x10 8 endchannel SFX_08_72_Ch2: ; 20880 (8:4880) duty 3 - note D_, 9 - unknownmusic0xf1 - note C_, 2 - note C_, 8 + unknownsfx0x20 8, 241, 1, 7 endchannel ; 0x20887 \ No newline at end of file diff --git a/music/sfx/sfx_08_73.asm b/music/sfx/sfx_08_73.asm index 2a241c02..6097a9cb 100644 --- a/music/sfx/sfx_08_73.asm +++ b/music/sfx/sfx_08_73.asm @@ -1,49 +1,19 @@ SFX_08_73_Ch1: ; 20887 (8:4887) duty 2 - note D_, 7 - unknownmusic0xf1 - note C_, 1 - note C_, 6 - note D_, 7 - unknownmusic0xf1 - note G#, 1 - note C_, 6 - note D_, 7 - unknownmusic0xf1 - note C_, 1 - note C_, 7 - note D_, 7 - unknownmusic0xf1 - note G#, 1 - note C_, 7 - note D_, 9 - unknownmusic0xf1 - note C_, 1 - note C_, 8 + unknownsfx0x20 6, 241, 0, 5 + unknownsfx0x20 6, 241, 128, 5 + unknownsfx0x20 6, 241, 0, 6 + unknownsfx0x20 6, 241, 128, 6 + unknownsfx0x20 8, 241, 0, 7 endchannel SFX_08_73_Ch2: ; 2089e (8:489e) duty 3 - note D_, 7 - octave 7 - note C#, 1 - note C_, 6 - note D_, 7 - octave 7 - note A_, 1 - note C_, 6 - note D_, 7 - octave 7 - note C#, 1 - note C_, 7 - note D_, 7 - octave 7 - note A_, 1 - note C_, 7 - note D_, 9 - octave 7 - note C#, 1 - note C_, 8 + unknownsfx0x20 6, 225, 16, 5 + unknownsfx0x20 6, 225, 144, 5 + unknownsfx0x20 6, 225, 16, 6 + unknownsfx0x20 6, 225, 144, 6 + unknownsfx0x20 8, 225, 16, 7 endchannel ; 0x208b5 \ No newline at end of file diff --git a/music/sfx/sfx_08_74.asm b/music/sfx/sfx_08_74.asm index 0f9237fd..ed322dcb 100644 --- a/music/sfx/sfx_08_74.asm +++ b/music/sfx/sfx_08_74.asm @@ -1,38 +1,23 @@ SFX_08_74_Ch1: ; 208b5 (8:48b5) dutycycle 237 - note D_, 9 - endchannel - unknownmusic0xf8 - note C_, 4 - note D_, 16 - endchannel - note C_, 1 - note C_, 5 - note D_, 16 - unknownmusic0xf3 - note C_, 1 - note C_, 5 + unknownsfx0x20 8, 255, 248, 3 + unknownsfx0x20 15, 255, 0, 4 + unknownsfx0x20 15, 243, 0, 4 endchannel SFX_08_74_Ch2: ; 208c4 (8:48c4) dutycycle 180 - note D_, 9 - unknownmusic0xef - rest 1 - note C_, 4 - note D_, 16 - unknownmusic0xef - rest 1 - note C_, 4 - note D_, 16 - octave 5 - rest 1 - note C_, 4 + unknownsfx0x20 8, 239, 192, 3 + unknownsfx0x20 15, 239, 192, 3 + unknownsfx0x20 15, 227, 192, 3 endchannel SFX_08_74_Ch3: ; 208d3 (8:48d3) - note D_, 5 + unknownnoise0x20 4, 255, 81 + unknownnoise0x20 8, 255, 84 + unknownnoise0x20 15, 255, 85 + unknownnoise0x20 15, 243, 86 endchannel -; 0x208d5 \ No newline at end of file +; 0x208e0 \ No newline at end of file diff --git a/music/sfx/sfx_08_75.asm b/music/sfx/sfx_08_75.asm index 5bb7ada6..39990ae3 100644 --- a/music/sfx/sfx_08_75.asm +++ b/music/sfx/sfx_08_75.asm @@ -1,5 +1,5 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0) - unknownmusic0xf8 + executemusic vibrato 10, 2, 4 duty 2 notetype 10, 8, 7 @@ -14,7 +14,7 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0) SFX_08_75_Ch2: ; 208f0 (8:48f0) - unknownmusic0xf8 + executemusic vibrato 10, 2, 3 duty 2 notetype 11, 6, 7 diff --git a/music/sfx/sfx_08_76.asm b/music/sfx/sfx_08_76.asm index 34de1baf..7a1891ae 100644 --- a/music/sfx/sfx_08_76.asm +++ b/music/sfx/sfx_08_76.asm @@ -1,132 +1,48 @@ SFX_08_76_Ch1: ; 20902 (8:4902) duty 0 - note D_, 3 - unknownmusic0xf1 - note G#, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note A_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note A#, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note B_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - rest 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - notetype 0, 0, 7 + unknownsfx0x20 2, 241, 128, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 144, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 160, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 176, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 192, 7 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 208, 7 SFX_08_76_branch_20930: - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - octave 8 - note C_, 8 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 2, 241, 224, 7 loopchannel 12, SFX_08_76_branch_20930 - note D_, 16 - unknownmusic0xf1 - note C_, 1 - note C_, 8 + unknownsfx0x20 15, 241, 0, 7 endchannel SFX_08_76_Ch2: ; 20941 (8:4941) dutycycle 179 - note D_, 3 - unknownmusic0xf1 - note G#, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note A_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note A#, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note B_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - rest 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - notetype 1, 0, 7 - note D_, 3 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 3 - unknownmusic0xf1 - octave 7 - note C_, 8 + unknownsfx0x20 2, 241, 129, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 145, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 161, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 177, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 193, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 209, 7 + unknownsfx0x20 2, 241, 1, 7 + unknownsfx0x20 2, 241, 225, 7 loopchannel 12, SFX_08_76_branch_20930 - note D_, 16 - unknownmusic0xf1 - note C_, 2 - note C_, 8 + unknownsfx0x20 15, 241, 1, 7 endchannel SFX_08_76_Ch3: ; 20980 (8:4980) - note D_, 2 - notetype 1, 4, 9 - note D_, 2 - notetype 1, 2, 9 + unknownnoise0x20 1, 209, 73 + unknownnoise0x20 1, 209, 41 loopchannel 26, SFX_08_76_Ch3 endchannel ; 0x2098b \ No newline at end of file diff --git a/music/sfx/sfx_08_77.asm b/music/sfx/sfx_08_77.asm index fbadb06d..84def9b8 100644 --- a/music/sfx/sfx_08_77.asm +++ b/music/sfx/sfx_08_77.asm @@ -1,24 +1,10 @@ SFX_08_77_Ch1: ; 20412 (8:4412) duty 0 - note D_, 1 - notetype 2, 0, 0 - note C_, 8 - note D_, 1 - notetype 2, 4, 0 - note C_, 8 - note D_, 1 - notetype 2, 8, 0 - note C_, 8 - note D_, 1 - notetype 2, 12, 0 - note C_, 8 - note D_, 11 - octave 7 - octave 8 - note C_, 8 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 0, 210, 0, 7 + unknownsfx0x20 0, 210, 64, 7 + unknownsfx0x20 0, 210, 128, 7 + unknownsfx0x20 0, 210, 192, 7 + unknownsfx0x20 10, 225, 224, 7 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x2042d \ No newline at end of file diff --git a/music/sfx/sfx_1f_01.asm b/music/sfx/sfx_1f_01.asm index 01a33b48..e7a40492 100644 --- a/music/sfx/sfx_1f_01.asm +++ b/music/sfx/sfx_1f_01.asm @@ -1,6 +1,4 @@ SFX_1f_01_Ch1: ; 7c2fd (1f:42fd) - note D_, 1 - rest 2 - note D#, 4 + unknownnoise0x20 0, 193, 51 endchannel ; 0x7c301 \ No newline at end of file diff --git a/music/sfx/sfx_1f_02.asm b/music/sfx/sfx_1f_02.asm index 4668a734..bb95fe0b 100644 --- a/music/sfx/sfx_1f_02.asm +++ b/music/sfx/sfx_1f_02.asm @@ -1,6 +1,4 @@ SFX_1f_02_Ch1: ; 7c301 (1f:4301) - note D_, 1 - note B_, 2 - note D#, 4 + unknownnoise0x20 0, 177, 51 endchannel ; 0x7c305 \ No newline at end of file diff --git a/music/sfx/sfx_1f_03.asm b/music/sfx/sfx_1f_03.asm index b211efd1..3d6fa66a 100644 --- a/music/sfx/sfx_1f_03.asm +++ b/music/sfx/sfx_1f_03.asm @@ -1,6 +1,4 @@ SFX_1f_03_Ch1: ; 7c305 (1f:4305) - note D_, 1 - note A#, 2 - note D#, 4 + unknownnoise0x20 0, 161, 51 endchannel ; 0x7c309 \ No newline at end of file diff --git a/music/sfx/sfx_1f_04.asm b/music/sfx/sfx_1f_04.asm index 96989642..3d73e1a3 100644 --- a/music/sfx/sfx_1f_04.asm +++ b/music/sfx/sfx_1f_04.asm @@ -1,6 +1,4 @@ SFX_1f_04_Ch1: ; 7c309 (1f:4309) - note D_, 1 - note G#, 2 - note D#, 4 + unknownnoise0x20 0, 129, 51 endchannel ; 0x7c30d \ No newline at end of file diff --git a/music/sfx/sfx_1f_05.asm b/music/sfx/sfx_1f_05.asm index 165fc496..3db77f2e 100644 --- a/music/sfx/sfx_1f_05.asm +++ b/music/sfx/sfx_1f_05.asm @@ -1,21 +1,9 @@ SFX_1f_05_Ch1: ; 7c30d (1f:430d) - note D_, 8 - note G#, 5 - note D#, 8 - note D_, 7 - note G#, 5 - note D#, 7 - note D_, 6 - note G#, 4 - note D#, 6 - note D_, 5 - note G#, 4 - note D#, 5 - note D_, 4 - note G#, 3 - note D#, 4 - note D_, 3 - note G#, 2 - note D#, 3 + unknownnoise0x20 7, 132, 55 + unknownnoise0x20 6, 132, 54 + unknownnoise0x20 5, 131, 53 + unknownnoise0x20 4, 131, 52 + unknownnoise0x20 3, 130, 51 + unknownnoise0x20 2, 129, 50 endchannel ; 0x7c320 \ No newline at end of file diff --git a/music/sfx/sfx_1f_06.asm b/music/sfx/sfx_1f_06.asm index 84860cbd..1d6c85cf 100644 --- a/music/sfx/sfx_1f_06.asm +++ b/music/sfx/sfx_1f_06.asm @@ -1,6 +1,4 @@ SFX_1f_06_Ch1: ; 7c320 (1f:4320) - note D_, 1 - note F_, 2 - note D_, 11 + unknownnoise0x20 0, 81, 42 endchannel ; 0x7c324 \ No newline at end of file diff --git a/music/sfx/sfx_1f_07.asm b/music/sfx/sfx_1f_07.asm index 5301647d..69982127 100644 --- a/music/sfx/sfx_1f_07.asm +++ b/music/sfx/sfx_1f_07.asm @@ -1,9 +1,5 @@ SFX_1f_07_Ch1: ; 7c324 (1f:4324) - note D_, 2 - note E_, 2 - note D_, 12 - note D_, 1 - note F#, 2 - note D_, 11 + unknownnoise0x20 1, 65, 43 + unknownnoise0x20 0, 97, 42 endchannel ; 0x7c32b \ No newline at end of file diff --git a/music/sfx/sfx_1f_08.asm b/music/sfx/sfx_1f_08.asm index 839ea921..8798fc9b 100644 --- a/music/sfx/sfx_1f_08.asm +++ b/music/sfx/sfx_1f_08.asm @@ -1,6 +1,4 @@ SFX_1f_08_Ch1: ; 7c32b (1f:432b) - note D_, 1 - note G#, 2 - note C#, 1 + unknownnoise0x20 0, 129, 16 endchannel ; 0x7c32f \ No newline at end of file diff --git a/music/sfx/sfx_1f_09.asm b/music/sfx/sfx_1f_09.asm index dd12e72e..ef7a87bc 100644 --- a/music/sfx/sfx_1f_09.asm +++ b/music/sfx/sfx_1f_09.asm @@ -1,6 +1,4 @@ SFX_1f_09_Ch1: ; 7c32f (1f:432f) - note D_, 1 - note G#, 3 - note D_, 4 + unknownnoise0x20 0, 130, 35 endchannel ; 0x7c333 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0a.asm b/music/sfx/sfx_1f_0a.asm index 2351dea5..4b3ffa3e 100644 --- a/music/sfx/sfx_1f_0a.asm +++ b/music/sfx/sfx_1f_0a.asm @@ -1,6 +1,4 @@ SFX_1f_0a_Ch1: ; 7c333 (1f:4333) - note D_, 1 - note G#, 3 - note D_, 6 + unknownnoise0x20 0, 130, 37 endchannel ; 0x7c337 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0b.asm b/music/sfx/sfx_1f_0b.asm index 8aab75b1..a7f558fd 100644 --- a/music/sfx/sfx_1f_0b.asm +++ b/music/sfx/sfx_1f_0b.asm @@ -1,6 +1,4 @@ SFX_1f_0b_Ch1: ; 7c337 (1f:4337) - note D_, 1 - note G#, 3 - note D_, 7 + unknownnoise0x20 0, 130, 38 endchannel ; 0x7c33b \ No newline at end of file diff --git a/music/sfx/sfx_1f_0c.asm b/music/sfx/sfx_1f_0c.asm index aa065f6a..50d7d56f 100644 --- a/music/sfx/sfx_1f_0c.asm +++ b/music/sfx/sfx_1f_0c.asm @@ -1,6 +1,4 @@ SFX_1f_0c_Ch1: ; 7c33b (1f:433b) - note D_, 1 - note A#, 2 - note C#, 1 + unknownnoise0x20 0, 161, 16 endchannel ; 0x7c33f \ No newline at end of file diff --git a/music/sfx/sfx_1f_0d.asm b/music/sfx/sfx_1f_0d.asm index 16cde324..b329482b 100644 --- a/music/sfx/sfx_1f_0d.asm +++ b/music/sfx/sfx_1f_0d.asm @@ -1,6 +1,4 @@ SFX_1f_0d_Ch1: ; 7c33f (1f:433f) - note D_, 1 - note A#, 3 - note C#, 2 + unknownnoise0x20 0, 162, 17 endchannel ; 0x7c343 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0e.asm b/music/sfx/sfx_1f_0e.asm index 60dddf0f..7b36809b 100644 --- a/music/sfx/sfx_1f_0e.asm +++ b/music/sfx/sfx_1f_0e.asm @@ -1,6 +1,4 @@ SFX_1f_0e_Ch1: ; 7c343 (1f:4343) - note D_, 1 - note A#, 3 - note F_, 1 + unknownnoise0x20 0, 162, 80 endchannel ; 0x7c347 \ No newline at end of file diff --git a/music/sfx/sfx_1f_0f.asm b/music/sfx/sfx_1f_0f.asm index 79531285..f8e11b6d 100644 --- a/music/sfx/sfx_1f_0f.asm +++ b/music/sfx/sfx_1f_0f.asm @@ -1,9 +1,5 @@ SFX_1f_0f_Ch1: ; 7c347 (1f:4347) - note D_, 1 - note A#, 2 - note C#, 9 - note D_, 1 - note D#, 2 - note D#, 4 + unknownnoise0x20 0, 161, 24 + unknownnoise0x20 0, 49, 51 endchannel ; 0x7c34e \ No newline at end of file diff --git a/music/sfx/sfx_1f_10.asm b/music/sfx/sfx_1f_10.asm index be08cea8..049d47a8 100644 --- a/music/sfx/sfx_1f_10.asm +++ b/music/sfx/sfx_1f_10.asm @@ -1,9 +1,5 @@ SFX_1f_10_Ch1: ; 7c34e (1f:434e) - note D_, 3 - note A_, 2 - note D_, 9 - note D_, 1 - note G_, 2 - note C#, 9 + unknownnoise0x20 2, 145, 40 + unknownnoise0x20 0, 113, 24 endchannel ; 0x7c355 \ No newline at end of file diff --git a/music/sfx/sfx_1f_11.asm b/music/sfx/sfx_1f_11.asm index ebdd7fe6..503396fb 100644 --- a/music/sfx/sfx_1f_11.asm +++ b/music/sfx/sfx_1f_11.asm @@ -1,6 +1,4 @@ SFX_1f_11_Ch1: ; 7c355 (1f:4355) - note D_, 1 - note A_, 2 - note D_, 3 + unknownnoise0x20 0, 145, 34 endchannel ; 0x7c359 \ No newline at end of file diff --git a/music/sfx/sfx_1f_12.asm b/music/sfx/sfx_1f_12.asm index fb21aaf3..344281f5 100644 --- a/music/sfx/sfx_1f_12.asm +++ b/music/sfx/sfx_1f_12.asm @@ -1,6 +1,4 @@ SFX_1f_12_Ch1: ; 7c359 (1f:4359) - note D_, 1 - note G_, 2 - note D_, 3 + unknownnoise0x20 0, 113, 34 endchannel ; 0x7c35d \ No newline at end of file diff --git a/music/sfx/sfx_1f_13.asm b/music/sfx/sfx_1f_13.asm index 1037500d..2eab2643 100644 --- a/music/sfx/sfx_1f_13.asm +++ b/music/sfx/sfx_1f_13.asm @@ -1,6 +1,4 @@ SFX_1f_13_Ch1: ; 7c35d (1f:435d) - note D_, 1 - note F#, 2 - note D_, 3 + unknownnoise0x20 0, 97, 34 endchannel ; 0x7c361 \ No newline at end of file diff --git a/music/sfx/sfx_1f_14.asm b/music/sfx/sfx_1f_14.asm index 06bfb1e9..373bb2c3 100644 --- a/music/sfx/sfx_1f_14.asm +++ b/music/sfx/sfx_1f_14.asm @@ -1,46 +1,22 @@ SFX_1f_14_Ch1: ; 7c9fc (1f:49fc) dutycycle 245 - note D_, 5 - unknownmusic0xf3 - note C#, 9 - note C_, 8 - note D_, 16 - octave 3 - note A_, 9 - note C_, 8 - note D_, 9 - note A_, 2 - note F_, 9 - note C_, 8 + unknownsfx0x20 4, 243, 24, 7 + unknownsfx0x20 15, 229, 152, 7 + unknownsfx0x20 8, 145, 88, 7 endchannel SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b) dutycycle 160 - note D_, 6 - note B_, 4 - note C_, 9 - note C_, 8 - note D_, 16 - rest 6 - note G#, 9 - note C_, 8 - note D_, 9 - note G_, 2 - note E_, 9 - note C_, 8 + unknownsfx0x20 5, 179, 8, 7 + unknownsfx0x20 15, 197, 136, 7 + unknownsfx0x20 8, 113, 72, 7 endchannel SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a) - note D_, 4 - note A#, 2 - note C#, 13 - note D_, 15 - note A_, 5 - note D_, 13 - note D_, 9 - note G#, 2 - note C#, 13 + unknownnoise0x20 3, 161, 28 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 8, 129, 28 endchannel ; 0x7ca24 \ No newline at end of file diff --git a/music/sfx/sfx_1f_15.asm b/music/sfx/sfx_1f_15.asm index d91547db..b3edbdbd 100644 --- a/music/sfx/sfx_1f_15.asm +++ b/music/sfx/sfx_1f_15.asm @@ -1,55 +1,25 @@ SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c) dutycycle 160 - note D_, 5 - unknownmusic0xf3 - note C_, 1 - note C_, 7 - note D_, 9 - notetype 5, 6, 0 - note C_, 8 - note D_, 4 - octave 6 - note D_, 1 - note C_, 8 - note D_, 9 - notetype 1, 1, 0 - note C_, 8 + unknownsfx0x20 4, 243, 0, 6 + unknownsfx0x20 8, 213, 96, 7 + unknownsfx0x20 3, 226, 32, 7 + unknownsfx0x20 8, 209, 16, 7 endchannel SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f) dutycycle 90 - note D_, 6 - note B_, 4 - unknownmusic0xf1 - note C_, 7 - note D_, 8 - rest 6 - note F_, 3 - note C_, 8 - note D_, 4 - note A#, 3 - note C#, 2 - note C_, 8 - note D_, 9 - note B_, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 5, 179, 241, 6 + unknownsfx0x20 7, 197, 82, 7 + unknownsfx0x20 3, 162, 17, 7 + unknownsfx0x20 8, 177, 1, 6 endchannel SFX_1f_15_Ch3: ; 7cc32 (1f:4c32) - note D_, 4 - note A#, 3 - note D#, 13 - note D_, 13 - note A_, 5 - note D_, 13 - note D_, 4 - note G#, 3 - note C#, 13 - note D_, 9 - note G_, 2 - note D_, 13 + unknownnoise0x20 3, 162, 60 + unknownnoise0x20 12, 148, 44 + unknownnoise0x20 3, 130, 28 + unknownnoise0x20 8, 113, 44 endchannel ; 0x7cc3f \ No newline at end of file diff --git a/music/sfx/sfx_1f_16.asm b/music/sfx/sfx_1f_16.asm index 97914c47..7c2346fb 100644 --- a/music/sfx/sfx_1f_16.asm +++ b/music/sfx/sfx_1f_16.asm @@ -1,33 +1,16 @@ SFX_1f_16_Ch1: ; 7cb81 (1f:4b81) duty 0 - note D_, 9 - unknownmusic0xf5 - note G#, 1 - note C_, 5 - note D_, 3 - octave 7 - octave 8 - note C_, 6 - note D_, 9 - notetype 1, 13, 12 - note C_, 6 + unknownsfx0x20 8, 245, 128, 4 + unknownsfx0x20 2, 225, 224, 5 + unknownsfx0x20 8, 209, 220, 5 endchannel SFX_1f_16_Ch2: ; 7cb90 (1f:4b90) dutycycle 165 - note D_, 8 - note A_, 6 - note E_, 2 - note C_, 5 - note D_, 3 - note G#, 2 - note D_, 2 - note C_, 6 - note D_, 9 - note F#, 2 - note C#, 11 - note C_, 6 + unknownsfx0x20 7, 149, 65, 4 + unknownsfx0x20 2, 129, 33, 5 + unknownsfx0x20 8, 97, 26, 5 SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e) diff --git a/music/sfx/sfx_1f_17.asm b/music/sfx/sfx_1f_17.asm index 298f9026..bfda0fe3 100644 --- a/music/sfx/sfx_1f_17.asm +++ b/music/sfx/sfx_1f_17.asm @@ -1,78 +1,31 @@ SFX_1f_17_Ch1: ; 7c91b (1f:491b) dutycycle 240 - note D_, 5 - unknownmusic0xf7 - note C_, 9 - note C_, 7 - note D_, 7 - octave 2 - note C_, 1 - note C_, 7 - note D_, 7 - notetype 7, 15, 0 - note C_, 6 - note D_, 7 - rest 5 - octave 8 - note C_, 6 - note D_, 6 - notetype 3, 12, 0 - note C_, 6 - note D_, 5 - notetype 3, 10, 0 - note C_, 6 - note D_, 9 - octave 7 - note G#, 1 - note C_, 6 + unknownsfx0x20 4, 247, 8, 6 + unknownsfx0x20 6, 230, 0, 6 + unknownsfx0x20 6, 215, 240, 5 + unknownsfx0x20 6, 196, 224, 5 + unknownsfx0x20 5, 211, 192, 5 + unknownsfx0x20 4, 211, 160, 5 + unknownsfx0x20 8, 225, 128, 5 endchannel SFX_1f_17_Ch2: ; 7c93a (1f:493a) dutycycle 10 - note D_, 5 - rest 8 - note C_, 5 - note C_, 6 - note D_, 7 - note A#, 7 - note C_, 3 - note C_, 6 - note D_, 7 - note A_, 8 - unknownmusic0xf1 - note C_, 5 - note D_, 5 - note B_, 5 - octave 7 - note C_, 5 - note D_, 6 - note A#, 4 - rest 3 - note C_, 5 - note D_, 5 - note B_, 4 - note A#, 4 - note C_, 5 - note D_, 9 - rest 2 - note G#, 3 - note C_, 5 + unknownsfx0x20 4, 199, 4, 5 + unknownsfx0x20 6, 166, 2, 5 + unknownsfx0x20 6, 151, 241, 4 + unknownsfx0x20 4, 180, 225, 4 + unknownsfx0x20 5, 163, 194, 4 + unknownsfx0x20 4, 179, 163, 4 + unknownsfx0x20 8, 193, 130, 4 endchannel SFX_1f_17_Ch3: ; 7c959 (1f:4959) - note D_, 13 - octave 4 - note E_, 13 - note D_, 11 - rest 8 - note F_, 13 - note D_, 13 - note B_, 7 - note E_, 13 - note D_, 16 - note A#, 3 - note F_, 13 + unknownnoise0x20 12, 228, 76 + unknownnoise0x20 10, 199, 92 + unknownnoise0x20 12, 182, 76 + unknownnoise0x20 15, 162, 92 endchannel ; 0x7c966 \ No newline at end of file diff --git a/music/sfx/sfx_1f_18.asm b/music/sfx/sfx_1f_18.asm index 26169d52..7e532f3e 100644 --- a/music/sfx/sfx_1f_18.asm +++ b/music/sfx/sfx_1f_18.asm @@ -1,81 +1,33 @@ SFX_1f_18_Ch1: ; 7ccca (1f:4cca) dutycycle 240 - note D_, 5 - unknownmusic0xf7 - note A#, 1 - note C_, 7 - note D_, 9 - octave 2 - note A#, 5 - note C_, 7 - note D_, 5 - notetype 6, 10, 0 - note C_, 7 - note D_, 13 - notetype 3, 2, 0 - note C_, 7 - note D_, 9 - rest 4 - note D_, 5 - note C_, 7 - note D_, 5 - rest 3 - note D_, 1 - note C_, 7 - note D_, 9 - note B_, 2 - note C#, 1 - note C_, 7 + unknownsfx0x20 4, 247, 160, 6 + unknownsfx0x20 8, 230, 164, 6 + unknownsfx0x20 4, 214, 160, 6 + unknownsfx0x20 12, 211, 32, 6 + unknownsfx0x20 8, 195, 36, 6 + unknownsfx0x20 4, 194, 32, 6 + unknownsfx0x20 8, 177, 16, 6 endchannel SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9) dutycycle 90 - note D_, 5 - octave 1 - note C_, 2 - note C_, 7 - note D_, 9 - notetype 6, 0, 3 - note C_, 7 - note D_, 5 - rest 7 - note C_, 2 - note C_, 7 - note D_, 13 - rest 4 - note G#, 2 - note C_, 6 - note D_, 9 - note B_, 4 - note G#, 4 - note C_, 6 - note D_, 5 - note B_, 3 - note G#, 3 - note C_, 6 - note D_, 9 - note A#, 2 - note G_, 2 - note C_, 6 + unknownsfx0x20 4, 231, 1, 6 + unknownsfx0x20 8, 214, 3, 6 + unknownsfx0x20 4, 198, 1, 6 + unknownsfx0x20 12, 195, 129, 5 + unknownsfx0x20 8, 179, 131, 5 + unknownsfx0x20 4, 178, 130, 5 + unknownsfx0x20 8, 161, 113, 5 endchannel SFX_1f_18_Ch3: ; 7cd08 (1f:4d08) - note D_, 8 - notetype 6, 5, 12 - note D_, 9 - octave 2 - note E_, 13 - note D_, 5 - notetype 4, 5, 12 - note D_, 5 - notetype 4, 4, 12 - note D_, 8 - rest 4 - note E_, 13 - note D_, 9 - note A#, 2 - note F_, 13 + unknownnoise0x20 7, 214, 92 + unknownnoise0x20 8, 230, 76 + unknownnoise0x20 4, 212, 92 + unknownnoise0x20 4, 212, 76 + unknownnoise0x20 7, 195, 76 + unknownnoise0x20 8, 161, 92 endchannel ; 0x7cd1b \ No newline at end of file diff --git a/music/sfx/sfx_1f_19.asm b/music/sfx/sfx_1f_19.asm index 493796d2..c9609be5 100644 --- a/music/sfx/sfx_1f_19.asm +++ b/music/sfx/sfx_1f_19.asm @@ -1,40 +1,18 @@ SFX_1f_19_Ch1: ; 7caaa (1f:4aaa) dutycycle 10 - note D_, 7 - octave 6 - note C_, 1 - note C_, 6 - note D_, 7 - octave 5 - note G#, 1 - note C_, 6 - note D_, 7 - notetype 3, 7, 0 - note C_, 6 - note D_, 9 - note A#, 2 - note F#, 1 - note C_, 6 + unknownsfx0x20 6, 226, 0, 5 + unknownsfx0x20 6, 227, 128, 5 + unknownsfx0x20 6, 211, 112, 5 + unknownsfx0x20 8, 161, 96, 5 endchannel SFX_1f_19_Ch2: ; 7cabd (1f:4abd) dutycycle 245 - note D_, 7 - octave 6 - note G#, 3 - note C_, 5 - note D_, 7 - notetype 3, 0, 1 - note C_, 6 - note D_, 7 - note B_, 3 - octave 6 - note C_, 5 - note D_, 9 - note G#, 2 - rest 2 - note C_, 5 + unknownsfx0x20 6, 226, 130, 4 + unknownsfx0x20 6, 211, 1, 5 + unknownsfx0x20 6, 178, 226, 4 + unknownsfx0x20 8, 129, 193, 4 SFX_1f_19_Ch3: ; 7cacf (1f:4acf) diff --git a/music/sfx/sfx_1f_1a.asm b/music/sfx/sfx_1f_1a.asm index 08e1a6dc..2498f122 100644 --- a/music/sfx/sfx_1f_1a.asm +++ b/music/sfx/sfx_1f_1a.asm @@ -1,29 +1,11 @@ SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54) dutycycle 250 - note D_, 7 - note G#, 4 - note E_, 8 - note C_, 3 - note D_, 16 - note F#, 3 - note D_, 7 - note C_, 3 - note D_, 5 - note F_, 3 - note E_, 6 - note C_, 3 - note D_, 10 - note F#, 4 - note C_, 7 - note C_, 3 - note D_, 16 - note G#, 3 - note D_, 6 - note C_, 3 - note D_, 16 - note E_, 3 - note C_, 8 - note C_, 3 + unknownsfx0x20 6, 131, 71, 2 + unknownsfx0x20 15, 98, 38, 2 + unknownsfx0x20 4, 82, 69, 2 + unknownsfx0x20 9, 99, 6, 2 + unknownsfx0x20 15, 130, 37, 2 + unknownsfx0x20 15, 66, 7, 2 SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e) @@ -31,21 +13,11 @@ SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e) SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f) - note D_, 9 - notetype 4, 8, 12 - note D_, 5 - octave 6 - note A_, 13 - note D_, 16 - rest 7 - note G#, 13 - note D_, 9 - octave 4 - note A#, 13 - note D_, 16 - notetype 7, 9, 12 - note D_, 16 - unknownmusic0xf2 - note A#, 13 + unknownnoise0x20 8, 212, 140 + unknownnoise0x20 4, 226, 156 + unknownnoise0x20 15, 198, 140 + unknownnoise0x20 8, 228, 172 + unknownnoise0x20 15, 215, 156 + unknownnoise0x20 15, 242, 172 endchannel ; 0x7ca82 \ No newline at end of file diff --git a/music/sfx/sfx_1f_1b.asm b/music/sfx/sfx_1f_1b.asm index 1b7e5aab..df3167b1 100644 --- a/music/sfx/sfx_1f_1b.asm +++ b/music/sfx/sfx_1f_1b.asm @@ -1,45 +1,22 @@ SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82) dutycycle 240 - note D_, 5 - unknownmusic0xf3 - octave 8 - note C_, 7 - note D_, 16 - octave 4 - note E_, 1 - note C_, 7 - note D_, 9 - rest 2 - note D_, 1 - note C_, 7 + unknownsfx0x20 4, 243, 224, 6 + unknownsfx0x20 15, 228, 64, 6 + unknownsfx0x20 8, 193, 32, 6 endchannel SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91) dutycycle 10 - note D_, 4 - rest 4 - note G#, 4 - note C_, 7 - note D_, 15 - note B_, 5 - note C_, 3 - note C_, 7 - note D_, 9 - note A#, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 3, 195, 131, 6 + unknownsfx0x20 14, 180, 2, 6 + unknownsfx0x20 8, 161, 1, 6 endchannel SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0) - note D_, 5 - notetype 3, 5, 12 - note D_, 16 - octave 2 - note E_, 13 - note D_, 9 - note B_, 2 - note F_, 13 + unknownnoise0x20 4, 211, 92 + unknownnoise0x20 15, 230, 76 + unknownnoise0x20 8, 177, 92 endchannel ; 0x7caaa \ No newline at end of file diff --git a/music/sfx/sfx_1f_1c.asm b/music/sfx/sfx_1f_1c.asm index 64564a43..4e7ac177 100644 --- a/music/sfx/sfx_1f_1c.asm +++ b/music/sfx/sfx_1f_1c.asm @@ -1,51 +1,24 @@ SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a) dutycycle 240 - note D_, 16 - unknownmusic0xf6 - note F#, 6 - note C_, 6 - note D_, 11 - octave 4 - note G_, 13 - note C_, 6 - note D_, 4 - rest 3 - note F_, 13 - note C_, 6 - note D_, 16 - note B_, 3 - note D#, 13 - note C_, 6 + unknownsfx0x20 15, 246, 101, 5 + unknownsfx0x20 10, 228, 124, 5 + unknownsfx0x20 3, 194, 92, 5 + unknownsfx0x20 15, 178, 60, 5 endchannel SFX_1f_1c_Ch2: ; 7ccad (1f:4cad) dutycycle 90 - note D_, 15 - notetype 6, 0, 3 - note C_, 6 - note D_, 10 - note B_, 5 - note C#, 12 - note C_, 6 - note D_, 5 - note A_, 3 - unknownmusic0xfa - note C_, 5 - note D_, 16 - note A#, 3 - notetype 11, 0, 4 + unknownsfx0x20 14, 214, 3, 5 + unknownsfx0x20 9, 180, 27, 5 + unknownsfx0x20 4, 146, 250, 4 + unknownsfx0x20 15, 162, 219, 4 endchannel SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0) - note D_, 13 - octave 2 - note E_, 13 - note D_, 12 - notetype 7, 5, 12 - note D_, 16 - rest 3 - note E_, 13 + unknownnoise0x20 12, 230, 76 + unknownnoise0x20 11, 215, 92 + unknownnoise0x20 15, 194, 76 endchannel ; 0x7ccca \ No newline at end of file diff --git a/music/sfx/sfx_1f_1d.asm b/music/sfx/sfx_1f_1d.asm index 9c655931..703b55d5 100644 --- a/music/sfx/sfx_1f_1d.asm +++ b/music/sfx/sfx_1f_1d.asm @@ -1,83 +1,36 @@ SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - note A#, 1 - note C_, 8 - note D_, 7 - octave 2 - note A#, 4 - note C_, 8 - note D_, 11 - unknownmusic0xf4 - note A#, 1 - note C_, 8 + unknownsfx0x20 15, 247, 160, 7 + unknownsfx0x20 6, 230, 163, 7 + unknownsfx0x20 10, 244, 160, 7 dutycycle 165 - note D_, 11 - unknownmusic0xf6 - notetype 8, 0, 7 - note D_, 5 - octave 5 - notetype 7, 0, 7 - note D_, 16 - unknownmusic0xf2 - notetype 8, 0, 7 + unknownsfx0x20 10, 246, 216, 7 + unknownsfx0x20 4, 227, 215, 7 + unknownsfx0x20 15, 242, 216, 7 endchannel SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1) dutycycle 5 - note D_, 3 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 16 - note A#, 8 - note A#, 2 - note C_, 7 - note D_, 7 - note G#, 7 - note A#, 3 - note C_, 7 - note D_, 11 - note G_, 5 - note A#, 2 - note C_, 7 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 15, 167, 161, 6 + unknownsfx0x20 6, 134, 162, 6 + unknownsfx0x20 10, 116, 161, 6 dutycycle 95 - note D_, 11 - note G_, 7 - notetype 6, 0, 6 - note D_, 5 - note G#, 4 - notetype 9, 0, 6 - note D_, 16 - note A#, 3 - notetype 7, 0, 6 + unknownsfx0x20 10, 118, 214, 6 + unknownsfx0x20 4, 131, 217, 6 + unknownsfx0x20 15, 162, 215, 6 endchannel SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2) - note D_, 3 - unknownmusic0xf2 - note D#, 13 - note D_, 9 - octave 4 - note D#, 15 - note D_, 16 - notetype 7, 3, 12 - note D_, 7 - rest 6 - note D#, 12 - note D_, 7 - octave 4 - note D#, 14 - note D_, 9 - note B_, 7 - note D#, 13 - note D_, 7 - notetype 4, 3, 13 - note D_, 9 - rest 2 - note D#, 12 + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 6, 197, 59 + unknownnoise0x20 6, 228, 61 + unknownnoise0x20 8, 182, 60 + unknownnoise0x20 6, 212, 61 + unknownnoise0x20 8, 193, 59 endchannel ; 0x7c7fb \ No newline at end of file diff --git a/music/sfx/sfx_1f_1e.asm b/music/sfx/sfx_1f_1e.asm index 9b3c96bc..4733a534 100644 --- a/music/sfx/sfx_1f_1e.asm +++ b/music/sfx/sfx_1f_1e.asm @@ -1,94 +1,36 @@ SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f) dutycycle 240 - note D_, 9 - unknownmusic0xf7 - octave 8 - note C_, 7 - note D_, 7 - octave 2 - octave 3 - note C_, 7 - note D_, 4 - unknownmusic0xf4 - octave 8 - note C_, 7 - note D_, 4 - unknownmusic0xf6 - notetype 0, 0, 6 - note D_, 4 - octave 5 - rest 1 - note C_, 7 - note D_, 5 - unknownmusic0xf2 - note B_, 1 - note C_, 7 - note D_, 16 - note A#, 3 - rest 9 - note C_, 7 + unknownsfx0x20 8, 247, 224, 6 + unknownsfx0x20 6, 230, 229, 6 + unknownsfx0x20 3, 244, 224, 6 + unknownsfx0x20 3, 246, 208, 6 + unknownsfx0x20 3, 227, 192, 6 + unknownsfx0x20 4, 242, 176, 6 + unknownsfx0x20 15, 162, 200, 6 endchannel SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e) dutycycle 5 - note D_, 4 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 9 - note A#, 8 - note A#, 2 - note C_, 7 - note D_, 7 - note G#, 7 - note A#, 4 - note C_, 7 - note D_, 4 - note G_, 5 - note A#, 2 - note C_, 7 - note D_, 4 - note G_, 7 - note A_, 2 - note C_, 7 - note D_, 4 - note G#, 4 - note G#, 3 - note C_, 7 - note D_, 5 - note A#, 3 - note G_, 2 - note C_, 7 - note D_, 16 - note G_, 3 - note G#, 10 - note C_, 7 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 8, 167, 161, 6 + unknownsfx0x20 6, 134, 163, 6 + unknownsfx0x20 3, 116, 161, 6 + unknownsfx0x20 3, 118, 145, 6 + unknownsfx0x20 3, 131, 130, 6 + unknownsfx0x20 4, 162, 113, 6 + unknownsfx0x20 15, 114, 137, 6 endchannel SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81) - note D_, 3 - unknownmusic0xf2 - note D#, 13 - note D_, 9 - octave 4 - note D#, 15 - note D_, 9 - notetype 7, 3, 12 - note D_, 6 - rest 6 - note D#, 12 - note D_, 4 - notetype 4, 2, 12 - note D_, 3 - note B_, 7 - note D#, 13 - note D_, 4 - note A#, 5 - note D_, 13 - note D_, 9 - note A_, 2 - note D#, 13 + unknownnoise0x20 2, 242, 60 + unknownnoise0x20 8, 228, 62 + unknownnoise0x20 8, 215, 60 + unknownnoise0x20 5, 197, 59 + unknownnoise0x20 3, 212, 44 + unknownnoise0x20 2, 182, 60 + unknownnoise0x20 3, 164, 44 + unknownnoise0x20 8, 145, 60 endchannel ; 0x7cc9a \ No newline at end of file diff --git a/music/sfx/sfx_1f_1f.asm b/music/sfx/sfx_1f_1f.asm index d04cb69d..9188186b 100644 --- a/music/sfx/sfx_1f_1f.asm +++ b/music/sfx/sfx_1f_1f.asm @@ -1,98 +1,38 @@ SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0) dutycycle 204 - note D_, 5 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 5 - octave 7 - note G#, 1 - note C_, 8 - note D_, 5 - notetype 1, 4, 0 - note C_, 8 - note D_, 5 - octave 7 - note E_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 - note D_, 5 - notetype 1, 0, 0 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 5 - notetype 1, 8, 2 - note C_, 8 - note D_, 5 - rest 2 - note E_, 3 - note C_, 8 - note D_, 9 - note B_, 2 - note E_, 2 - note C_, 8 + unknownsfx0x20 4, 241, 0, 7 + unknownsfx0x20 4, 225, 128, 7 + unknownsfx0x20 4, 209, 64, 7 + unknownsfx0x20 4, 225, 64, 7 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 209, 0, 7 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 209, 130, 7 + unknownsfx0x20 4, 193, 66, 7 + unknownsfx0x20 8, 177, 65, 7 endchannel SFX_1f_1f_Ch2: ; 7cafb (1f:4afb) dutycycle 68 - note D_, 13 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - unknownmusic0xf1 - note C_, 2 - note C_, 8 - note D_, 5 - octave 7 - note G#, 3 - note C_, 8 - note D_, 5 - notetype 1, 4, 1 - note C_, 8 - note D_, 5 - octave 7 - note E_, 2 - note C_, 8 - note D_, 5 - unknownmusic0xf1 - note G#, 3 - note C_, 8 - note D_, 9 - notetype 1, 0, 1 - note C_, 8 + unknownsfx0x20 12, 8, 0, 0 + unknownsfx0x20 4, 241, 1, 7 + unknownsfx0x20 4, 225, 130, 7 + unknownsfx0x20 4, 209, 65, 7 + unknownsfx0x20 4, 225, 65, 7 + unknownsfx0x20 4, 241, 130, 7 + unknownsfx0x20 8, 209, 1, 7 endchannel SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a) - note D_, 16 - note C_, 9 - note C_, 1 - note D_, 5 - note C_, 9 - note C_, 1 - note D_, 5 - notetype 1, 4, 12 - note D_, 5 - note B_, 2 - note D_, 13 - note D_, 5 - notetype 1, 3, 12 - note D_, 5 - note B_, 2 - note D#, 13 - note D_, 5 - rest 2 - note D_, 13 - note D_, 9 - note A#, 2 - note E_, 13 + unknownnoise0x20 15, 8, 0 + unknownnoise0x20 4, 8, 0 + unknownnoise0x20 4, 209, 76 + unknownnoise0x20 4, 177, 44 + unknownnoise0x20 4, 209, 60 + unknownnoise0x20 4, 177, 60 + unknownnoise0x20 4, 193, 44 + unknownnoise0x20 8, 161, 76 endchannel ; 0x7cb33 \ No newline at end of file diff --git a/music/sfx/sfx_1f_20.asm b/music/sfx/sfx_1f_20.asm index dc334861..2d0b1fc6 100644 --- a/music/sfx/sfx_1f_20.asm +++ b/music/sfx/sfx_1f_20.asm @@ -1,78 +1,28 @@ SFX_1f_20_Ch1: ; 7cb33 (1f:4b33) dutycycle 204 - note D_, 9 - unknownmusic0xf5 - note C_, 1 - note C_, 7 - note D_, 3 - notetype 2, 3, 8 - note C_, 7 - note D_, 3 - rest 3 - note D#, 1 - note C_, 7 - note D_, 3 - rest 3 - note D_, 9 - note C_, 7 - note D_, 3 - note B_, 3 - note D_, 1 - note C_, 7 - note D_, 3 - note B_, 3 - note C#, 1 - note C_, 7 - note D_, 3 - note A#, 3 - note C#, 9 - note C_, 7 - note D_, 3 - note B_, 3 - note C#, 1 - note C_, 7 - note D_, 9 - rest 2 - note D_, 1 - note C_, 7 + unknownsfx0x20 8, 245, 0, 6 + unknownsfx0x20 2, 210, 56, 6 + unknownsfx0x20 2, 194, 48, 6 + unknownsfx0x20 2, 194, 40, 6 + unknownsfx0x20 2, 178, 32, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 2, 162, 24, 6 + unknownsfx0x20 2, 178, 16, 6 + unknownsfx0x20 8, 193, 32, 6 endchannel SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a) dutycycle 68 - note D_, 13 - rest 4 - rest 1 - note C_, 6 - note D_, 4 - note B_, 2 - unknownmusic0xf9 - note C_, 6 - note D_, 3 - note A#, 2 - unknownmusic0xf1 - note C_, 6 - note D_, 3 - note A#, 2 - unknownmusic0xe9 - note C_, 6 - note D_, 3 - note A_, 2 - octave 7 - note C_, 6 - note D_, 3 - note A_, 2 - notetype 9, 0, 5 - note D_, 3 - note G#, 2 - notetype 1, 0, 5 - note D_, 3 - note A_, 2 - notetype 9, 0, 5 - note D_, 9 - note A_, 2 - octave 7 - note C_, 6 + unknownsfx0x20 12, 195, 192, 5 + unknownsfx0x20 3, 177, 249, 5 + unknownsfx0x20 2, 161, 241, 5 + unknownsfx0x20 2, 161, 233, 5 + unknownsfx0x20 2, 145, 225, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 2, 129, 209, 5 + unknownsfx0x20 2, 145, 217, 5 + unknownsfx0x20 8, 145, 225, 5 SFX_1f_20_Ch3: ; 7cb80 (1f:4b80) diff --git a/music/sfx/sfx_1f_21.asm b/music/sfx/sfx_1f_21.asm index 8c43c389..31c600b0 100644 --- a/music/sfx/sfx_1f_21.asm +++ b/music/sfx/sfx_1f_21.asm @@ -1,106 +1,41 @@ SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f) dutycycle 136 - note D_, 6 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note D_, 10 - notetype 1, 6, 0 - note C_, 7 - note D_, 6 - octave 6 - note C#, 3 - note C_, 7 - note D_, 10 - rest 2 - note D_, 3 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 1 - note C_, 7 - note D_, 7 - notetype 1, 2, 0 - note C_, 7 + unknownsfx0x20 5, 242, 80, 6 + unknownsfx0x20 9, 209, 96, 6 + unknownsfx0x20 5, 226, 18, 6 + unknownsfx0x20 9, 193, 34, 6 + unknownsfx0x20 5, 242, 16, 6 + unknownsfx0x20 6, 209, 32, 6 loopchannel 2, SFX_1f_21_Ch1 endchannel SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe) dutycycle 64 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 6 - unknownmusic0xf2 - note F_, 2 - note C_, 7 - note D_, 10 - notetype 1, 6, 1 - note C_, 7 - note D_, 6 - octave 6 - note C#, 5 - note C_, 7 - note D_, 9 - rest 2 - note D_, 5 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 2 - note C_, 7 - note D_, 13 - notetype 1, 2, 1 - note C_, 7 - note D_, 6 - octave 6 - note C#, 5 - note C_, 7 - note D_, 9 - rest 2 - note D_, 5 - note C_, 7 - note D_, 6 - unknownmusic0xf2 - note C#, 2 - note C_, 7 - note D_, 5 - notetype 1, 2, 1 - note C_, 7 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 5, 242, 81, 6 + unknownsfx0x20 9, 209, 97, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 12, 209, 33, 6 + unknownsfx0x20 5, 226, 20, 6 + unknownsfx0x20 8, 193, 36, 6 + unknownsfx0x20 5, 242, 17, 6 + unknownsfx0x20 4, 209, 33, 6 endchannel SFX_1f_21_Ch3: ; 7cbed (1f:4bed) - note D_, 7 - notetype 2, 1, 12 - note D_, 10 - note B_, 2 - note D_, 13 - note D_, 9 - rest 3 - note D_, 13 - note D_, 10 - note B_, 2 - note D#, 13 - note D_, 7 - rest 3 - note D_, 13 - note D_, 10 - note A#, 3 - note D#, 13 - note D_, 8 - rest 3 - note D_, 13 - note D_, 6 - note A#, 2 - note D#, 13 - note D_, 10 - rest 3 - note D_, 13 - note D_, 5 - note A#, 2 - note D#, 13 + unknownnoise0x20 6, 210, 28 + unknownnoise0x20 9, 177, 44 + unknownnoise0x20 8, 194, 44 + unknownnoise0x20 9, 177, 60 + unknownnoise0x20 6, 194, 44 + unknownnoise0x20 9, 162, 60 + unknownnoise0x20 7, 194, 44 + unknownnoise0x20 5, 161, 60 + unknownnoise0x20 9, 194, 44 + unknownnoise0x20 4, 161, 60 endchannel ; 0x7cc0c \ No newline at end of file diff --git a/music/sfx/sfx_1f_22.asm b/music/sfx/sfx_1f_22.asm index 02e35323..a239822f 100644 --- a/music/sfx/sfx_1f_22.asm +++ b/music/sfx/sfx_1f_22.asm @@ -1,54 +1,24 @@ SFX_1f_22_Ch1: ; 7ca24 (1f:4a24) dutycycle 165 - note D_, 5 - octave 7 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf2 - note G#, 1 - note C_, 8 - note D_, 3 - note A_, 3 - note E_, 1 - note C_, 8 - note D_, 9 - octave 7 - note C_, 1 - note C_, 7 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 4, 242, 128, 7 + unknownsfx0x20 2, 146, 64, 7 + unknownsfx0x20 8, 225, 0, 6 endchannel SFX_1f_22_Ch2: ; 7ca37 (1f:4a37) dutycycle 10 - note D_, 5 - note B_, 2 - octave 7 - note C_, 7 - note D_, 4 - rest 3 - octave 7 - note C_, 7 - note D_, 4 - note F#, 3 - note G#, 2 - note C_, 7 - note D_, 9 - note B_, 2 - octave 7 - note C_, 6 + unknownsfx0x20 4, 177, 225, 6 + unknownsfx0x20 3, 194, 225, 6 + unknownsfx0x20 3, 98, 129, 6 + unknownsfx0x20 8, 177, 225, 5 endchannel SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a) - note D_, 3 - note F#, 2 - note D#, 3 - note D_, 3 - note F#, 2 - note D_, 2 - note D_, 9 - note F#, 2 - note C#, 2 + unknownnoise0x20 2, 97, 50 + unknownnoise0x20 2, 97, 33 + unknownnoise0x20 8, 97, 17 endchannel ; 0x7ca54 \ No newline at end of file diff --git a/music/sfx/sfx_1f_23.asm b/music/sfx/sfx_1f_23.asm index 1fcdcb8d..dd021169 100644 --- a/music/sfx/sfx_1f_23.asm +++ b/music/sfx/sfx_1f_23.asm @@ -1,75 +1,30 @@ SFX_1f_23_Ch1: ; 7c966 (1f:4966) dutycycle 241 - note D_, 5 - unknownmusic0xf7 - rest 1 - note C_, 8 - note D_, 13 - octave 2 - rest 3 - note C_, 8 - note D_, 7 - note B_, 6 - note G#, 1 - note C_, 7 - note D_, 5 - rest 5 - note G_, 1 - note C_, 7 - note D_, 5 - note B_, 6 - note F#, 1 - note C_, 7 - note D_, 9 - rest 2 - note E_, 1 - note C_, 7 + unknownsfx0x20 4, 247, 192, 7 + unknownsfx0x20 12, 230, 194, 7 + unknownsfx0x20 6, 181, 128, 6 + unknownsfx0x20 4, 196, 112, 6 + unknownsfx0x20 4, 181, 96, 6 + unknownsfx0x20 8, 193, 64, 6 endchannel SFX_1f_23_Ch2: ; 7c981 (1f:4981) dutycycle 204 - note D_, 4 - rest 8 - note G#, 2 - note C_, 8 - note D_, 13 - note B_, 7 - note G#, 1 - note C_, 8 - note D_, 7 - note A#, 6 - note E_, 2 - note C_, 7 - note D_, 5 - rest 5 - note D#, 3 - note C_, 7 - note D_, 7 - note B_, 6 - note D_, 2 - note C_, 7 - note D_, 9 - note A#, 2 - note C_, 3 - note C_, 7 + unknownsfx0x20 3, 199, 129, 7 + unknownsfx0x20 12, 182, 128, 7 + unknownsfx0x20 6, 165, 65, 6 + unknownsfx0x20 4, 196, 50, 6 + unknownsfx0x20 6, 181, 33, 6 + unknownsfx0x20 8, 161, 2, 6 endchannel SFX_1f_23_Ch3: ; 7c99c (1f:499c) - note D_, 4 - octave 4 - note D#, 13 - note D_, 13 - notetype 6, 2, 12 - note D_, 5 - octave 4 - note D#, 13 - note D_, 9 - note B_, 8 - note F_, 13 - note D_, 16 - rest 3 - note F_, 14 + unknownnoise0x20 3, 228, 60 + unknownnoise0x20 12, 214, 44 + unknownnoise0x20 4, 228, 60 + unknownnoise0x20 8, 183, 92 + unknownnoise0x20 15, 194, 93 endchannel ; 0x7c9ac \ No newline at end of file diff --git a/music/sfx/sfx_1f_24.asm b/music/sfx/sfx_1f_24.asm index 0b08b05d..448541e6 100644 --- a/music/sfx/sfx_1f_24.asm +++ b/music/sfx/sfx_1f_24.asm @@ -1,83 +1,32 @@ SFX_1f_24_Ch1: ; 7c9ac (1f:49ac) dutycycle 201 - note D_, 9 - unknownmusic0xf7 - note G#, 1 - note C_, 7 - note D_, 3 - unknownmusic0xf7 - note F#, 1 - note C_, 7 - note D_, 2 - octave 1 - note E_, 1 - note C_, 7 - note D_, 2 - octave 1 - note D_, 1 - note C_, 7 - note D_, 16 - notetype 1, 0, 0 - note C_, 7 - note D_, 5 - rest 8 - note E_, 1 - note C_, 8 - note D_, 5 - note A#, 8 - note D#, 1 - note C_, 8 - note D_, 16 - note A_, 2 - note D_, 1 - note C_, 8 + unknownsfx0x20 8, 247, 128, 6 + unknownsfx0x20 2, 247, 96, 6 + unknownsfx0x20 1, 231, 64, 6 + unknownsfx0x20 1, 231, 32, 6 + unknownsfx0x20 15, 209, 0, 6 + unknownsfx0x20 4, 199, 64, 7 + unknownsfx0x20 4, 167, 48, 7 + unknownsfx0x20 15, 145, 32, 7 endchannel SFX_1f_24_Ch2: ; 7c9cf (1f:49cf) dutycycle 121 - note D_, 11 - octave 1 - note G#, 3 - note C_, 7 - note D_, 3 - octave 1 - note F#, 3 - note C_, 7 - note D_, 2 - notetype 7, 4, 2 - note C_, 7 - note D_, 2 - notetype 7, 2, 2 - note C_, 7 - note D_, 16 - rest 2 - note C_, 3 - note C_, 7 - note D_, 5 - note B_, 8 - note E_, 3 - note C_, 8 - note D_, 3 - note A_, 8 - note D#, 3 - note C_, 8 - note D_, 16 - note G#, 2 - note D_, 3 - note C_, 8 + unknownsfx0x20 10, 231, 130, 6 + unknownsfx0x20 2, 231, 98, 6 + unknownsfx0x20 1, 215, 66, 6 + unknownsfx0x20 1, 215, 34, 6 + unknownsfx0x20 15, 193, 2, 6 + unknownsfx0x20 4, 183, 66, 7 + unknownsfx0x20 2, 151, 50, 7 + unknownsfx0x20 15, 129, 34, 7 endchannel SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2) - note D_, 5 - note G_, 5 - note D_, 2 - note D_, 5 - note G_, 5 - note C#, 1 - note D_, 5 - note G_, 2 - note D_, 1 + unknownnoise0x20 4, 116, 33 + unknownnoise0x20 4, 116, 16 + unknownnoise0x20 4, 113, 32 endchannel ; 0x7c9fc \ No newline at end of file diff --git a/music/sfx/sfx_1f_25.asm b/music/sfx/sfx_1f_25.asm index b2794a5d..b0db2369 100644 --- a/music/sfx/sfx_1f_25.asm +++ b/music/sfx/sfx_1f_25.asm @@ -1,87 +1,35 @@ SFX_1f_25_Ch1: ; 7c888 (1f:4888) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - note A#, 1 - note C_, 8 - note D_, 9 - octave 2 - note A#, 5 - note C_, 8 - note D_, 5 - notetype 6, 10, 0 - note C_, 8 - note D_, 16 - notetype 3, 2, 0 - note C_, 8 - note D_, 9 - rest 4 - note D_, 4 - note C_, 8 - note D_, 3 - rest 3 - note D_, 9 - note C_, 8 - note D_, 9 - note B_, 2 - note D#, 1 - note C_, 8 + unknownsfx0x20 6, 247, 160, 7 + unknownsfx0x20 8, 230, 164, 7 + unknownsfx0x20 4, 214, 160, 7 + unknownsfx0x20 15, 211, 32, 7 + unknownsfx0x20 8, 195, 35, 7 + unknownsfx0x20 2, 194, 40, 7 + unknownsfx0x20 8, 177, 48, 7 endchannel SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7) dutycycle 10 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 7 - note A#, 8 - note E_, 2 - note C_, 8 - note D_, 9 - note G#, 7 - note E_, 4 - note C_, 8 - note D_, 5 - note G_, 7 - note E_, 2 - note C_, 8 - note D_, 14 - note G#, 4 - rest 3 - note C_, 7 - note D_, 8 - note G_, 4 - rest 2 - note C_, 7 - note D_, 4 - note G#, 3 - rest 13 - note C_, 7 - note D_, 9 - note G_, 2 - notetype 8, 0, 6 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 6, 167, 65, 7 + unknownsfx0x20 8, 134, 67, 7 + unknownsfx0x20 4, 118, 65, 7 + unknownsfx0x20 13, 131, 194, 6 + unknownsfx0x20 7, 115, 193, 6 + unknownsfx0x20 3, 130, 204, 6 + unknownsfx0x20 8, 113, 216, 6 endchannel SFX_1f_25_Ch3: ; 7c8ca (1f:48ca) - note D_, 3 - unknownmusic0xf2 - note E_, 13 - note D_, 7 - octave 2 - note D#, 11 - note D_, 5 - notetype 7, 3, 10 - note D_, 7 - notetype 6, 2, 12 - note D_, 9 - octave 3 - note D#, 13 - note D_, 13 - notetype 2, 3, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 230, 58 + unknownnoise0x20 4, 215, 58 + unknownnoise0x20 6, 214, 44 + unknownnoise0x20 8, 229, 60 + unknownnoise0x20 12, 210, 61 + unknownnoise0x20 8, 209, 44 endchannel ; 0x7c8e0 \ No newline at end of file diff --git a/music/sfx/sfx_1f_26.asm b/music/sfx/sfx_1f_26.asm index 5de1922b..f0b205d5 100644 --- a/music/sfx/sfx_1f_26.asm +++ b/music/sfx/sfx_1f_26.asm @@ -1,52 +1,25 @@ SFX_1f_26_Ch1: ; 7cda0 (1f:4da0) dutycycle 165 - note D_, 13 - unknownmusic0xf2 - note E_, 1 - note C_, 5 - note D_, 16 - octave 5 - note A#, 1 - note C_, 5 - note D_, 5 - notetype 2, 9, 0 - note C_, 5 - note D_, 9 - notetype 1, 8, 0 - note C_, 5 + unknownsfx0x20 12, 242, 64, 4 + unknownsfx0x20 15, 227, 160, 4 + unknownsfx0x20 4, 210, 144, 4 + unknownsfx0x20 8, 209, 128, 4 endchannel SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3) dutycycle 238 - note D_, 12 - notetype 2, 3, 8 - note C_, 5 - note D_, 15 - rest 7 - note A_, 9 - note C_, 5 - note D_, 4 - note B_, 3 - note G#, 9 - note C_, 5 - note D_, 9 - note B_, 2 - note G_, 9 - note C_, 5 + unknownsfx0x20 11, 210, 56, 4 + unknownsfx0x20 14, 198, 152, 4 + unknownsfx0x20 3, 178, 136, 4 + unknownsfx0x20 8, 177, 120, 4 endchannel SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6) - note D_, 11 - octave 2 - note F#, 13 - note D_, 16 - notetype 2, 5, 12 - note D_, 4 - rest 3 - note F#, 13 - note D_, 9 - notetype 1, 5, 12 + unknownnoise0x20 10, 230, 108 + unknownnoise0x20 15, 210, 92 + unknownnoise0x20 3, 194, 108 + unknownnoise0x20 8, 209, 92 endchannel ; 0x7cdd3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_27.asm b/music/sfx/sfx_1f_27.asm index fc1630c0..de7adafb 100644 --- a/music/sfx/sfx_1f_27.asm +++ b/music/sfx/sfx_1f_27.asm @@ -1,74 +1,31 @@ SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3) dutycycle 51 - note D_, 16 - unknownmusic0xf6 - rest 1 - note C_, 6 - note D_, 9 - octave 5 - note B_, 13 - note C_, 6 - note D_, 7 - notetype 2, 13, 0 - note C_, 6 - note D_, 7 - note B_, 3 - octave 8 - note C_, 6 - note D_, 7 - rest 3 - stereopanning 5 - note D_, 9 - note B_, 2 - note C_, 1 - note C_, 7 + unknownsfx0x20 15, 246, 192, 5 + unknownsfx0x20 8, 227, 188, 5 + unknownsfx0x20 6, 210, 208, 5 + unknownsfx0x20 6, 178, 224, 5 + unknownsfx0x20 6, 194, 240, 5 + unknownsfx0x20 8, 177, 0, 6 endchannel SFX_1f_27_Ch2: ; 7cdee (1f:4dee) dutycycle 153 - note D_, 15 - rest 7 - note B_, 2 - note C_, 5 - note D_, 8 - rest 4 - note A#, 14 - note C_, 5 - note D_, 6 - note B_, 3 - rest 2 - note C_, 5 - note D_, 9 - note A_, 3 - notetype 1, 0, 4 - note D_, 7 - note A#, 3 - octave 7 - note C_, 5 - note D_, 9 - note A_, 2 - unknownmusic0xf1 - note C_, 5 + unknownsfx0x20 14, 198, 177, 4 + unknownsfx0x20 7, 195, 173, 4 + unknownsfx0x20 5, 178, 193, 4 + unknownsfx0x20 8, 146, 209, 4 + unknownsfx0x20 6, 162, 225, 4 + unknownsfx0x20 8, 145, 241, 4 endchannel SFX_1f_27_Ch3: ; 7ce09 (1f:4e09) - note D_, 11 - octave 2 - note F_, 13 - note D_, 11 - notetype 6, 6, 12 - note D_, 5 - rest 3 - note E_, 13 - note D_, 7 - notetype 3, 5, 12 - note D_, 9 - note B_, 4 - note E_, 13 - note D_, 9 - note A#, 2 - note F_, 13 + unknownnoise0x20 10, 230, 92 + unknownnoise0x20 10, 214, 108 + unknownnoise0x20 4, 194, 76 + unknownnoise0x20 6, 211, 92 + unknownnoise0x20 8, 179, 76 + unknownnoise0x20 8, 161, 92 endchannel ; 0x7ce1c \ No newline at end of file diff --git a/music/sfx/sfx_1f_28.asm b/music/sfx/sfx_1f_28.asm index f5ea35b6..c76c94a7 100644 --- a/music/sfx/sfx_1f_28.asm +++ b/music/sfx/sfx_1f_28.asm @@ -1,44 +1,22 @@ SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c) dutycycle 240 - note D_, 9 - octave 4 - note A_, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf5 - rest 1 - note C_, 8 - note D_, 9 - notetype 1, 13, 8 - note C_, 8 + unknownsfx0x20 8, 228, 144, 7 + unknownsfx0x20 15, 245, 192, 7 + unknownsfx0x20 8, 209, 216, 7 endchannel SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b) dutycycle 165 - note D_, 11 - rest 5 - note G_, 2 - note C_, 8 - note D_, 16 - note B_, 7 - note A#, 3 - note C_, 8 - note D_, 9 - note A#, 2 - note B_, 8 - note C_, 8 + unknownsfx0x20 10, 196, 113, 7 + unknownsfx0x20 15, 182, 162, 7 + unknownsfx0x20 8, 161, 183, 7 endchannel SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a) - note D_, 9 - octave 4 - note E_, 13 - note D_, 15 - rest 5 - note D#, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 8, 228, 76 + unknownnoise0x20 14, 196, 60 + unknownnoise0x20 8, 209, 44 endchannel ; 0x7ce44 \ No newline at end of file diff --git a/music/sfx/sfx_1f_29.asm b/music/sfx/sfx_1f_29.asm index 2413f6f5..bc19ea3b 100644 --- a/music/sfx/sfx_1f_29.asm +++ b/music/sfx/sfx_1f_29.asm @@ -1,76 +1,31 @@ SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa) dutycycle 240 - note D_, 5 - unknownmusic0xf3 - note G#, 1 - note C_, 8 - note D_, 16 - octave 1 - note C_, 1 - note C_, 8 - note D_, 9 - notetype 3, 1, 0 - note C_, 8 - note D_, 5 - rest 3 - note C_, 1 - note C_, 8 - note D_, 5 - notetype 2, 15, 0 - note C_, 7 - note D_, 9 - rest 2 - octave 8 - note C_, 7 + unknownsfx0x20 4, 243, 128, 7 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 8, 211, 16, 7 + unknownsfx0x20 4, 194, 0, 7 + unknownsfx0x20 4, 210, 240, 6 + unknownsfx0x20 8, 193, 224, 6 endchannel SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5) dutycycle 90 - note D_, 7 - rest 4 - note C_, 2 - note C_, 8 - note D_, 15 - note B_, 8 - note G#, 2 - note C_, 7 - note D_, 8 - note B_, 4 - note A_, 3 - note C_, 7 - note D_, 4 - note A#, 3 - note G#, 2 - note C_, 7 - note D_, 5 - note B_, 3 - note G_, 3 - note C_, 7 - note D_, 9 - note A#, 2 - note F#, 2 - note C_, 7 + unknownsfx0x20 6, 195, 1, 7 + unknownsfx0x20 14, 183, 129, 6 + unknownsfx0x20 7, 179, 146, 6 + unknownsfx0x20 3, 162, 129, 6 + unknownsfx0x20 4, 178, 114, 6 + unknownsfx0x20 8, 161, 97, 6 endchannel SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0) - note D_, 7 - octave 5 - note F_, 13 - note D_, 15 - notetype 6, 4, 12 - note D_, 7 - rest 7 - note D#, 13 - note D_, 4 - note B_, 4 - note E_, 13 - note D_, 4 - note A#, 3 - note F_, 13 - note D_, 9 - note B_, 2 - note F#, 13 + unknownnoise0x20 6, 227, 92 + unknownnoise0x20 14, 214, 76 + unknownnoise0x20 6, 198, 60 + unknownnoise0x20 3, 179, 76 + unknownnoise0x20 3, 162, 92 + unknownnoise0x20 8, 177, 108 endchannel ; 0x7cef3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_2a.asm b/music/sfx/sfx_1f_2a.asm index 6c4af622..b91e4c2e 100644 --- a/music/sfx/sfx_1f_2a.asm +++ b/music/sfx/sfx_1f_2a.asm @@ -1,44 +1,22 @@ SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d) dutycycle 240 - note D_, 16 - notetype 7, 8, 0 - note C_, 8 - note D_, 5 - octave 2 - note A#, 1 - note C_, 8 - note D_, 16 - notetype 2, 4, 0 - note C_, 8 + unknownsfx0x20 15, 215, 128, 7 + unknownsfx0x20 4, 230, 160, 7 + unknownsfx0x20 15, 210, 64, 7 endchannel SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c) dutycycle 90 - note D_, 16 - rest 8 - note F_, 4 - note C_, 8 - note D_, 6 - note B_, 7 - note G_, 3 - note C_, 8 - note D_, 16 - rest 3 - note C#, 2 - note C_, 8 + unknownsfx0x20 15, 199, 83, 7 + unknownsfx0x20 5, 182, 114, 7 + unknownsfx0x20 15, 194, 17, 7 endchannel SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b) - note D_, 14 - unknownmusic0xf6 - note E_, 13 - note D_, 5 - octave 2 - note D#, 13 - note D_, 16 - unknownmusic0xf2 - note E_, 13 + unknownnoise0x20 13, 246, 76 + unknownnoise0x20 4, 230, 60 + unknownnoise0x20 15, 242, 76 endchannel ; 0x7cd65 \ No newline at end of file diff --git a/music/sfx/sfx_1f_2b.asm b/music/sfx/sfx_1f_2b.asm index ee606da1..da51e7c9 100644 --- a/music/sfx/sfx_1f_2b.asm +++ b/music/sfx/sfx_1f_2b.asm @@ -1,56 +1,25 @@ SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3) dutycycle 15 - note D_, 16 - unknownmusic0xf7 - note C_, 1 - note C_, 6 - note D_, 16 - octave 1 - note C_, 9 - note C_, 6 - note D_, 9 - note B_, 5 - note G#, 1 - note C_, 5 - note D_, 16 - note A#, 3 - note F#, 1 - note C_, 5 + unknownsfx0x20 15, 247, 0, 5 + unknownsfx0x20 15, 231, 8, 5 + unknownsfx0x20 8, 180, 128, 4 + unknownsfx0x20 15, 162, 96, 4 endchannel SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06) dutycycle 68 - note D_, 15 - notetype 7, 8, 1 - note C_, 5 - note D_, 15 - rest 8 - note G#, 10 - note C_, 5 - note D_, 11 - note B_, 5 - note C_, 2 - note C_, 5 - note D_, 16 - rest 3 - octave 7 - note C_, 4 + unknownsfx0x20 14, 215, 129, 4 + unknownsfx0x20 14, 199, 137, 4 + unknownsfx0x20 10, 180, 1, 4 + unknownsfx0x20 15, 194, 225, 3 endchannel SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19) - note D_, 15 - unknownmusic0xf7 - note G_, 13 - note D_, 13 - unknownmusic0xf6 - note F#, 13 - note D_, 10 - octave 4 - note G_, 13 - note D_, 16 - octave 6 - note F#, 13 + unknownnoise0x20 14, 247, 124 + unknownnoise0x20 12, 246, 108 + unknownnoise0x20 9, 228, 124 + unknownnoise0x20 15, 226, 108 endchannel ; 0x7cf26 \ No newline at end of file diff --git a/music/sfx/sfx_1f_2c.asm b/music/sfx/sfx_1f_2c.asm index d0ba9bdb..a480b584 100644 --- a/music/sfx/sfx_1f_2c.asm +++ b/music/sfx/sfx_1f_2c.asm @@ -1,90 +1,35 @@ SFX_1f_2c_Ch1: ; 7d003 (1f:5003) dutycycle 80 - note D_, 11 - unknownmusic0xf5 - note G#, 1 - note C_, 7 - note D_, 4 - octave 6 - note A#, 1 - note C_, 7 - note D_, 4 - unknownmusic0xf2 - rest 1 - note C_, 7 - note D_, 4 - octave 6 - octave 8 - note C_, 7 - note D_, 4 - notetype 2, 0, 0 - note C_, 8 - note D_, 4 - rest 3 - octave 8 - note C_, 7 - note D_, 4 - notetype 2, 12, 0 - note C_, 7 - note D_, 9 - rest 2 - note A#, 1 - note C_, 7 + unknownsfx0x20 10, 245, 128, 6 + unknownsfx0x20 3, 226, 160, 6 + unknownsfx0x20 3, 242, 192, 6 + unknownsfx0x20 3, 226, 224, 6 + unknownsfx0x20 3, 210, 0, 7 + unknownsfx0x20 3, 194, 224, 6 + unknownsfx0x20 3, 210, 192, 6 + unknownsfx0x20 8, 193, 160, 6 endchannel SFX_1f_2c_Ch2: ; 7d026 (1f:5026) dutycycle 15 - note D_, 10 - notetype 5, 3, 1 - note C_, 7 - note D_, 4 - notetype 2, 5, 2 - note C_, 7 - note D_, 4 - octave 6 - note G_, 2 - note C_, 7 - note D_, 4 - note B_, 3 - note A_, 2 - note C_, 7 - note D_, 4 - rest 3 - note B_, 3 - note C_, 7 - note D_, 4 - note B_, 3 - note A_, 2 - note C_, 7 - note D_, 4 - rest 3 - note G_, 2 - note C_, 7 - note D_, 9 - note B_, 2 - note F_, 2 - note C_, 7 + unknownsfx0x20 9, 213, 49, 6 + unknownsfx0x20 3, 210, 82, 6 + unknownsfx0x20 3, 226, 113, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 178, 6 + unknownsfx0x20 3, 178, 145, 6 + unknownsfx0x20 3, 194, 113, 6 + unknownsfx0x20 8, 177, 81, 6 endchannel SFX_1f_2c_Ch3: ; 7d049 (1f:5049) - note D_, 7 - octave 5 - note E_, 13 - note D_, 5 - rest 4 - note D#, 13 - note D_, 6 - notetype 4, 3, 12 - note D_, 5 - rest 5 - note D_, 13 - note D_, 7 - note B_, 5 - note D#, 13 - note D_, 9 - rest 2 - note D_, 13 + unknownnoise0x20 6, 227, 76 + unknownnoise0x20 4, 195, 60 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 4, 196, 44 + unknownnoise0x20 6, 180, 60 + unknownnoise0x20 8, 193, 44 endchannel ; 0x7d05c \ No newline at end of file diff --git a/music/sfx/sfx_1f_2d.asm b/music/sfx/sfx_1f_2d.asm index a639cdc4..f4c4ecd9 100644 --- a/music/sfx/sfx_1f_2d.asm +++ b/music/sfx/sfx_1f_2d.asm @@ -1,36 +1,17 @@ SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b) dutycycle 27 - note D_, 8 - notetype 2, 4, 0 - note C_, 8 - note D_, 16 - octave 3 - note F#, 1 - note C_, 8 - note D_, 16 - rest 2 - note D#, 1 - note C_, 8 + unknownsfx0x20 7, 210, 64, 7 + unknownsfx0x20 15, 229, 96, 7 + unknownsfx0x20 15, 193, 48, 7 endchannel SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a) dutycycle 129 - note D_, 3 - rest 3 - note C_, 2 - note C_, 8 - note D_, 5 - rest 3 - note C_, 9 - note C_, 8 - note D_, 16 - notetype 7, 4, 1 - note C_, 8 - note D_, 16 - note A#, 3 - note C_, 2 - note C_, 8 + unknownsfx0x20 2, 194, 1, 7 + unknownsfx0x20 4, 194, 8, 7 + unknownsfx0x20 15, 215, 65, 7 + unknownsfx0x20 15, 162, 1, 7 SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c) diff --git a/music/sfx/sfx_1f_2e.asm b/music/sfx/sfx_1f_2e.asm index 88c64279..2c72b5a1 100644 --- a/music/sfx/sfx_1f_2e.asm +++ b/music/sfx/sfx_1f_2e.asm @@ -1,74 +1,31 @@ SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - note E_, 1 - note C_, 8 - note D_, 13 - octave 2 - note E_, 5 - note C_, 8 - note D_, 7 - notetype 5, 5, 0 - note C_, 8 - note D_, 5 - rest 4 - note F#, 1 - note C_, 8 - note D_, 4 - rest 4 - note G#, 1 - note C_, 8 - note D_, 9 - notetype 1, 10, 0 - note C_, 8 + unknownsfx0x20 6, 247, 64, 7 + unknownsfx0x20 12, 230, 68, 7 + unknownsfx0x20 6, 213, 80, 7 + unknownsfx0x20 4, 195, 96, 7 + unknownsfx0x20 3, 195, 128, 7 + unknownsfx0x20 8, 209, 160, 7 endchannel SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f) dutycycle 10 - note D_, 7 - rest 8 - note C_, 2 - note C_, 8 - note D_, 12 - note B_, 7 - note C_, 3 - note C_, 8 - note D_, 7 - note A#, 6 - note C#, 2 - note C_, 8 - note D_, 5 - note A_, 4 - note D_, 2 - note C_, 8 - note D_, 4 - note A#, 4 - note E_, 2 - note C_, 8 - note D_, 9 - note A_, 2 - note F#, 3 - note C_, 8 + unknownsfx0x20 6, 199, 1, 7 + unknownsfx0x20 11, 182, 2, 7 + unknownsfx0x20 6, 165, 17, 7 + unknownsfx0x20 4, 147, 33, 7 + unknownsfx0x20 3, 163, 65, 7 + unknownsfx0x20 8, 145, 98, 7 endchannel SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa) - note D_, 4 - octave 6 - note D#, 13 - note D_, 9 - notetype 6, 4, 12 - note D_, 6 - notetype 4, 3, 12 - note D_, 13 - rest 8 - note E_, 13 - note D_, 3 - octave 6 - note D#, 13 - note D_, 9 - notetype 1, 2, 12 + unknownnoise0x20 3, 226, 60 + unknownnoise0x20 8, 214, 76 + unknownnoise0x20 5, 212, 60 + unknownnoise0x20 12, 199, 76 + unknownnoise0x20 2, 226, 60 + unknownnoise0x20 8, 209, 44 endchannel ; 0x7cfbd \ No newline at end of file diff --git a/music/sfx/sfx_1f_2f.asm b/music/sfx/sfx_1f_2f.asm index 100947ae..9b0bf71b 100644 --- a/music/sfx/sfx_1f_2f.asm +++ b/music/sfx/sfx_1f_2f.asm @@ -1,61 +1,27 @@ SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65) dutycycle 240 - note D_, 7 - unknownmusic0xf7 - rest 1 - note C_, 7 - note D_, 16 - octave 1 - note C_, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf4 - stereopanning 6 - note D_, 5 - octave 4 - octave 8 - note C_, 7 - note D_, 9 - notetype 1, 13, 0 - note C_, 7 + unknownsfx0x20 6, 247, 192, 6 + unknownsfx0x20 15, 231, 0, 7 + unknownsfx0x20 4, 244, 240, 6 + unknownsfx0x20 4, 228, 224, 6 + unknownsfx0x20 8, 209, 208, 6 endchannel SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c) dutycycle 10 - note D_, 8 - octave 2 - note G#, 2 - note C_, 7 - note D_, 15 - notetype 5, 12, 1 - note C_, 7 - note D_, 5 - rest 5 - note B_, 2 - note C_, 7 - note D_, 5 - notetype 4, 10, 1 - note C_, 7 - note D_, 9 - rest 2 - note A_, 2 - note C_, 7 + unknownsfx0x20 7, 230, 129, 6 + unknownsfx0x20 14, 213, 193, 6 + unknownsfx0x20 4, 196, 177, 6 + unknownsfx0x20 4, 212, 161, 6 + unknownsfx0x20 8, 193, 145, 6 endchannel SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93) - note D_, 11 - note A#, 7 - note D#, 13 - note D_, 15 - note A_, 5 - note D_, 13 - note D_, 6 - note A#, 4 - note D#, 13 - note D_, 9 - note A_, 2 - note D_, 13 + unknownnoise0x20 10, 166, 60 + unknownnoise0x20 14, 148, 44 + unknownnoise0x20 5, 163, 60 + unknownnoise0x20 8, 145, 44 endchannel ; 0x7cda0 \ No newline at end of file diff --git a/music/sfx/sfx_1f_30.asm b/music/sfx/sfx_1f_30.asm index 3b9c4a27..b6833986 100644 --- a/music/sfx/sfx_1f_30.asm +++ b/music/sfx/sfx_1f_30.asm @@ -1,80 +1,32 @@ SFX_1f_30_Ch1: ; 7cf26 (1f:4f26) dutycycle 245 - note D_, 8 - notetype 6, 14, 1 - note C_, 8 - note D_, 7 - rest 7 - octave 6 - note C_, 8 - note D_, 10 - notetype 6, 14, 1 - note C_, 8 - note D_, 8 - rest 7 - octave 8 - note C_, 8 - note D_, 6 - note B_, 7 - octave 6 - note C_, 8 - note D_, 8 - rest 7 - octave 7 - note C_, 8 - note D_, 7 - note B_, 7 - octave 8 - note C_, 8 - note D_, 9 - note A#, 2 - notetype 15, 0, 7 + unknownsfx0x20 7, 214, 225, 7 + unknownsfx0x20 6, 198, 226, 7 + unknownsfx0x20 9, 214, 225, 7 + unknownsfx0x20 7, 198, 224, 7 + unknownsfx0x20 5, 182, 226, 7 + unknownsfx0x20 7, 198, 225, 7 + unknownsfx0x20 6, 182, 224, 7 + unknownsfx0x20 8, 161, 223, 7 endchannel SFX_1f_30_Ch2: ; 7cf49 (1f:4f49) dutycycle 68 - note D_, 7 - rest 4 - rest 10 - note C_, 8 - note D_, 7 - note B_, 4 - rest 8 - note C_, 8 - note D_, 11 - rest 5 - rest 4 - note C_, 8 - note D_, 9 - note B_, 5 - rest 8 - note C_, 8 - note D_, 7 - rest 4 - rest 10 - note C_, 8 - note D_, 16 - note A#, 3 - rest 6 - note C_, 8 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 6, 179, 199, 7 + unknownsfx0x20 10, 196, 195, 7 + unknownsfx0x20 8, 180, 199, 7 + unknownsfx0x20 6, 195, 201, 7 + unknownsfx0x20 15, 162, 197, 7 endchannel SFX_1f_30_Ch3: ; 7cf64 (1f:4f64) - note D_, 14 - note C#, 10 - note G_, 13 - note D_, 14 - unknownmusic0xf7 - note G#, 13 - note D_, 13 - notetype 6, 7, 12 - note D_, 9 - rest 5 - note F#, 13 - note D_, 16 - note B_, 4 - note F_, 13 + unknownnoise0x20 13, 25, 124 + unknownnoise0x20 13, 247, 140 + unknownnoise0x20 12, 214, 124 + unknownnoise0x20 8, 196, 108 + unknownnoise0x20 15, 179, 92 endchannel ; 0x7cf74 \ No newline at end of file diff --git a/music/sfx/sfx_1f_31.asm b/music/sfx/sfx_1f_31.asm index f017713b..b67f3863 100644 --- a/music/sfx/sfx_1f_31.asm +++ b/music/sfx/sfx_1f_31.asm @@ -1,72 +1,30 @@ SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd) dutycycle 244 - note D_, 16 - stereopanning 5 - note C_, 8 - note D_, 11 - octave 8 - note C_, 1 - note C_, 8 - note D_, 7 - note B_, 5 - note C#, 1 - note C_, 8 - note D_, 5 - notetype 3, 0, 0 - note C_, 8 - note D_, 7 - note B_, 3 - note D_, 1 - note C_, 7 - note D_, 9 - note A#, 2 - note D_, 5 - note C_, 7 + unknownsfx0x20 15, 240, 5, 7 + unknownsfx0x20 10, 224, 0, 7 + unknownsfx0x20 6, 180, 16, 7 + unknownsfx0x20 4, 211, 0, 7 + unknownsfx0x20 6, 178, 32, 6 + unknownsfx0x20 8, 161, 36, 6 endchannel SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8) dutycycle 34 - note D_, 16 - note B_, 1 - rest 4 - note C_, 7 - note D_, 11 - note A#, 1 - rest 2 - note C_, 7 - note D_, 7 - note G#, 5 - notetype 2, 0, 6 - note D_, 5 - note A_, 4 - rest 2 - note C_, 7 - note D_, 7 - note G#, 3 - octave 7 - note C_, 6 - note D_, 9 - note F#, 2 - unknownmusic0xe8 - note C_, 6 + unknownsfx0x20 15, 176, 195, 6 + unknownsfx0x20 10, 160, 193, 6 + unknownsfx0x20 6, 132, 210, 6 + unknownsfx0x20 4, 147, 193, 6 + unknownsfx0x20 6, 130, 225, 5 + unknownsfx0x20 8, 97, 232, 5 endchannel SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3) - note D_, 7 - octave 2 - note E_, 13 - note D_, 16 - notetype 6, 3, 12 - note D_, 11 - rest 6 - note E_, 11 - note D_, 2 - note B_, 3 - note F_, 12 - note D_, 16 - rest 3 - note E_, 13 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 15, 214, 60 + unknownnoise0x20 10, 197, 74 + unknownnoise0x20 1, 178, 91 + unknownnoise0x20 15, 194, 76 endchannel ; 0x7d003 \ No newline at end of file diff --git a/music/sfx/sfx_1f_32.asm b/music/sfx/sfx_1f_32.asm index 4bf6410d..92bb6a6f 100644 --- a/music/sfx/sfx_1f_32.asm +++ b/music/sfx/sfx_1f_32.asm @@ -1,105 +1,39 @@ SFX_1f_32_Ch1: ; 7ce44 (1f:4e44) dutycycle 240 - note D_, 7 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note D_, 7 - octave 6 - note E_, 1 - note C_, 7 - note D_, 7 - notetype 2, 8, 0 - note C_, 7 - note D_, 7 - octave 6 - rest 1 - note C_, 7 - note D_, 7 - notetype 2, 0, 0 - note C_, 8 - note D_, 7 - rest 3 - note E_, 1 - note C_, 8 - note D_, 7 - note B_, 3 - note G#, 1 - note C_, 8 - note D_, 9 - note A#, 2 - rest 1 - note C_, 8 + unknownsfx0x20 6, 242, 0, 6 + unknownsfx0x20 6, 226, 64, 6 + unknownsfx0x20 6, 210, 128, 6 + unknownsfx0x20 6, 226, 192, 6 + unknownsfx0x20 6, 210, 0, 7 + unknownsfx0x20 6, 194, 64, 7 + unknownsfx0x20 6, 178, 128, 7 + unknownsfx0x20 8, 161, 192, 7 endchannel SFX_1f_32_Ch2: ; 7ce67 (1f:4e67) dutycycle 17 - note D_, 4 - note C_, 9 - note C_, 2 - note C_, 1 - note D_, 7 - rest 3 - rest 2 - note C_, 6 - note D_, 7 - note B_, 3 - note C_, 3 - note C_, 7 - note D_, 7 - note A#, 3 - note E_, 2 - note C_, 7 - note D_, 7 - note B_, 3 - note G#, 3 - note C_, 7 - note D_, 7 - note A#, 3 - rest 3 - note C_, 7 - note D_, 7 - note A_, 3 - note C_, 2 - note C_, 8 - note D_, 7 - note A#, 3 - note E_, 3 - note C_, 8 - note D_, 9 - note G#, 2 - note G#, 2 - note C_, 8 + unknownsfx0x20 3, 8, 1, 0 + unknownsfx0x20 6, 194, 193, 5 + unknownsfx0x20 6, 178, 2, 6 + unknownsfx0x20 6, 162, 65, 6 + unknownsfx0x20 6, 178, 130, 6 + unknownsfx0x20 6, 162, 194, 6 + unknownsfx0x20 6, 146, 1, 7 + unknownsfx0x20 6, 162, 66, 7 + unknownsfx0x20 8, 129, 129, 7 endchannel SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e) - note D_, 7 - note C_, 9 - note C_, 2 - note D_, 6 - octave 6 - note F_, 13 - note D_, 6 - rest 3 - note E_, 13 - note D_, 6 - notetype 2, 3, 12 - note D_, 6 - note B_, 3 - note D_, 13 - note D_, 6 - rest 3 - note C#, 13 - note D_, 6 - note A#, 3 - note C#, 12 - note D_, 6 - note A_, 3 - note C#, 11 - note D_, 9 - note G#, 2 - note C#, 9 + unknownnoise0x20 6, 8, 1 + unknownnoise0x20 5, 226, 92 + unknownnoise0x20 5, 194, 76 + unknownnoise0x20 5, 210, 60 + unknownnoise0x20 5, 178, 44 + unknownnoise0x20 5, 194, 28 + unknownnoise0x20 5, 162, 27 + unknownnoise0x20 5, 146, 26 + unknownnoise0x20 8, 129, 24 endchannel ; 0x7ceaa \ No newline at end of file diff --git a/music/sfx/sfx_1f_33.asm b/music/sfx/sfx_1f_33.asm index 7a91a221..607635c7 100644 --- a/music/sfx/sfx_1f_33.asm +++ b/music/sfx/sfx_1f_33.asm @@ -1,54 +1,25 @@ SFX_1f_33_Ch1: ; 7d05c (1f:505c) dutycycle 165 - note D_, 4 - unknownmusic0xf4 - note E_, 2 - note C_, 7 - note D_, 14 - notetype 6, 2, 1 - note C_, 8 - note D_, 9 - unknownmusic0xf4 - note C#, 10 - note C_, 8 - note D_, 9 - rest 2 - note C#, 11 - note C_, 8 + unknownsfx0x20 3, 244, 65, 6 + unknownsfx0x20 13, 214, 33, 7 + unknownsfx0x20 8, 244, 25, 7 + unknownsfx0x20 8, 193, 26, 7 endchannel SFX_1f_33_Ch2: ; 7d06f (1f:506f) dutycycle 204 - note D_, 5 - unknownmusic0xf4 - note G#, 1 - note C_, 6 - note D_, 15 - octave 2 - octave 8 - note C_, 7 - note D_, 9 - notetype 5, 13, 8 - note C_, 7 - note D_, 9 - notetype 1, 13, 12 - note C_, 7 + unknownsfx0x20 4, 244, 128, 5 + unknownsfx0x20 14, 230, 224, 6 + unknownsfx0x20 8, 213, 216, 6 + unknownsfx0x20 8, 209, 220, 6 endchannel SFX_1f_33_Ch3: ; 7d082 (1f:5082) - note D_, 6 - rest 5 - note E_, 7 - note D_, 14 - note A#, 6 - note E_, 5 - note D_, 9 - rest 5 - note E_, 6 - note D_, 9 - note B_, 2 - note E_, 5 + unknownnoise0x20 5, 196, 70 + unknownnoise0x20 13, 165, 68 + unknownnoise0x20 8, 196, 69 + unknownnoise0x20 8, 177, 68 endchannel ; 0x7d08f \ No newline at end of file diff --git a/music/sfx/sfx_1f_34.asm b/music/sfx/sfx_1f_34.asm index 3ad8af7c..59a5bd3a 100644 --- a/music/sfx/sfx_1f_34.asm +++ b/music/sfx/sfx_1f_34.asm @@ -1,53 +1,25 @@ SFX_1f_34_Ch1: ; 7d08f (1f:508f) dutycycle 240 - note D_, 14 - unknownmusic0xf1 - note C#, 2 - note C_, 6 - note D_, 14 - octave 7 - note C#, 6 - note C_, 6 - note D_, 14 - octave 7 - note C#, 2 - note C_, 6 - note D_, 9 - notetype 1, 1, 1 - note C_, 6 + unknownsfx0x20 13, 241, 17, 5 + unknownsfx0x20 13, 225, 21, 5 + unknownsfx0x20 13, 225, 17, 5 + unknownsfx0x20 8, 209, 17, 5 endchannel SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2) dutycycle 21 - note D_, 13 - octave 7 - note C_, 13 - note C_, 6 - note D_, 13 - notetype 1, 1, 0 - note C_, 6 - note D_, 15 - rest 2 - note C_, 13 - note C_, 6 - note D_, 9 - rest 2 - note C_, 11 - note C_, 6 + unknownsfx0x20 12, 225, 12, 5 + unknownsfx0x20 12, 209, 16, 5 + unknownsfx0x20 14, 193, 12, 5 + unknownsfx0x20 8, 193, 10, 5 endchannel SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5) - note D_, 15 - unknownmusic0xf2 - note F#, 6 - note D_, 14 - octave 6 - note F_, 6 - note D_, 15 - notetype 2, 5, 6 - note D_, 9 - notetype 1, 6, 6 + unknownnoise0x20 14, 242, 101 + unknownnoise0x20 13, 226, 85 + unknownnoise0x20 14, 210, 86 + unknownnoise0x20 8, 209, 102 endchannel ; 0x7d0c2 \ No newline at end of file diff --git a/music/sfx/sfx_1f_35.asm b/music/sfx/sfx_1f_35.asm index d0801f8b..10d4c3a2 100644 --- a/music/sfx/sfx_1f_35.asm +++ b/music/sfx/sfx_1f_35.asm @@ -1,69 +1,26 @@ SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2) dutycycle 27 - note D_, 4 - unknownmusic0xf3 - note F#, 5 - note C_, 6 - note D_, 3 - octave 6 - note E_, 5 - note C_, 6 - note D_, 6 - notetype 1, 2, 2 - note C_, 6 - note D_, 3 - note B_, 3 - note G#, 5 - note C_, 5 - note D_, 9 - notetype 1, 10, 2 - note C_, 5 - note D_, 4 - unknownmusic0xf3 - note D_, 5 - note C_, 6 - note D_, 5 - octave 4 - octave 4 - note C_, 5 - note D_, 9 - notetype 1, 0, 2 - note C_, 6 + unknownsfx0x20 3, 243, 100, 5 + unknownsfx0x20 2, 226, 68, 5 + unknownsfx0x20 5, 209, 34, 5 + unknownsfx0x20 2, 178, 132, 4 + unknownsfx0x20 8, 209, 162, 4 + unknownsfx0x20 3, 243, 36, 5 + unknownsfx0x20 4, 228, 228, 4 + unknownsfx0x20 8, 209, 2, 5 endchannel SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5) dutycycle 204 - note D_, 4 - notetype 3, 6, 0 - note C_, 6 - note D_, 3 - rest 3 - note E_, 1 - note C_, 6 - note D_, 6 - rest 2 - note D_, 1 - note C_, 6 - note D_, 3 - note A_, 3 - note G#, 1 - note C_, 5 - note D_, 9 - rest 2 - note A#, 1 - note C_, 5 - note D_, 4 - notetype 3, 2, 0 - note C_, 6 - note D_, 4 - rest 5 - octave 8 - note C_, 5 - note D_, 9 - rest 2 - note C_, 1 - note C_, 6 + unknownsfx0x20 3, 211, 96, 5 + unknownsfx0x20 2, 194, 64, 5 + unknownsfx0x20 5, 193, 32, 5 + unknownsfx0x20 2, 146, 128, 4 + unknownsfx0x20 8, 193, 160, 4 + unknownsfx0x20 3, 211, 32, 5 + unknownsfx0x20 3, 196, 224, 4 + unknownsfx0x20 8, 193, 0, 5 SFX_1f_35_Ch3: ; 7d107 (1f:5107) diff --git a/music/sfx/sfx_1f_36.asm b/music/sfx/sfx_1f_36.asm index a72175f2..376b5f3a 100644 --- a/music/sfx/sfx_1f_36.asm +++ b/music/sfx/sfx_1f_36.asm @@ -1,56 +1,25 @@ SFX_1f_36_Ch1: ; 7d108 (1f:5108) dutycycle 17 - note D_, 3 - note D#, 14 - note G#, 2 - note C_, 4 - note D_, 8 - unknownmusic0xf5 - note C_, 2 - note C_, 7 - note D_, 2 - rest 3 - note G#, 2 - note C_, 5 - note D_, 9 - note A_, 2 - note G#, 2 - note C_, 4 + unknownsfx0x20 2, 61, 129, 3 + unknownsfx0x20 7, 245, 1, 6 + unknownsfx0x20 1, 194, 129, 4 + unknownsfx0x20 8, 145, 129, 3 endchannel SFX_1f_36_Ch2: ; 7d11b (1f:511b) dutycycle 238 - note D_, 3 - note D#, 15 - note B_, 1 - note C_, 6 - note D_, 8 - notetype 5, 5, 13 - note C_, 8 - note D_, 2 - note B_, 3 - note B_, 1 - note C_, 7 - note D_, 9 - note F#, 2 - note B_, 1 - note C_, 6 + unknownsfx0x20 2, 62, 176, 5 + unknownsfx0x20 7, 213, 93, 7 + unknownsfx0x20 1, 178, 176, 6 + unknownsfx0x20 8, 97, 176, 5 endchannel SFX_1f_36_Ch3: ; 7d12e (1f:512e) - note D_, 3 - note A_, 3 - note E_, 10 - note D_, 8 - note B_, 6 - note D_, 10 - note D_, 2 - note A#, 3 - note D#, 10 - note D_, 9 - note A_, 2 - note E_, 10 + unknownnoise0x20 2, 146, 73 + unknownnoise0x20 7, 181, 41 + unknownnoise0x20 1, 162, 57 + unknownnoise0x20 8, 145, 73 endchannel ; 0x7d13b \ No newline at end of file diff --git a/music/sfx/sfx_1f_37.asm b/music/sfx/sfx_1f_37.asm index d7458c8e..41698fd9 100644 --- a/music/sfx/sfx_1f_37.asm +++ b/music/sfx/sfx_1f_37.asm @@ -1,59 +1,26 @@ SFX_1f_37_Ch1: ; 7c7fb (1f:47fb) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - rest 1 - note C_, 8 - note D_, 7 - octave 4 - rest 2 - note C_, 8 - note D_, 11 - unknownmusic0xf6 - rest 1 - note C_, 8 - note D_, 5 - notetype 3, 12, 2 - note C_, 8 - note D_, 9 - rest 2 - rest 1 - note C_, 8 + unknownsfx0x20 15, 247, 192, 7 + unknownsfx0x20 6, 228, 193, 7 + unknownsfx0x20 10, 246, 192, 7 + unknownsfx0x20 4, 211, 194, 7 + unknownsfx0x20 8, 193, 192, 7 endchannel SFX_1f_37_Ch2: ; 7c812 (1f:4812) dutycycle 95 - note D_, 16 - note A_, 8 - note G#, 2 - note C_, 8 - note D_, 7 - note G#, 5 - note G#, 1 - note C_, 8 - note D_, 11 - note A_, 7 - note G#, 2 - note C_, 8 - note D_, 16 - note G#, 4 - note G#, 2 - note C_, 8 + unknownsfx0x20 15, 151, 129, 7 + unknownsfx0x20 6, 132, 128, 7 + unknownsfx0x20 10, 150, 129, 7 + unknownsfx0x20 15, 131, 129, 7 endchannel SFX_1f_37_Ch3: ; 7c825 (1f:4825) - note D_, 4 - unknownmusic0xf2 - note D#, 13 - note D_, 14 - octave 2 - note D_, 13 - note D_, 16 - notetype 7, 3, 12 - note D_, 9 - rest 2 - note D_, 13 + unknownnoise0x20 3, 242, 60 + unknownnoise0x20 13, 230, 44 + unknownnoise0x20 15, 215, 60 + unknownnoise0x20 8, 193, 44 endchannel ; 0x7c832 \ No newline at end of file diff --git a/music/sfx/sfx_1f_38.asm b/music/sfx/sfx_1f_38.asm index d5c30644..885eee1f 100644 --- a/music/sfx/sfx_1f_38.asm +++ b/music/sfx/sfx_1f_38.asm @@ -1,88 +1,34 @@ SFX_1f_38_Ch1: ; 7c832 (1f:4832) dutycycle 240 - note D_, 16 - unknownmusic0xf7 - note G#, 1 - note C_, 7 - note D_, 11 - octave 2 - note G#, 5 - note C_, 7 - note D_, 16 - notetype 7, 9, 0 - note C_, 7 - note D_, 9 - notetype 5, 9, 0 - note C_, 7 - note D_, 7 - rest 5 - note G#, 9 - note C_, 7 - note D_, 6 - notetype 3, 7, 0 - note C_, 7 - note D_, 5 - notetype 3, 6, 0 - note C_, 7 - note D_, 9 - rest 2 - note E_, 1 - note C_, 7 + unknownsfx0x20 15, 247, 128, 6 + unknownsfx0x20 10, 230, 132, 6 + unknownsfx0x20 15, 215, 144, 6 + unknownsfx0x20 8, 213, 144, 6 + unknownsfx0x20 6, 196, 136, 6 + unknownsfx0x20 5, 211, 112, 6 + unknownsfx0x20 4, 211, 96, 6 + unknownsfx0x20 8, 193, 64, 6 endchannel SFX_1f_38_Ch2: ; 7c855 (1f:4855) dutycycle 5 - note D_, 16 - note B_, 8 - note E_, 2 - note C_, 7 - note D_, 11 - note A_, 7 - note E_, 3 - note C_, 7 - note D_, 16 - note A#, 8 - note F_, 2 - note C_, 7 - note D_, 9 - note A#, 6 - note F_, 2 - note C_, 7 - note D_, 7 - note A_, 5 - note E_, 8 - note C_, 7 - note D_, 6 - note A#, 4 - note D#, 2 - note C_, 7 - note D_, 5 - note A_, 4 - note D_, 3 - note C_, 7 - note D_, 9 - note G_, 2 - note C_, 2 - note C_, 7 + unknownsfx0x20 15, 183, 65, 6 + unknownsfx0x20 10, 150, 66, 6 + unknownsfx0x20 15, 167, 81, 6 + unknownsfx0x20 8, 165, 81, 6 + unknownsfx0x20 6, 148, 71, 6 + unknownsfx0x20 5, 163, 49, 6 + unknownsfx0x20 4, 147, 34, 6 + unknownsfx0x20 8, 113, 1, 6 endchannel SFX_1f_38_Ch3: ; 7c878 (1f:4878) - note D_, 16 - octave 4 - note D#, 13 - note D_, 11 - rest 8 - note E_, 13 - note D_, 11 - rest 8 - note D#, 13 - note D_, 13 - note B_, 8 - note E_, 13 - note D_, 16 - note A#, 3 - note F_, 13 + unknownnoise0x20 15, 228, 60 + unknownnoise0x20 10, 199, 76 + unknownnoise0x20 10, 199, 60 + unknownnoise0x20 12, 183, 76 + unknownnoise0x20 15, 162, 92 endchannel ; 0x7c888 \ No newline at end of file diff --git a/music/sfx/sfx_1f_39.asm b/music/sfx/sfx_1f_39.asm index aa743526..d29da9aa 100644 --- a/music/sfx/sfx_1f_39.asm +++ b/music/sfx/sfx_1f_39.asm @@ -1,63 +1,27 @@ SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0) dutycycle 165 - note D_, 7 - unknownmusic0xf4 - note E_, 1 - note C_, 8 - note D_, 16 - octave 5 - note D#, 1 - note C_, 8 - note D_, 5 - unknownmusic0xf4 - note E_, 1 - note C_, 8 - note D_, 6 - note B_, 4 - note E_, 9 - note C_, 8 - note D_, 9 - notetype 1, 5, 0 - note C_, 8 + unknownsfx0x20 6, 244, 64, 7 + unknownsfx0x20 15, 227, 48, 7 + unknownsfx0x20 4, 244, 64, 7 + unknownsfx0x20 5, 179, 72, 7 + unknownsfx0x20 8, 209, 80, 7 endchannel SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7) dutycycle 119 - note D_, 7 - rest 4 - note C#, 3 - note C_, 8 - note D_, 16 - note B_, 4 - note C_, 5 - note C_, 8 - note D_, 4 - rest 4 - note C#, 3 - note C_, 8 - note D_, 5 - rest 4 - note D_, 2 - note C_, 8 - note D_, 9 - note B_, 2 - note D#, 3 - note C_, 8 + unknownsfx0x20 6, 195, 18, 7 + unknownsfx0x20 15, 179, 4, 7 + unknownsfx0x20 3, 195, 18, 7 + unknownsfx0x20 4, 195, 33, 7 + unknownsfx0x20 8, 177, 50, 7 endchannel SFX_1f_39_Ch3: ; 7c90e (1f:490e) - note D_, 9 - notetype 6, 2, 12 - note D_, 13 - rest 7 - note D#, 13 - note D_, 11 - note B_, 7 - note D_, 13 - note D_, 9 - note A_, 2 - note C#, 13 + unknownnoise0x20 8, 214, 44 + unknownnoise0x20 12, 198, 60 + unknownnoise0x20 10, 182, 44 + unknownnoise0x20 8, 145, 28 endchannel ; 0x7c91b \ No newline at end of file diff --git a/music/sfx/sfx_1f_3a.asm b/music/sfx/sfx_1f_3a.asm index 79c8d05e..2f7f3045 100644 --- a/music/sfx/sfx_1f_3a.asm +++ b/music/sfx/sfx_1f_3a.asm @@ -1,10 +1,10 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 vibrato 6, 2, 6 duty 2 - unknownmusic0xe8 + togglecall notetype 4, 11, 1 octave 3 note G#, 2 @@ -17,7 +17,7 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850) SFX_1f_3a_Ch2: ; 7e867 (1f:6867) - unknownmusic0xf8 + executemusic vibrato 8, 2, 7 duty 2 notetype 4, 12, 1 @@ -31,7 +31,7 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867) SFX_1f_3a_Ch3: ; 7e877 (1f:6877) - unknownmusic0xf8 + executemusic notetype 4, 1, 0 octave 4 note B_, 1 diff --git a/music/sfx/sfx_1f_3b.asm b/music/sfx/sfx_1f_3b.asm index b3bc0995..a167d4cf 100644 --- a/music/sfx/sfx_1f_3b.asm +++ b/music/sfx/sfx_1f_3b.asm @@ -1,9 +1,9 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 5, 11, 4 octave 4 note D_, 4 @@ -26,7 +26,7 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) - unknownmusic0xf8 + executemusic vibrato 8, 2, 7 duty 2 notetype 5, 12, 5 @@ -47,7 +47,7 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 5 note F_, 4 diff --git a/music/sfx/sfx_1f_3c.asm b/music/sfx/sfx_1f_3c.asm index f12b718c..fb476203 100644 --- a/music/sfx/sfx_1f_3c.asm +++ b/music/sfx/sfx_1f_3c.asm @@ -1,18 +1,9 @@ SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3) duty 2 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 3 - note C#, 1 - note D_, 3 - note D_, 9 - octave 6 - note C_, 1 - note C_, 3 - note C#, 1 - note C_, 9 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 2 + unknownsfx0x10 34 + unknownsfx0x20 8, 226, 0, 2 + unknownsfx0x10 8 endchannel ; 0x7c404 \ No newline at end of file diff --git a/music/sfx/sfx_1f_3d.asm b/music/sfx/sfx_1f_3d.asm index bd1d9407..f7acd76f 100644 --- a/music/sfx/sfx_1f_3d.asm +++ b/music/sfx/sfx_1f_3d.asm @@ -1,15 +1,8 @@ SFX_1f_3d_Ch1: ; 7c490 (1f:4490) duty 2 - note C#, 1 - note C#, 8 - note D_, 16 - stereopanning 240 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 endchannel ; 0x7c49f \ No newline at end of file diff --git a/music/sfx/sfx_1f_3e.asm b/music/sfx/sfx_1f_3e.asm index ea9a7423..411b544d 100644 --- a/music/sfx/sfx_1f_3e.asm +++ b/music/sfx/sfx_1f_3e.asm @@ -1,22 +1,10 @@ SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2) duty 2 - note C#, 1 - note C#, 5 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note C#, 1 - note C#, 8 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x20 4, 242, 0, 6 + unknownsfx0x10 23 + unknownsfx0x20 15, 242, 0, 6 + unknownsfx0x10 8 endchannel ; 0x7c4c7 \ No newline at end of file diff --git a/music/sfx/sfx_1f_3f.asm b/music/sfx/sfx_1f_3f.asm index 70dc34bb..de7a44cf 100644 --- a/music/sfx/sfx_1f_3f.asm +++ b/music/sfx/sfx_1f_3f.asm @@ -1,9 +1,5 @@ SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3) - note D_, 2 - octave 6 - note D#, 4 - note D_, 9 - octave 7 - note D_, 3 + unknownnoise0x20 1, 226, 51 + unknownnoise0x20 8, 225, 34 endchannel ; 0x7c3ca \ No newline at end of file diff --git a/music/sfx/sfx_1f_40.asm b/music/sfx/sfx_1f_40.asm index 62dd00c7..216bd569 100644 --- a/music/sfx/sfx_1f_40.asm +++ b/music/sfx/sfx_1f_40.asm @@ -1,18 +1,8 @@ SFX_1f_40_Ch1: ; 7c44b (1f:444b) duty 2 - note D_, 1 - note A_, 2 - rest 1 - note C_, 8 - note D_, 1 - note G#, 2 - notetype 0, 0, 7 - note D_, 1 - note A_, 2 - rest 1 - note C_, 8 - note D_, 13 - note A#, 2 - notetype 0, 0, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 0, 129, 208, 7 + unknownsfx0x20 0, 145, 192, 7 + unknownsfx0x20 12, 161, 208, 7 endchannel ; 0x7c45e \ No newline at end of file diff --git a/music/sfx/sfx_1f_41.asm b/music/sfx/sfx_1f_41.asm index e67c1822..62153990 100644 --- a/music/sfx/sfx_1f_41.asm +++ b/music/sfx/sfx_1f_41.asm @@ -1,5 +1,5 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 @@ -22,7 +22,7 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda) SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) - unknownmusic0xf8 + executemusic duty 2 notetype 5, 12, 2 octave 5 @@ -45,7 +45,7 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 5 note C_, 1 diff --git a/music/sfx/sfx_1f_42.asm b/music/sfx/sfx_1f_42.asm index cc272f6a..c0805196 100644 --- a/music/sfx/sfx_1f_42.asm +++ b/music/sfx/sfx_1f_42.asm @@ -1,9 +1,9 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) - unknownmusic0xf8 + executemusic tempo 1, 0 stereopanning 119 duty 2 - unknownmusic0xe8 + togglecall notetype 5, 10, 4 octave 3 note A#, 4 @@ -24,7 +24,7 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) - unknownmusic0xf8 + executemusic vibrato 4, 2, 3 duty 2 notetype 5, 13, 1 @@ -48,7 +48,7 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) - unknownmusic0xf8 + executemusic notetype 5, 1, 0 octave 4 note D#, 4 diff --git a/music/sfx/sfx_1f_43.asm b/music/sfx/sfx_1f_43.asm index 21452283..59b7339c 100644 --- a/music/sfx/sfx_1f_43.asm +++ b/music/sfx/sfx_1f_43.asm @@ -1,17 +1,9 @@ SFX_1f_43_Ch1: ; 7c49f (1f:449f) duty 0 - note C#, 1 - note C#, 5 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 7 + unknownsfx0x10 20 + unknownsfx0x20 4, 242, 0, 6 loopchannel 4, SFX_1f_43_Ch1 - note D_, 16 - unknownmusic0xf3 - note C_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x20 15, 243, 0, 6 + unknownsfx0x10 8 endchannel ; 0x7c4b2 \ No newline at end of file diff --git a/music/sfx/sfx_1f_44.asm b/music/sfx/sfx_1f_44.asm index 900aaf7e..bc2ff935 100644 --- a/music/sfx/sfx_1f_44.asm +++ b/music/sfx/sfx_1f_44.asm @@ -1,15 +1,8 @@ SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7) duty 2 - note C#, 1 - note C#, 6 - note D_, 16 - stereopanning 240 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note F_, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 21 + unknownsfx0x20 15, 240, 240, 4 + unknownsfx0x20 15, 242, 80, 6 + unknownsfx0x10 8 endchannel ; 0x7c4d6 \ No newline at end of file diff --git a/music/sfx/sfx_1f_45.asm b/music/sfx/sfx_1f_45.asm index 4f680aae..c2f734ad 100644 --- a/music/sfx/sfx_1f_45.asm +++ b/music/sfx/sfx_1f_45.asm @@ -1,48 +1,15 @@ SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6) duty 2 - note D_, 16 - unknownmusic0xf2 - rest 1 - note C_, 8 - note D_, 16 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 4 - note G#, 2 - note G#, 1 - note C_, 8 - note D_, 4 - note G#, 2 - note C_, 1 - note C_, 8 - note D_, 4 - note G#, 2 - note E_, 1 - note C_, 8 - note D_, 4 - note G#, 2 - note C_, 1 - note C_, 8 - note D_, 4 - note G#, 2 - note G#, 1 - note C_, 8 - note D_, 4 - note G#, 2 - note C_, 1 - note C_, 8 - note D_, 4 - note G#, 2 - rest 1 - note C_, 8 - note D_, 4 - note G#, 2 - note C_, 1 - note C_, 8 + unknownsfx0x20 15, 242, 192, 7 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 15, 0, 0, 0 + unknownsfx0x20 3, 129, 128, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 64, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 128, 7 + unknownsfx0x20 3, 129, 0, 7 + unknownsfx0x20 3, 129, 192, 7 + unknownsfx0x20 3, 129, 0, 7 endchannel ; 0x7c505 \ No newline at end of file diff --git a/music/sfx/sfx_1f_46.asm b/music/sfx/sfx_1f_46.asm index 83701e7a..4e9026b7 100644 --- a/music/sfx/sfx_1f_46.asm +++ b/music/sfx/sfx_1f_46.asm @@ -1,17 +1,8 @@ SFX_1f_46_Ch1: ; 7c505 (1f:4505) duty 2 - note D_, 5 - stereopanning 0 - note C_, 7 - note D_, 5 - stereopanning 0 - note C_, 5 - note D_, 5 - stereopanning 0 - note C_, 3 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 240, 0, 6 + unknownsfx0x20 4, 240, 0, 4 + unknownsfx0x20 4, 240, 0, 2 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x7c518 \ No newline at end of file diff --git a/music/sfx/sfx_1f_47.asm b/music/sfx/sfx_1f_47.asm index 3a8e9f26..f56c49b7 100644 --- a/music/sfx/sfx_1f_47.asm +++ b/music/sfx/sfx_1f_47.asm @@ -1,18 +1,8 @@ SFX_1f_47_Ch1: ; 7c518 (1f:4518) duty 2 - note D_, 5 - stereopanning 0 - note C_, 8 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 5 - stereopanning 0 - note C_, 8 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 240, 0, 7 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 4, 240, 0, 7 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x7c52b \ No newline at end of file diff --git a/music/sfx/sfx_1f_48.asm b/music/sfx/sfx_1f_48.asm index a4da65dd..c46af22b 100644 --- a/music/sfx/sfx_1f_48.asm +++ b/music/sfx/sfx_1f_48.asm @@ -1,27 +1,11 @@ SFX_1f_48_Ch1: ; 7c52b (1f:452b) duty 1 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 7, 0, 0 - note C_, 7 - note D_, 16 - note B_, 8 - note G#, 1 - note C_, 6 - note D_, 16 - note G#, 8 - note C_, 1 - note C_, 6 - note D_, 16 - note E_, 8 - note G#, 1 - note C_, 5 - note D_, 16 - note C#, 8 - note C_, 1 - note C_, 5 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 6 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 5 + unknownsfx0x20 15, 71, 128, 4 + unknownsfx0x20 15, 23, 0, 4 + unknownsfx0x10 8 endchannel ; 0x7c546 \ No newline at end of file diff --git a/music/sfx/sfx_1f_49.asm b/music/sfx/sfx_1f_49.asm index e63212a6..0f20dcd3 100644 --- a/music/sfx/sfx_1f_49.asm +++ b/music/sfx/sfx_1f_49.asm @@ -1,24 +1,9 @@ SFX_1f_49_Ch1: ; 7c546 (1f:4546) duty 2 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 3 - unknownmusic0xf1 - note G#, 1 - note C_, 7 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 2, 241, 128, 6 + unknownsfx0x20 1, 0, 0, 0 + unknownsfx0x20 4, 241, 128, 7 + unknownsfx0x20 4, 0, 0, 0 endchannel ; 0x7c55d \ No newline at end of file diff --git a/music/sfx/sfx_1f_4a.asm b/music/sfx/sfx_1f_4a.asm index 52dfd63d..c0d8324b 100644 --- a/music/sfx/sfx_1f_4a.asm +++ b/music/sfx/sfx_1f_4a.asm @@ -1,22 +1,10 @@ SFX_1f_4a_Ch1: ; 7c55d (1f:455d) duty 2 - note C#, 1 - note D_, 13 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 6 - note C#, 1 - note D_, 3 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 6 - note C#, 1 - note C_, 9 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x10 44 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 2, 241, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x7c572 \ No newline at end of file diff --git a/music/sfx/sfx_1f_4b.asm b/music/sfx/sfx_1f_4b.asm index af22d0db..c4d33187 100644 --- a/music/sfx/sfx_1f_4b.asm +++ b/music/sfx/sfx_1f_4b.asm @@ -1,27 +1,11 @@ SFX_1f_4b_Ch1: ; 7c572 (1f:4572) duty 1 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 7, 0, 0 - note C_, 6 - note D_, 16 - note B_, 8 - note G#, 1 - note C_, 6 - note D_, 16 - note G#, 8 - note C_, 1 - note C_, 7 - note D_, 16 - note E_, 8 - note G#, 1 - note C_, 7 - note D_, 16 - note C#, 8 - note C_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 5 + unknownsfx0x20 15, 183, 128, 5 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 6 + unknownsfx0x20 15, 23, 0, 7 + unknownsfx0x10 8 endchannel ; 0x7c58d \ No newline at end of file diff --git a/music/sfx/sfx_1f_4c.asm b/music/sfx/sfx_1f_4c.asm index 084f295c..811d4bc7 100644 --- a/music/sfx/sfx_1f_4c.asm +++ b/music/sfx/sfx_1f_4c.asm @@ -1,27 +1,11 @@ SFX_1f_4c_Ch1: ; 7c58d (1f:458d) duty 1 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 7, 0, 0 - note C_, 8 - note D_, 16 - note B_, 8 - note G#, 1 - note C_, 7 - note D_, 16 - note G#, 8 - note C_, 1 - note C_, 7 - note D_, 16 - note E_, 8 - note G#, 1 - note C_, 6 - note D_, 16 - note C#, 8 - note C_, 1 - note C_, 6 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 215, 0, 7 + unknownsfx0x20 15, 183, 128, 6 + unknownsfx0x20 15, 135, 0, 6 + unknownsfx0x20 15, 71, 128, 5 + unknownsfx0x20 15, 23, 0, 5 + unknownsfx0x10 8 endchannel ; 0x7c5a8 \ No newline at end of file diff --git a/music/sfx/sfx_1f_4d.asm b/music/sfx/sfx_1f_4d.asm index fdbd0a95..8dcb0a8b 100644 --- a/music/sfx/sfx_1f_4d.asm +++ b/music/sfx/sfx_1f_4d.asm @@ -1,11 +1,7 @@ SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8) duty 1 - note C#, 1 - note C#, 7 - note D_, 16 - notetype 2, 0, 0 - note C_, 6 - note C#, 1 - note C_, 9 + unknownsfx0x10 22 + unknownsfx0x20 15, 210, 0, 5 + unknownsfx0x10 8 endchannel ; 0x7c5b3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_4e.asm b/music/sfx/sfx_1f_4e.asm index b39834ea..92f1a396 100644 --- a/music/sfx/sfx_1f_4e.asm +++ b/music/sfx/sfx_1f_4e.asm @@ -1,12 +1,7 @@ SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3) duty 2 - note C#, 1 - note A_, 6 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 5 - note C#, 1 - note C_, 9 + unknownsfx0x10 149 + unknownsfx0x20 15, 242, 0, 4 + unknownsfx0x10 8 endchannel ; 0x7c5be \ No newline at end of file diff --git a/music/sfx/sfx_1f_4f.asm b/music/sfx/sfx_1f_4f.asm index 2ec679fc..aab678ab 100644 --- a/music/sfx/sfx_1f_4f.asm +++ b/music/sfx/sfx_1f_4f.asm @@ -1,15 +1,7 @@ SFX_1f_4f_Ch1: ; 7c5be (1f:45be) - note D_, 3 - unknownmusic0xf1 - note D#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - unknownmusic0xf1 - note D_, 3 - note D_, 2 - note C_, 1 - note C_, 1 + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 241, 34 + unknownnoise0x20 1, 0, 0 endchannel ; 0x7c5cb \ No newline at end of file diff --git a/music/sfx/sfx_1f_50.asm b/music/sfx/sfx_1f_50.asm index 70e308a9..fba01b43 100644 --- a/music/sfx/sfx_1f_50.asm +++ b/music/sfx/sfx_1f_50.asm @@ -1,50 +1,19 @@ SFX_1f_50_Ch1: ; 7c5cb (1f:45cb) - note D_, 3 - unknownmusic0xf1 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note A#, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - notetype 1, 1, 2 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note G#, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note B_, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note F#, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note A_, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 - note D_, 3 - note E_, 2 - note C#, 3 - note D_, 3 - note C_, 1 - note C_, 1 + unknownnoise0x20 2, 241, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 161, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 209, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 129, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 177, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 97, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 145, 18 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 2, 65, 18 + unknownnoise0x20 2, 0, 0 endchannel ; 0x7c5fc \ No newline at end of file diff --git a/music/sfx/sfx_1f_51.asm b/music/sfx/sfx_1f_51.asm index 2895359f..4df2d1d8 100644 --- a/music/sfx/sfx_1f_51.asm +++ b/music/sfx/sfx_1f_51.asm @@ -1,41 +1,19 @@ SFX_1f_51_Ch1: ; 7c5fc (1f:45fc) duty 3 - note C#, 1 - note F_, 11 - note D_, 5 - stereopanning 0 - note C_, 6 - note C#, 1 - note C_, 9 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x10 90 + unknownsfx0x20 4, 240, 0, 5 + unknownsfx0x10 8 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 1, 0, 0, 0 endchannel SFX_1f_51_Ch2: ; 7c613 (1f:4613) duty 3 - note D_, 5 - stereopanning 1 - note C_, 5 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 1 - note C_, 5 - note D_, 2 - note C_, 1 - note C_, 1 - note C_, 1 + unknownsfx0x20 4, 240, 1, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 1, 4 + unknownsfx0x20 1, 0, 0, 0 endchannel ; 0x7c626 \ No newline at end of file diff --git a/music/sfx/sfx_1f_52.asm b/music/sfx/sfx_1f_52.asm index c5f14683..6fa9eaa2 100644 --- a/music/sfx/sfx_1f_52.asm +++ b/music/sfx/sfx_1f_52.asm @@ -1,11 +1,7 @@ SFX_1f_52_Ch1: ; 7c626 (1f:4626) duty 0 - note C#, 1 - note C#, 8 - note D_, 16 - notetype 2, 0, 0 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 23 + unknownsfx0x20 15, 210, 0, 7 + unknownsfx0x10 8 endchannel ; 0x7c631 \ No newline at end of file diff --git a/music/sfx/sfx_1f_53.asm b/music/sfx/sfx_1f_53.asm index 54ca6272..86e7ce4a 100644 --- a/music/sfx/sfx_1f_53.asm +++ b/music/sfx/sfx_1f_53.asm @@ -1,27 +1,11 @@ SFX_1f_53_Ch1: ; 7c631 (1f:4631) - note D_, 5 - note A#, 3 - note D_, 4 - note D_, 9 - unknownmusic0xf1 - note D#, 5 - note D_, 16 - note C_, 1 - note C_, 1 - note D_, 3 - unknownmusic0xf7 - note D_, 5 - note D_, 3 - unknownmusic0xf7 - note D#, 5 - note D_, 5 - unknownmusic0xf7 - note E_, 5 - note D_, 9 - unknownmusic0xf4 - note F_, 6 - note D_, 9 - unknownmusic0xf1 - note E_, 5 + unknownnoise0x20 4, 162, 35 + unknownnoise0x20 8, 241, 52 + unknownnoise0x20 15, 0, 0 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 endchannel ; 0x7c64a \ No newline at end of file diff --git a/music/sfx/sfx_1f_54.asm b/music/sfx/sfx_1f_54.asm index fc25f31f..acdc3da5 100644 --- a/music/sfx/sfx_1f_54.asm +++ b/music/sfx/sfx_1f_54.asm @@ -1,55 +1,23 @@ SFX_1f_54_Ch1: ; 7c64a (1f:464a) duty 2 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - stereopanning 0 - note C_, 6 - note D_, 16 - unknownmusic0xf2 - note C_, 1 - note C_, 6 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 240, 0, 5 + unknownsfx0x20 15, 242, 0, 5 endchannel SFX_1f_54_Ch2: ; 7c669 (1f:4669) duty 3 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 5 - note C_, 1 - note C_, 1 - note C_, 1 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - stereopanning 130 - note C_, 5 - note D_, 16 - unknownmusic0xf2 - note G#, 3 - note C_, 5 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 4, 0, 0, 0 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 240, 130, 4 + unknownsfx0x20 15, 242, 130, 4 endchannel ; 0x7c688 \ No newline at end of file diff --git a/music/sfx/sfx_1f_55.asm b/music/sfx/sfx_1f_55.asm index 64f93bdd..9a27c885 100644 --- a/music/sfx/sfx_1f_55.asm +++ b/music/sfx/sfx_1f_55.asm @@ -1,30 +1,13 @@ SFX_1f_55_Ch1: ; 7c688 (1f:4688) duty 1 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 6 - note C#, 1 - note D_, 3 - note D_, 5 - octave 6 - note C_, 1 - note C_, 6 - note C#, 1 - note D#, 11 - note D_, 5 - unknownmusic0xf2 - note C_, 1 - note C_, 8 - note C#, 1 - note D_, 3 - note D_, 16 - octave 6 - note C_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 5 + unknownsfx0x10 34 + unknownsfx0x20 4, 226, 0, 5 + unknownsfx0x10 58 + unknownsfx0x20 4, 242, 0, 7 + unknownsfx0x10 34 + unknownsfx0x20 15, 226, 0, 7 + unknownsfx0x10 8 endchannel ; 0x7c6a5 \ No newline at end of file diff --git a/music/sfx/sfx_1f_56.asm b/music/sfx/sfx_1f_56.asm index 0b48e787..77624440 100644 --- a/music/sfx/sfx_1f_56.asm +++ b/music/sfx/sfx_1f_56.asm @@ -1,18 +1,8 @@ SFX_1f_56_Ch1: ; 7c3ca (1f:43ca) - note D_, 3 - unknownmusic0xf7 - note D_, 5 - note D_, 3 - unknownmusic0xf7 - note D#, 5 - note D_, 5 - unknownmusic0xf7 - note E_, 5 - note D_, 9 - unknownmusic0xf4 - note F_, 6 - note D_, 9 - unknownmusic0xf1 - note E_, 5 + unknownnoise0x20 2, 247, 36 + unknownnoise0x20 2, 247, 52 + unknownnoise0x20 4, 247, 68 + unknownnoise0x20 8, 244, 85 + unknownnoise0x20 8, 241, 68 endchannel ; 0x7c3da \ No newline at end of file diff --git a/music/sfx/sfx_1f_57.asm b/music/sfx/sfx_1f_57.asm index 24baf670..36880103 100644 --- a/music/sfx/sfx_1f_57.asm +++ b/music/sfx/sfx_1f_57.asm @@ -1,8 +1,5 @@ SFX_1f_57_Ch1: ; 7c3da (1f:43da) - note D_, 10 - unknownmusic0xf1 - note E_, 5 - note D_, 9 - notetype 1, 4, 3 + unknownnoise0x20 9, 241, 68 + unknownnoise0x20 8, 209, 67 endchannel ; 0x7c3e1 \ No newline at end of file diff --git a/music/sfx/sfx_1f_58.asm b/music/sfx/sfx_1f_58.asm index 3a380d0c..ac61fe40 100644 --- a/music/sfx/sfx_1f_58.asm +++ b/music/sfx/sfx_1f_58.asm @@ -1,21 +1,12 @@ SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1) duty 2 - note D_, 9 - octave 7 - note E_, 1 - note C_, 8 + unknownsfx0x20 8, 225, 64, 7 endchannel SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8) duty 2 - note D_, 3 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 9 - note B_, 2 - note E_, 2 - note C_, 8 + unknownsfx0x20 2, 8, 0, 0 + unknownsfx0x20 8, 177, 65, 7 endchannel ; 0x7c3f3 \ No newline at end of file diff --git a/music/sfx/sfx_1f_59.asm b/music/sfx/sfx_1f_59.asm index 72011aaf..a50d05c0 100644 --- a/music/sfx/sfx_1f_59.asm +++ b/music/sfx/sfx_1f_59.asm @@ -1,21 +1,12 @@ SFX_1f_59_Ch1: ; 7c404 (1f:4404) duty 2 - note D_, 5 - unknownmusic0xf1 - note G#, 1 - note C_, 8 + unknownsfx0x20 4, 241, 128, 7 endchannel SFX_1f_59_Ch2: ; 7c40b (1f:440b) duty 2 - note D_, 2 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - note A#, 2 - note F#, 2 - note C_, 8 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 161, 97, 7 endchannel ; 0x7c416 \ No newline at end of file diff --git a/music/sfx/sfx_1f_5a.asm b/music/sfx/sfx_1f_5a.asm index 163f34ad..8c050129 100644 --- a/music/sfx/sfx_1f_5a.asm +++ b/music/sfx/sfx_1f_5a.asm @@ -1,29 +1,14 @@ SFX_1f_5a_Ch1: ; 7c416 (1f:4416) duty 2 - note D_, 5 - octave 7 - note C_, 1 - note C_, 8 - note D_, 9 - unknownmusic0xf2 - octave 8 - note C_, 8 + unknownsfx0x20 4, 225, 0, 7 + unknownsfx0x20 8, 242, 224, 7 endchannel SFX_1f_5a_Ch2: ; 7c421 (1f:4421) duty 2 - note D_, 2 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 5 - note A_, 2 - rest 2 - note C_, 7 - note D_, 9 - note A#, 3 - note A#, 2 - note C_, 8 + unknownsfx0x20 1, 8, 0, 0 + unknownsfx0x20 4, 145, 193, 6 + unknownsfx0x20 8, 162, 161, 7 endchannel ; 0x7c430 \ No newline at end of file diff --git a/music/sfx/sfx_1f_5b.asm b/music/sfx/sfx_1f_5b.asm index be300957..771aa496 100644 --- a/music/sfx/sfx_1f_5b.asm +++ b/music/sfx/sfx_1f_5b.asm @@ -1,12 +1,7 @@ SFX_1f_5b_Ch1: ; 7c430 (1f:4430) duty 2 - note C#, 1 - note F_, 11 - note D_, 16 - unknownmusic0xf1 - note C_, 1 - note C_, 4 - note C#, 1 - note C_, 9 + unknownsfx0x10 90 + unknownsfx0x20 15, 241, 0, 3 + unknownsfx0x10 8 endchannel ; 0x7c43b \ No newline at end of file diff --git a/music/sfx/sfx_1f_5c.asm b/music/sfx/sfx_1f_5c.asm index 4bfc9926..8ac03d9c 100644 --- a/music/sfx/sfx_1f_5c.asm +++ b/music/sfx/sfx_1f_5c.asm @@ -1,18 +1,8 @@ SFX_1f_5c_Ch1: ; 7c43b (1f:443b) - note D_, 3 - unknownmusic0xf1 - note F_, 5 - note D_, 13 - note G_, 2 - note D_, 4 - note D_, 3 - note B_, 2 - note F_, 5 - note D_, 13 - note F#, 2 - note D_, 4 - note D_, 7 - note E_, 2 - note F_, 5 + unknownnoise0x20 2, 241, 84 + unknownnoise0x20 12, 113, 35 + unknownnoise0x20 2, 177, 84 + unknownnoise0x20 12, 97, 35 + unknownnoise0x20 6, 65, 84 endchannel ; 0x7c44b \ No newline at end of file diff --git a/music/sfx/sfx_1f_5d.asm b/music/sfx/sfx_1f_5d.asm index 61b3c087..f8ce8d23 100644 --- a/music/sfx/sfx_1f_5d.asm +++ b/music/sfx/sfx_1f_5d.asm @@ -1,52 +1,20 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e) duty 2 - note D_, 5 - unknownmusic0xf4 - note C_, 1 - note C_, 8 - note D_, 4 - octave 4 - note G#, 1 - note C_, 7 - note D_, 4 - octave 4 - rest 1 - note C_, 7 - note D_, 4 - octave 4 - note C_, 1 - note C_, 8 - note D_, 3 - octave 4 - note A#, 1 - note C_, 8 + unknownsfx0x20 4, 244, 0, 7 + unknownsfx0x20 3, 228, 128, 6 + unknownsfx0x20 3, 228, 192, 6 + unknownsfx0x20 3, 228, 0, 7 + unknownsfx0x20 2, 228, 160, 7 endchannel SFX_1f_5d_Ch2: ; 7c475 (1f:4475) duty 2 - note D_, 5 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 4 - notetype 4, 0, 1 - note C_, 8 - note D_, 4 - rest 5 - note G#, 2 - note C_, 7 - note D_, 4 - rest 5 - rest 2 - note C_, 7 - note D_, 4 - rest 5 - note C_, 2 - note C_, 8 - note D_, 3 - rest 5 - note A#, 2 - note C_, 8 + unknownsfx0x20 4, 8, 0, 0 + unknownsfx0x20 3, 212, 1, 7 + unknownsfx0x20 3, 196, 129, 6 + unknownsfx0x20 3, 196, 193, 6 + unknownsfx0x20 3, 196, 1, 7 + unknownsfx0x20 2, 196, 161, 7 endchannel ; 0x7c490 \ No newline at end of file diff --git a/music/sfx/sfx_1f_5e.asm b/music/sfx/sfx_1f_5e.asm index 6fd59553..e6bbaa64 100644 --- a/music/sfx/sfx_1f_5e.asm +++ b/music/sfx/sfx_1f_5e.asm @@ -1,26 +1,11 @@ SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5) - note D_, 7 - note D_, 1 - note C#, 1 - note D_, 7 - note D_, 16 - note E_, 1 - note D_, 7 - note E_, 16 - note E_, 2 - note D_, 7 - note G#, 16 - note E_, 2 - note D_, 7 - rest 16 - note E_, 3 - note D_, 9 - notetype 7, 4, 2 - note D_, 16 - octave 1 - note E_, 4 - note D_, 16 - unknownmusic0xf2 - note E_, 4 + unknownnoise0x20 6, 32, 16 + unknownnoise0x20 6, 47, 64 + unknownnoise0x20 6, 79, 65 + unknownnoise0x20 6, 143, 65 + unknownnoise0x20 6, 207, 66 + unknownnoise0x20 8, 215, 66 + unknownnoise0x20 15, 231, 67 + unknownnoise0x20 15, 242, 67 endchannel ; 0x7c6be \ No newline at end of file diff --git a/music/sfx/sfx_1f_5f.asm b/music/sfx/sfx_1f_5f.asm index 141ef445..7ae72e98 100644 --- a/music/sfx/sfx_1f_5f.asm +++ b/music/sfx/sfx_1f_5f.asm @@ -1,12 +1,7 @@ SFX_1f_5f_Ch1: ; 7c6be (1f:46be) duty 2 - note C#, 1 - note D_, 7 - note D_, 13 - rest 3 - note E_, 1 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 38 + unknownsfx0x20 12, 194, 64, 7 + unknownsfx0x10 8 endchannel ; 0x7c6c9 \ No newline at end of file diff --git a/music/sfx/sfx_1f_60.asm b/music/sfx/sfx_1f_60.asm index d7ed4ef8..3f098eeb 100644 --- a/music/sfx/sfx_1f_60.asm +++ b/music/sfx/sfx_1f_60.asm @@ -1,12 +1,7 @@ SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9) duty 2 - note C#, 1 - note D_, 7 - note D_, 13 - rest 3 - note G#, 1 - note C_, 7 - note C#, 1 - note C_, 9 + unknownsfx0x10 38 + unknownsfx0x20 12, 194, 128, 6 + unknownsfx0x10 8 endchannel ; 0x7c6d4 \ No newline at end of file diff --git a/music/sfx/sfx_1f_61.asm b/music/sfx/sfx_1f_61.asm index 4734cda7..745ce3a4 100644 --- a/music/sfx/sfx_1f_61.asm +++ b/music/sfx/sfx_1f_61.asm @@ -1,12 +1,6 @@ SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4) - note D_, 3 - note F#, 16 - note D_, 2 - note D_, 3 - note A#, 16 - note D#, 2 - note D_, 16 - unknownmusic0xf2 - note E_, 2 + unknownnoise0x20 2, 111, 33 + unknownnoise0x20 2, 175, 49 + unknownnoise0x20 15, 242, 65 endchannel ; 0x7c6de \ No newline at end of file diff --git a/music/sfx/sfx_1f_62.asm b/music/sfx/sfx_1f_62.asm index 7e044edb..71be0e5d 100644 --- a/music/sfx/sfx_1f_62.asm +++ b/music/sfx/sfx_1f_62.asm @@ -1,8 +1,5 @@ SFX_1f_62_Ch1: ; 7c6de (1f:46de) - note D_, 3 - notetype 2, 3, 2 - note D_, 16 - unknownmusic0xf2 - note E_, 4 + unknownnoise0x20 2, 210, 50 + unknownnoise0x20 15, 242, 67 endchannel ; 0x7c6e5 \ No newline at end of file diff --git a/music/sfx/sfx_1f_63.asm b/music/sfx/sfx_1f_63.asm index 86f06669..88ce100d 100644 --- a/music/sfx/sfx_1f_63.asm +++ b/music/sfx/sfx_1f_63.asm @@ -1,17 +1,8 @@ SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5) - note D_, 5 - note D_, 13 - note D_, 1 - note D_, 4 - note A#, 1 - note D_, 1 - note D_, 4 - note B_, 1 - note D_, 2 - note D_, 4 - rest 1 - note D_, 3 - note D_, 16 - notetype 2, 2, 4 + unknownnoise0x20 4, 44, 32 + unknownnoise0x20 3, 160, 32 + unknownnoise0x20 3, 176, 33 + unknownnoise0x20 3, 192, 34 + unknownnoise0x20 15, 210, 36 endchannel ; 0x7c6f5 \ No newline at end of file diff --git a/music/sfx/sfx_1f_64.asm b/music/sfx/sfx_1f_64.asm index 6f36d7c9..703343ad 100644 --- a/music/sfx/sfx_1f_64.asm +++ b/music/sfx/sfx_1f_64.asm @@ -1,16 +1,7 @@ SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5) duty 2 - note D_, 2 - unknownmusic0xf2 - note A#, 1 - note C_, 7 - note D_, 2 - unknownmusic0xf2 - octave 8 - note C_, 7 - note D_, 9 - unknownmusic0xf1 - note C_, 1 - note C_, 8 + unknownsfx0x20 1, 242, 160, 6 + unknownsfx0x20 1, 242, 224, 6 + unknownsfx0x20 8, 241, 0, 7 endchannel ; 0x7c704 \ No newline at end of file diff --git a/music/sfx/sfx_1f_65.asm b/music/sfx/sfx_1f_65.asm index 58444aa7..b8708858 100644 --- a/music/sfx/sfx_1f_65.asm +++ b/music/sfx/sfx_1f_65.asm @@ -1,12 +1,6 @@ SFX_1f_65_Ch1: ; 7c704 (1f:4704) duty 2 - note D_, 3 - unknownmusic0xf1 - note C_, 1 - note C_, 8 - note D_, 9 - note G#, 2 - octave 8 - note C_, 8 + unknownsfx0x20 2, 241, 0, 7 + unknownsfx0x20 8, 129, 224, 7 endchannel ; 0x7c70f \ No newline at end of file diff --git a/music/sfx/sfx_1f_66.asm b/music/sfx/sfx_1f_66.asm index 6e95fc2f..1b581a91 100644 --- a/music/sfx/sfx_1f_66.asm +++ b/music/sfx/sfx_1f_66.asm @@ -1,32 +1,15 @@ SFX_1f_66_Ch1: ; 7c70f (1f:470f) duty 3 - note D_, 6 - octave 7 - note C_, 1 - note C_, 8 - note D_, 3 - octave 7 - note G#, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf1 - rest 1 - note C_, 8 + unknownsfx0x20 5, 225, 0, 7 + unknownsfx0x20 2, 225, 128, 7 + unknownsfx0x20 15, 241, 192, 7 endchannel SFX_1f_66_Ch2: ; 7c71e (1f:471e) duty 2 - note D_, 5 - rest 2 - rest 2 - note C_, 7 - note D_, 3 - rest 2 - note E_, 2 - note C_, 8 - note D_, 16 - notetype 1, 8, 1 - note C_, 8 + unknownsfx0x20 4, 193, 193, 6 + unknownsfx0x20 2, 193, 65, 7 + unknownsfx0x20 15, 209, 129, 7 endchannel ; 0x7c72d \ No newline at end of file diff --git a/music/sfx/sfx_1f_67.asm b/music/sfx/sfx_1f_67.asm index 685a349d..4bd391a1 100644 --- a/music/sfx/sfx_1f_67.asm +++ b/music/sfx/sfx_1f_67.asm @@ -1,44 +1,15 @@ SFX_1f_67_Ch1: ; 7c72d (1f:472d) dutycycle 228 - note C#, 1 - note D_, 16 - note D_, 5 - note E_, 1 - octave 8 - note C_, 8 - note D_, 5 - note F#, 1 - octave 8 - note C_, 8 - note D_, 5 - note G#, 1 - octave 8 - note C_, 8 - note D_, 9 - note A#, 1 - octave 8 - note C_, 8 - note D_, 9 - note A#, 1 - octave 8 - note C_, 8 - note D_, 9 - note G#, 1 - octave 8 - note C_, 8 - note D_, 9 - note F#, 1 - octave 8 - note C_, 8 - note D_, 9 - note D#, 1 - octave 8 - note C_, 8 - note D_, 16 - note C#, 3 - octave 8 - note C_, 8 - note C#, 1 - note C_, 9 + unknownsfx0x10 47 + unknownsfx0x20 4, 64, 224, 7 + unknownsfx0x20 4, 96, 224, 7 + unknownsfx0x20 4, 128, 224, 7 + unknownsfx0x20 8, 160, 224, 7 + unknownsfx0x20 8, 160, 224, 7 + unknownsfx0x20 8, 128, 224, 7 + unknownsfx0x20 8, 96, 224, 7 + unknownsfx0x20 8, 48, 224, 7 + unknownsfx0x20 15, 18, 224, 7 + unknownsfx0x10 8 endchannel ; 0x7c758 \ No newline at end of file diff --git a/music/silphco.asm b/music/silphco.asm index f6ee7fd9..b8d57955 100644 --- a/music/silphco.asm +++ b/music/silphco.asm @@ -2,7 +2,7 @@ Music_SilphCo_Ch1: ; 7f243 (1f:7243) tempo 0, 160 stereopanning 119 duty 3 - unknownmusic0xe8 + togglecall vibrato 8, 2, 2 notetype 6, 11, 3 octave 2 diff --git a/music/ssanne.asm b/music/ssanne.asm index 77bf12f2..a27d5e56 100644 --- a/music/ssanne.asm +++ b/music/ssanne.asm @@ -3,7 +3,7 @@ Music_SSAnne_Ch1: ; b3a7 (2:73a7) stereopanning 119 duty 1 vibrato 8, 3, 4 - unknownmusic0xe8 + togglecall Music_SSAnne_branch_b3b2: notetype 12, 10, 4 diff --git a/music/surfing.asm b/music/surfing.asm index 22eb93d2..7e98d0c6 100644 --- a/music/surfing.asm +++ b/music/surfing.asm @@ -3,7 +3,7 @@ Music_Surfing_Ch1: ; 7fa19 (1f:7a19) stereopanning 119 duty 3 vibrato 12, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 5 rest 6 octave 2 diff --git a/music/trainerbattle.asm b/music/trainerbattle.asm index ba8dbc54..3014887e 100644 --- a/music/trainerbattle.asm +++ b/music/trainerbattle.asm @@ -3,7 +3,7 @@ Music_TrainerBattle_Ch1: ; 22919 (8:6919) stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 2 rest 8 octave 3 diff --git a/music/unusedsong.asm b/music/unusedsong.asm index 43b43b43..b68295da 100644 --- a/music/unusedsong.asm +++ b/music/unusedsong.asm @@ -185,7 +185,7 @@ Music_UnusedSong_branch_a91b: Music_UnusedSong_Ch2: ; a9cf (2:69cf) tempo 0, 144 stereopanning 119 - unknownmusic0xe8 + togglecall vibrato 6, 1, 5 Music_UnusedSong_branch_a9d8: diff --git a/music/vermilion.asm b/music/vermilion.asm index 35933928..c48918f2 100644 --- a/music/vermilion.asm +++ b/music/vermilion.asm @@ -3,7 +3,7 @@ Music_Vermilion_Ch1: ; b9eb (2:79eb) stereopanning 119 duty 3 vibrato 12, 3, 4 - unknownmusic0xe8 + togglecall Music_Vermilion_branch_b9f6: notetype 12, 11, 5 diff --git a/music/wildbattle.asm b/music/wildbattle.asm index 7c7b3b1d..280e1137 100644 --- a/music/wildbattle.asm +++ b/music/wildbattle.asm @@ -3,7 +3,7 @@ Music_WildBattle_Ch1: ; 23099 (8:7099) stereopanning 119 duty 3 vibrato 6, 3, 4 - unknownmusic0xe8 + togglecall notetype 12, 11, 3 octave 4 note C_, 1 -- cgit v1.2.3 From 7059bb15f3c7b1ba0f589126ae71fdca55c4a993 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 22 Oct 2013 02:13:16 -0400 Subject: Fix blue and yellow music --- constants.asm | 4 - main.asm | 31 +-- music/blue/sfx_1f_5d.asm | 54 +---- music/yellow/intro.asm | 485 ------------------------------------------- music/yellow/yellowintro.asm | 485 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 513 insertions(+), 546 deletions(-) delete mode 100644 music/yellow/intro.asm create mode 100644 music/yellow/yellowintro.asm diff --git a/constants.asm b/constants.asm index 84950cd6..54f367f1 100644 --- a/constants.asm +++ b/constants.asm @@ -3499,10 +3499,6 @@ unknownmusic0xee: MACRO db \1 ENDM -unknownmusic0xef: MACRO - db $EF -ENDM - stereopanning: MACRO db $F0 db \1 diff --git a/main.asm b/main.asm index 8b42c9cb..da00366f 100644 --- a/main.asm +++ b/main.asm @@ -19000,7 +19000,8 @@ Music_unknownmusic0xee: ; 0x93fa call GetNextMusicByte ; yes ld [$c004], a ; store first param jp Music_endchannel - + +; this appears to never be used Music_unknownmusic0xef ; 0x9407 cp $ef ; is this command an unknownmusic0xef? jr nz, Music_dutycycle ; no @@ -19065,15 +19066,15 @@ Music_octave: ; 0x945f Music_unknownsfx0x20: ; 0x9472 cp $20 ; is this command an unknownsfx0x20? - jr nz, .skip ; no + jr nz, Music_unknownsfx0x10 ; no ld a, c cp CH3 ; is this a noise or sfx channel? - jr c, .skip ; no + jr c, Music_unknownsfx0x10 ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .skip ; no + jr nz, Music_unknownsfx0x10 ; no call Music_notelength ; yes ld d, a ld b, $0 @@ -19107,30 +19108,32 @@ Music_unknownsfx0x20: ; 0x9472 pop de call Func_964b ret -.skip + +Music_unknownsfx0x10: ld a, c cp CH4 - jr c, .asm_94db ; if not a sfx + jr c, Music_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? - jr nz, .asm_94db ; no + jr nz, Music_note ; no ld b, $0 ; yes ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_94db ; no + jr nz, Music_note ; no call GetNextMusicByte ld [$ff00+$10], a jp Music_endchannel -.asm_94db + +Music_note: ld a, c cp CH3 jr nz, Music_notelength ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Music_dnote - jr nc, Music_notelength + jr z, Music_dnote ; yes + jr nc, Music_notelength ; no swap a ld b, a ld a, d @@ -19178,18 +19181,18 @@ Music_notelength: ; 0x950a ld d, a ld a, [$c0e9] ld e, a - jr .done + jr .skip .sfxChannel ld d, $1 ld e, $0 cp CH7 - jr z, .done ; if noise channel + jr z, .skip ; if noise channel call Func_9693 ld a, [$c0ea] ld d, a ld a, [$c0eb] ld e, a -.done +.skip ld a, l ld b, $0 ld hl, $c0ce diff --git a/music/blue/sfx_1f_5d.asm b/music/blue/sfx_1f_5d.asm index 5d10f3d1..8b1ce426 100644 --- a/music/blue/sfx_1f_5d.asm +++ b/music/blue/sfx_1f_5d.asm @@ -1,52 +1,20 @@ SFX_1f_5d_Ch1: ; 7c45e (1f:445e) duty 2 - note D_, 4 - octave 4 - note C_, 1 - note C_, 7 - note D_, 4 - octave 4 - note G#, 1 - note C_, 7 - note D_, 4 - octave 4 - rest 1 - note C_, 7 - note D_, 4 - octave 4 - note C_, 1 - note C_, 8 - note D_, 16 - unknownmusic0xf2 - octave 8 - note C_, 8 + unknownsfx0x20 3, 228, 0, 6 + unknownsfx0x20 3, 228, 128, 6 + unknownsfx0x20 3, 228, 192, 6 + unknownsfx0x20 3, 228, 0, 7 + unknownsfx0x20 15, 242, 224, 7 endchannel SFX_1f_5d_Ch2: ; 7c475 (1f:4475) duty 2 - note D_, 4 - note C_, 9 - note C_, 1 - note C_, 1 - note D_, 4 - rest 5 - note C_, 2 - note C_, 7 - note D_, 4 - rest 5 - note G#, 2 - note C_, 7 - note D_, 4 - rest 5 - rest 2 - note C_, 7 - note D_, 4 - rest 5 - note C_, 2 - note C_, 8 - note D_, 16 - notetype 2, 14, 1 - note C_, 8 + unknownsfx0x20 3, 8, 0, 0 + unknownsfx0x20 3, 196, 1, 6 + unknownsfx0x20 3, 196, 129, 6 + unknownsfx0x20 3, 196, 193, 6 + unknownsfx0x20 3, 196, 1, 7 + unknownsfx0x20 15, 210, 225, 7 endchannel ; 0x7c490 \ No newline at end of file diff --git a/music/yellow/intro.asm b/music/yellow/intro.asm deleted file mode 100644 index dc84df74..00000000 --- a/music/yellow/intro.asm +++ /dev/null @@ -1,485 +0,0 @@ -Music_IntroBattle_Ch1: ; 7f65c (1f:765c) - tempo 0, 116 - stereopanning 119 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - note G#, 2 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 3 - note A#, 1 - note B_, 2 - note B_, 10 - notetype 12, 11, 6 - octave 4 - note C#, 1 - note C_, 1 - note C#, 10 - octave 3 - note G#, 1 - note G_, 1 - note G#, 4 - note B_, 4 - octave 4 - note E_, 4 - note F#, 8 - note E_, 8 - octave 3 - note A_, 4 - note B_, 4 - octave 4 - note C#, 4 - octave 3 - note B_, 4 - note G#, 6 - notetype 12, 11, 2 - note B_, 2 - notetype 12, 11, 6 - note G#, 6 - notetype 12, 11, 2 - note B_, 2 - notetype 12, 11, 6 - octave 4 - note E_, 6 - notetype 12, 11, 2 - note G#, 2 - notetype 12, 11, 6 - note E_, 6 - notetype 12, 11, 2 - note G#, 2 - notetype 12, 11, 6 - octave 3 - note A_, 4 - note F#, 4 - note A_, 4 - note B_, 4 - note F#, 4 - note G#, 4 - note A_, 2 - note G#, 2 - note F#, 2 - note D#, 2 - notetype 12, 11, 3 - note B_, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 2 - note C#, 2 - note F#, 4 - note F#, 3 - note D#, 1 - note F#, 2 - note F#, 8 - notetype 12, 11, 6 - note F#, 1 - note F_, 1 - note F#, 8 - octave 3 - note B_, 1 - note A#, 1 - note B_, 8 - octave 4 - note F#, 1 - note F_, 1 - note F#, 2 - notetype 12, 11, 3 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 - notetype 12, 11, 2 - octave 3 - note B_, 16 - endchannel - - -Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3) - duty 2 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 3 - note D#, 1 - note E_, 2 - note E_, 4 - notetype 12, 12, 5 - note G#, 1 - note G_, 1 - note G#, 10 - octave 3 - note B_, 1 - note A#, 1 - note B_, 6 - notetype 12, 12, 7 - octave 4 - note E_, 4 - note G#, 4 - note B_, 4 - octave 5 - note C#, 16 - octave 4 - note A_, 4 - note G#, 4 - note F#, 4 - note E_, 4 - octave 3 - note B_, 6 - notetype 12, 12, 2 - octave 4 - note E_, 2 - notetype 12, 12, 7 - octave 3 - note B_, 6 - notetype 12, 12, 2 - octave 4 - note E_, 2 - notetype 12, 12, 7 - note G#, 6 - notetype 12, 12, 2 - note B_, 2 - notetype 12, 12, 7 - note G#, 6 - notetype 12, 12, 2 - note B_, 2 - notetype 12, 12, 7 - note C#, 4 - octave 3 - note A_, 4 - octave 4 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - notetype 12, 12, 3 - octave 4 - note E_, 2 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 2 - note F#, 2 - note A_, 4 - note A_, 3 - note F#, 1 - note A_, 2 - note A_, 4 - notetype 12, 12, 7 - note B_, 1 - note A#, 1 - note B_, 8 - note B_, 1 - note A#, 1 - note B_, 8 - note B_, 1 - note A#, 1 - note B_, 6 - notetype 12, 12, 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 - notetype 12, 12, 2 - note E_, 16 - endchannel - - -Music_IntroBattle_Ch3: ; 7f749 (1f:7749) - notetype 12, 1, 0 - octave 4 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - note A_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note E_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note E_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note F#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 3 - note F#, 1 - rest 1 - octave 4 - note F#, 1 - note G#, 1 - note A_, 1 - octave 5 - note C#, 1 - note E_, 1 - rest 15 - endchannel -; 0x7f860 \ No newline at end of file diff --git a/music/yellow/yellowintro.asm b/music/yellow/yellowintro.asm new file mode 100644 index 00000000..ee716901 --- /dev/null +++ b/music/yellow/yellowintro.asm @@ -0,0 +1,485 @@ +Music_YellowIntro_Ch1: ; 7f65c (1f:765c) + tempo 0, 116 + stereopanning 119 + duty 3 + vibrato 8, 1, 4 + notetype 12, 11, 2 + octave 3 + note G#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 3 + note A#, 1 + note B_, 2 + note B_, 10 + notetype 12, 11, 6 + octave 4 + note C#, 1 + note C_, 1 + note C#, 10 + octave 3 + note G#, 1 + note G_, 1 + note G#, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 8 + note E_, 8 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note G#, 6 + notetype 12, 11, 2 + note B_, 2 + notetype 12, 11, 6 + note G#, 6 + notetype 12, 11, 2 + note B_, 2 + notetype 12, 11, 6 + octave 4 + note E_, 6 + notetype 12, 11, 2 + note G#, 2 + notetype 12, 11, 6 + note E_, 6 + notetype 12, 11, 2 + note G#, 2 + notetype 12, 11, 6 + octave 3 + note A_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note F#, 4 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + notetype 12, 11, 3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 2 + note C#, 2 + note F#, 4 + note F#, 3 + note D#, 1 + note F#, 2 + note F#, 8 + notetype 12, 11, 6 + note F#, 1 + note F_, 1 + note F#, 8 + octave 3 + note B_, 1 + note A#, 1 + note B_, 8 + octave 4 + note F#, 1 + note F_, 1 + note F#, 2 + notetype 12, 11, 3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + notetype 12, 11, 2 + octave 3 + note B_, 16 + endchannel + + +Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3) + duty 2 + vibrato 6, 1, 5 + notetype 12, 12, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 3 + note D#, 1 + note E_, 2 + note E_, 4 + notetype 12, 12, 5 + note G#, 1 + note G_, 1 + note G#, 10 + octave 3 + note B_, 1 + note A#, 1 + note B_, 6 + notetype 12, 12, 7 + octave 4 + note E_, 4 + note G#, 4 + note B_, 4 + octave 5 + note C#, 16 + octave 4 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + octave 3 + note B_, 6 + notetype 12, 12, 2 + octave 4 + note E_, 2 + notetype 12, 12, 7 + octave 3 + note B_, 6 + notetype 12, 12, 2 + octave 4 + note E_, 2 + notetype 12, 12, 7 + note G#, 6 + notetype 12, 12, 2 + note B_, 2 + notetype 12, 12, 7 + note G#, 6 + notetype 12, 12, 2 + note B_, 2 + notetype 12, 12, 7 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + notetype 12, 12, 3 + octave 4 + note E_, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 2 + note F#, 2 + note A_, 4 + note A_, 3 + note F#, 1 + note A_, 2 + note A_, 4 + notetype 12, 12, 7 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 6 + notetype 12, 12, 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + notetype 12, 12, 2 + note E_, 16 + endchannel + + +Music_YellowIntro_Ch3: ; 7f749 (1f:7749) + notetype 12, 1, 0 + octave 4 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + octave 3 + note B_, 1 + rest 1 + octave 4 + note C#, 1 + rest 1 + note D#, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note F#, 1 + rest 1 + note A_, 1 + rest 1 + note C#, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note E_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note C#, 1 + rest 1 + octave 4 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note G#, 1 + rest 1 + note B_, 1 + rest 1 + note E_, 1 + rest 1 + note B_, 1 + rest 1 + note A_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note E_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note A_, 1 + rest 1 + octave 5 + note F#, 1 + rest 1 + octave 4 + note F#, 1 + rest 1 + octave 5 + note C#, 1 + rest 3 + note F#, 1 + rest 1 + octave 4 + note F#, 1 + note G#, 1 + note A_, 1 + octave 5 + note C#, 1 + note E_, 1 + rest 15 + endchannel +; 0x7f860 \ No newline at end of file -- cgit v1.2.3 From fef4ab1fdca61807726b7f43450145ad782f695f Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 22 Oct 2013 08:46:05 -0400 Subject: Fix sfx_02_5e --- music/sfx/sfx_02_5e.asm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/music/sfx/sfx_02_5e.asm b/music/sfx/sfx_02_5e.asm index 8b2b7a82..ad47ebf0 100644 --- a/music/sfx/sfx_02_5e.asm +++ b/music/sfx/sfx_02_5e.asm @@ -8,9 +8,12 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca) note A_, 2 note G_, 2 octave 6 - db $03 - db $01 - unknownsfx0x20 1, 1, 227, 113 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 5 + note G_, 2 note A_, 2 note F_, 2 note G_, 8 -- cgit v1.2.3 From a6a363e83acc431bc4d782a6611a9c63e5ad876f Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 22 Oct 2013 09:17:11 -0400 Subject: Add unused sfx --- main.asm | 4 +--- music/sfx/sfx_02_unused.asm | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 music/sfx/sfx_02_unused.asm diff --git a/main.asm b/main.asm index da00366f..b79707f0 100644 --- a/main.asm +++ b/main.asm @@ -18429,9 +18429,7 @@ INCLUDE "music/sfx/sfx_02_53.tx" INCLUDE "music/sfx/sfx_02_54.tx" INCLUDE "music/sfx/sfx_02_55.tx" INCLUDE "music/sfx/sfx_02_5f.tx" - -INCBIN "baserom.gbc",$86e3,$872f - $86e3 - +INCLUDE "music/sfx/sfx_02_unused.tx" INCLUDE "music/sfx/sfx_02_1d.tx" INCLUDE "music/sfx/sfx_02_37.tx" INCLUDE "music/sfx/sfx_02_38.tx" diff --git a/music/sfx/sfx_02_unused.asm b/music/sfx/sfx_02_unused.asm new file mode 100644 index 00000000..db3a8b26 --- /dev/null +++ b/music/sfx/sfx_02_unused.asm @@ -0,0 +1,32 @@ +SFX_02_unused_Ch1: ; 86e3 (2:46e3) + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + + +SFX_02_unused_Ch2: ; 86fe (2:46fe) + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + + +SFX_02_unused_Ch3: ; 8719 (2:4719) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel +; 0x872f \ No newline at end of file -- cgit v1.2.3 From e411ca2419ae4f858e620cb5e5735f25e135146a Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Tue, 22 Oct 2013 12:21:28 -0400 Subject: Noise_endchannel: --- main.asm | 110 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/main.asm b/main.asm index b79707f0..35cbf409 100644 --- a/main.asm +++ b/main.asm @@ -19152,7 +19152,7 @@ asm_94fd ld d, a ld a, [$c003] and a - jr nz, .asm_9508 ; 0x9502 $4 + jr nz, .asm_9508 ld a, d call Func_9876 .asm_9508 @@ -19266,7 +19266,7 @@ Music_notepitch: ; 0x9568 ld hl, $c02e add hl, bc bit 4, [hl] - jr z, .asm_95b8 ; 0x95b3 $3 + jr z, .asm_95b8 call Func_978f .asm_95b8 push de @@ -19279,7 +19279,7 @@ Music_notepitch: ; 0x9568 add hl, de ld a, [hl] and a - jr nz, .asm_95cb ; 0x95c7 $2 + jr nz, .asm_95cb jr .skip .asm_95cb pop de @@ -19299,9 +19299,9 @@ Music_notepitch: ; 0x9568 ld hl, $c02e add hl, bc bit 0, [hl] - jr z, .asm_95ef ; 0x95e9 $4 + jr z, .asm_95ef inc e - jr nc, .asm_95ef ; 0x95ec $1 + jr nc, .asm_95ef inc d .asm_95ef ld hl, $c066 @@ -19421,17 +19421,17 @@ Func_964b: ; 0x964b Func_9693: ; 0x9693 call Func_96e5 - jr nc, .asm_96ab ; 0x9696 $13 + jr nc, .asm_96ab ld d, $0 ld a, [$c0f2] add $80 - jr nc, .asm_96a2 ; 0x969f $1 + jr nc, .asm_96a2 inc d .asm_96a2 ld [$c0eb], a ld a, d ld [$c0ea], a - jr .asm_96b4 ; 0x96a9 $9 + jr .asm_96b4 .asm_96ab xor a ld [$c0eb], a @@ -19442,10 +19442,10 @@ Func_9693: ; 0x9693 Func_96b5: ; 0x96b5 call Func_96e5 - jr nc, .asm_96c6 ; 0x96b8 $c + jr nc, .asm_96c6 ld a, [$c0f1] add e - jr nc, .asm_96c1 ; 0x96be $1 + jr nc, .asm_96c1 inc d .asm_96c1 dec hl @@ -19458,7 +19458,7 @@ Func_96b5: ; 0x96b5 Func_96c7: ; 0x96c7 call Func_96e5 - jr nc, .asm_96e2 ; 0x96ca $16 + jr nc, .asm_96e2 ld hl, $c006 ld e, c ld d, $0 @@ -19482,12 +19482,12 @@ Func_96c7: ; 0x96c7 Func_96e5: ; 0x96e5 ld a, [$c02a] cp $14 - jr nc, .asm_96ee ; 0x96ea $2 - jr .asm_96f4 ; 0x96ec $6 + jr nc, .asm_96ee + jr .asm_96f4 .asm_96ee cp $86 - jr z, .asm_96f4 ; 0x96f0 $2 - jr c, .asm_96f7 ; 0x96f2 $3 + jr z, .asm_96f4 + jr c, .asm_96f7 .asm_96f4 scf ccf @@ -19534,13 +19534,13 @@ Music_ApplyPitchBend: ; 0x96f9 ld a, [hl] cp d jp c, .asm_9786 - jr nz, .asm_9773 ; 0x9733 $3e + jr nz, .asm_9773 ld hl, $c0ae add hl, bc ld a, [hl] cp e jp c, .asm_9786 - jr .asm_9773 ; 0x973e $33 + jr .asm_9773 .asm_9740 ld hl, $c09e add hl, bc @@ -19571,13 +19571,13 @@ Music_ApplyPitchBend: ; 0x96f9 add hl, bc ld a, d cp [hl] - jr c, .asm_9786 ; 0x9767 $1d - jr nz, .asm_9773 ; 0x9769 $8 + jr c, .asm_9786 + jr nz, .asm_9773 ld hl, $c0ae add hl, bc ld a, e cp [hl] - jr c, .asm_9786 ; 0x9771 $13 + jr c, .asm_9786 .asm_9773 ld hl, $c09e add hl, bc @@ -19611,7 +19611,7 @@ Func_978f: ; 0x978f ld hl, $c076 add hl, bc sub [hl] - jr nc, .asm_97a7 ; 0x97a3 $2 + jr nc, .asm_97a7 ld a, $1 .asm_97a7 ld [hl], a @@ -19625,13 +19625,13 @@ Func_978f: ; 0x978f ld hl, $c0a6 add hl, bc sub [hl] - jr c, .asm_97c3 ; 0x97b6 $b + jr c, .asm_97c3 ld d, a ld b, $0 ld hl, $c02e add hl, bc set 5, [hl] - jr .asm_97e6 ; 0x97c1 $23 + jr .asm_97e6 .asm_97c3 ld hl, $c096 add hl, bc @@ -19664,13 +19664,13 @@ Func_978f: ; 0x978f ld a, e sub [hl] ld e, a - jr nc, .asm_97ea ; 0x97ee $fa + jr nc, .asm_97ea ld a, d and a - jr z, .asm_97f8 ; 0x97f2 $4 + jr z, .asm_97f8 dec a ld d, a - jr .asm_97ea ; 0x97f6 $f2 + jr .asm_97ea .asm_97f8 ld a, e add [hl] @@ -19741,14 +19741,14 @@ Func_9847: ; 0x9847 ld h, $0 .asm_9849 srl a - jr nc, .asm_984e ; 0x984b $1 + jr nc, .asm_984e add hl, de .asm_984e sla e rl d and a - jr z, .asm_9857 ; 0x9853 $2 - jr .asm_9849 ; 0x9855 $f2 + jr z, .asm_9857 + jr .asm_9849 .asm_9857 ret @@ -19766,11 +19766,11 @@ Func_9858: ; 0x9858 ld a, b .asm_9866 cp $7 - jr z, .asm_9871 ; 0x9868 $7 + jr z, .asm_9871 sra d rr e inc a - jr .asm_9866 ; 0x986f $f5 + jr .asm_9866 .asm_9871 ld a, $8 add d @@ -19785,7 +19785,7 @@ Func_9876: ; 0x9876 jp z, Func_994e jp c, Func_994e cp $fe - jr z, .asm_988d ; 0x9888 $3 + jr z, .asm_988d jp nc, Func_994e .asm_988d xor a @@ -19899,24 +19899,24 @@ Func_994e: ; 0x994e add hl, de ld a, [hl] and a - jr z, .asm_99a3 ; 0x9984 $1d + jr z, .asm_99a3 ld a, e cp $7 - jr nz, .asm_999a ; 0x9989 $f + jr nz, .asm_999a ld a, [$c001] cp $14 - jr nc, .asm_9993 ; 0x9990 $1 + jr nc, .asm_9993 ret .asm_9993 ld a, [hl] cp $14 - jr z, .asm_99a3 ; 0x9996 $b - jr c, .asm_99a3 ; 0x9998 $9 + jr z, .asm_99a3 + jr c, .asm_99a3 .asm_999a ld a, [$c001] cp [hl] - jr z, .asm_99a3 ; 0x999e $3 - jr c, .asm_99a3 ; 0x99a0 $1 + jr z, .asm_99a3 + jr c, .asm_99a3 ret .asm_99a3 xor a @@ -20001,7 +20001,7 @@ Func_994e: ; 0x994e ld [hl], a ld a, e cp $4 - jr nz, .asm_9a2b ; 0x9a25 $4 + jr nz, .asm_9a2b ld a, $8 ld [$ff00+$10], a .asm_9a2b @@ -20086,11 +20086,11 @@ Func_9a8f: ; 0x9a8f ld c, $0 .asm_9ab1 cp c - jr z, .asm_9ab9 ; 0x9ab2 $5 + jr z, .asm_9ab9 inc c inc hl inc hl - jr .asm_9ab1 ; 0x9ab7 $f8 + jr .asm_9ab1 .asm_9ab9 push hl push bc @@ -20103,7 +20103,7 @@ Func_9a8f: ; 0x9a8f ld [hl], a pop af cp $3 - jr c, .asm_9ad2 ; 0x9aca $6 + jr c, .asm_9ad2 ld hl, $c02e add hl, bc set 2, [hl] @@ -20122,31 +20122,31 @@ Func_9a8f: ; 0x9a8f and a ld a, [de] inc de - jr nz, .asm_9ab1 ; 0x9ae0 $cf + jr nz, .asm_9ab1 ld a, [$c001] cp $14 - jr nc, .asm_9aeb ; 0x9ae7 $2 - jr .asm_9b15 ; 0x9ae9 $2a + jr nc, .asm_9aeb + jr .asm_9b15 .asm_9aeb ld a, [$c001] cp $86 - jr z, .asm_9b15 ; 0x9af0 $23 - jr c, .asm_9af6 ; 0x9af2 $2 - jr .asm_9b15 ; 0x9af4 $1f + jr z, .asm_9b15 + jr c, .asm_9af6 + jr .asm_9b15 .asm_9af6 ld hl, $c02a ld [hli], a ld [hli], a ld [hli], a ld [hl], a - ld hl, $c012 - ld de, Unknown_9b16 + ld hl, $c012 ; sfx noise channel pointer + ld de, Noise_endchannel ld [hl], e inc hl - ld [hl], d + ld [hl], d ; overwrite pointer to point to endchannel ld a, [$c005] and a - jr nz, .asm_9b15 ; 0x9b0a $9 + jr nz, .asm_9b15 ld a, [$ff00+$24] ld [$c005], a ld a, $77 @@ -20154,8 +20154,8 @@ Func_9a8f: ; 0x9a8f .asm_9b15 ret -Unknown_9b16: ; 0x9b16 - db $FF +Noise_endchannel: ; 0x9b16 + endchannel Unknown_9b17: ; 0x9b17 db $10, $15, $1A, $1F ; channels 0-3 -- cgit v1.2.3 From f199c146d7183b433c6c4d3ec6ba2ba7e1c80988 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Wed, 23 Oct 2013 20:33:21 -0400 Subject: Music Engine Bank 1f --- main.asm | 1230 ++++++++++++++++++++++--------------------- music/sfx/sfx_1f_unused.asm | 32 ++ 2 files changed, 671 insertions(+), 591 deletions(-) mode change 100644 => 100755 main.asm create mode 100755 music/sfx/sfx_1f_unused.asm diff --git a/main.asm b/main.asm old mode 100644 new mode 100755 index 35cbf409..11f4c1e3 --- a/main.asm +++ b/main.asm @@ -18369,30 +18369,30 @@ INCLUDE "music/sfx/sfx_02_11.tx" INCLUDE "music/sfx/sfx_02_12.tx" INCLUDE "music/sfx/sfx_02_13.tx" -Unknown_8361: ; 0x8361 - dw Unknown_8373 - dw Unknown_8383 - dw Unknown_8393 - dw Unknown_83a3 - dw Unknown_83b3 - dw SFX_02_3f_Ch1 - dw SFX_02_3f_Ch1 - dw SFX_02_3f_Ch1 - dw SFX_02_3f_Ch1 - -Unknown_8373: ; 0x8373 +Music2_Channel3DutyPointers: ; 0x8361 + dw Music2_Channel3Duty1 + dw Music2_Channel3Duty2 + dw Music2_Channel3Duty3 + dw Music2_Channel3Duty4 + dw Music2_Channel3Duty5 + dw SFX_02_3f_Ch1 ; unused + dw SFX_02_3f_Ch1 ; unused + dw SFX_02_3f_Ch1 ; unused + dw SFX_02_3f_Ch1 ; unused + +Music2_Channel3Duty1: ; 0x8373 db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 -Unknown_8383: ; 0x8383 +Music2_Channel3Duty2: ; 0x8383 db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 -Unknown_8393: ; 0x8393 +Music2_Channel3Duty3: ; 0x8393 db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 -Unknown_83a3: ; 0x83a3 +Music2_Channel3Duty4: ; 0x83a3 db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 -Unknown_83b3: ; 0x83b3 +Music2_Channel3Duty5: ; 0x83b3 db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 INCLUDE "music/sfx/sfx_02_3f.tx" @@ -18530,7 +18530,7 @@ Func_9103: ; 0x9103 ld [$ff00+$1a], a jr .nextChannel .asm_912e - call ApplyMusicAffects + call Music2_ApplyMusicAffects .nextChannel ld a, c inc c ; inc channel number @@ -18545,13 +18545,13 @@ Func_9103: ; 0x9103 ; 3: a toggle used only by this routine for vibrato ; 4: pitchbend flag ; 6: dutycycle flag -ApplyMusicAffects: ; 0x9138 +Music2_ApplyMusicAffects: ; 0x9138 ld b, $0 ld hl, $c0b6 ; delay unitl next note add hl, bc ld a, [hl] cp $1 ; if the delay is 1, play next note - jp z, PlayNextNote + jp z, Music2_PlayNextNote dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c @@ -18568,7 +18568,7 @@ ApplyMusicAffects: ; 0x9138 add hl, bc bit 6, [hl] ; dutycycle jr z, .checkForexecutemusic - call Music_ApplyDutyCycle + call Music2_ApplyDutyCycle .checkForexecutemusic ld b, $0 ld hl, $c036 @@ -18584,7 +18584,7 @@ ApplyMusicAffects: ; 0x9138 add hl, bc bit 4, [hl] ; pitchbend jr z, .checkVibratoDelay - jp Music_ApplyPitchBend + jp Music2_ApplyPitchBend .checkVibratoDelay ld hl, $c04e ; vibrato delay add hl, bc @@ -18651,7 +18651,7 @@ ApplyMusicAffects: ; 0x9138 ; this routine executes all music commands that take up no time, ; like tempo changes, duty changes etc. and doesn't return ; until the first note is reached -PlayNextNote ; 0x91d0 +Music2_PlayNextNote ; 0x91d0 ld hl, $c06e add hl, bc ld a, [hl] @@ -18662,14 +18662,14 @@ PlayNextNote ; 0x91d0 add hl, bc res 4, [hl] res 5, [hl] - call Music_endchannel + call Music2_endchannel ret -Music_endchannel: ; 0x91e6 - call GetNextMusicByte +Music2_endchannel: ; 0x91e6 + call Music2_GetNextMusicByte ld d, a cp $ff ; is this command an endchannel? - jp nz, Music_callchannel ; no + jp nz, Music2_callchannel ; no ld b, $0 ; yes ld hl, $c02e add hl, bc @@ -18719,7 +18719,7 @@ Music_endchannel: ; 0x91e6 inc de ld a, [de] ld [hl], a ; loads channel address to return to - jp Music_endchannel + jp Music2_endchannel .asm_923f ld hl, Unknown_9b1f add hl, bc @@ -18754,12 +18754,12 @@ Music_endchannel: ; 0x91e6 ld [hl], b ret -Music_callchannel: ; 0x9274 +Music2_callchannel: ; 0x9274 cp $fd ; is this command a callchannel? - jp nz, Music_loopchannel ; no - call GetNextMusicByte ; yes + jp nz, Music2_loopchannel ; no + call Music2_GetNextMusicByte ; yes push af - call GetNextMusicByte + call Music2_GetNextMusicByte ld d, a pop af ld e, a @@ -18789,12 +18789,12 @@ Music_callchannel: ; 0x9274 ld hl, $c02e add hl, bc set 1, [hl] ; set the call flag - jp Music_endchannel + jp Music2_endchannel -Music_loopchannel: ; 0x92a9 +Music2_loopchannel: ; 0x92a9 cp $fe ; is this command a loopchannel? - jp nz, Music_notetype ; no - call GetNextMusicByte ; yes + jp nz, Music2_notetype ; no + call Music2_GetNextMusicByte ; yes ld e, a and a jr z, .infiniteLoop @@ -18806,17 +18806,17 @@ Music_loopchannel: ; 0x92a9 jr nz, .loopAgain ld a, $1 ; if no more loops to make, ld [hl], a - call GetNextMusicByte ; skip pointer - call GetNextMusicByte - jp Music_endchannel + call Music2_GetNextMusicByte ; skip pointer + call Music2_GetNextMusicByte + jp Music2_endchannel .loopAgain ; inc loop count inc a ld [hl], a ; fall through .infiniteLoop ; overwrite current address with pointer - call GetNextMusicByte + call Music2_GetNextMusicByte push af - call GetNextMusicByte + call Music2_GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -18827,12 +18827,12 @@ Music_loopchannel: ; 0x92a9 pop af ld [hli], a ld [hl], b - jp Music_endchannel + jp Music2_endchannel -Music_notetype: ; 0x92e4 +Music2_notetype: ; 0x92e4 and $f0 cp $d0 ; is this command a notetype? - jp nz, Music_togglecall ; no + jp nz, Music2_togglecall ; no ld a, d ; yes and $f ld b, $0 @@ -18842,7 +18842,7 @@ Music_notetype: ; 0x92e4 ld a, c cp CH3 jr z, .noiseChannel ; noise channel has 0 params - call GetNextMusicByte + call Music2_GetNextMusicByte ld d, a ld a, c cp CH2 @@ -18871,24 +18871,24 @@ Music_notetype: ; 0x92e4 add hl, bc ld [hl], d .noiseChannel - jp Music_endchannel + jp Music2_endchannel -Music_togglecall: ; 0x9323 +Music2_togglecall: ; 0x9323 ld a, d cp $e8 ; is this command an togglecall? - jr nz, Music_vibrato ; no + jr nz, Music2_vibrato ; no ld b, $0 ; yes ld hl, $c02e add hl, bc ld a, [hl] xor $1 ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) - jp Music_endchannel + jp Music2_endchannel -Music_vibrato: ; 0x9335 +Music2_vibrato: ; 0x9335 cp $ea ; is this command a vibrato? - jr nz, Music_pitchbend ; no - call GetNextMusicByte ; yes + jr nz, Music2_pitchbend ; no + call Music2_GetNextMusicByte ; yes ld b, $0 ld hl, $c04e add hl, bc @@ -18896,7 +18896,7 @@ Music_vibrato: ; 0x9335 ld hl, $c06e add hl, bc ld [hl], a ; store delay - call GetNextMusicByte + call Music2_GetNextMusicByte ld d, a and $f0 swap a @@ -18917,17 +18917,17 @@ Music_vibrato: ; 0x9335 swap a or d ld [hl], a ; store depth as both high and low nibbles - jp Music_endchannel + jp Music2_endchannel -Music_pitchbend: ; 0x936d +Music2_pitchbend: ; 0x936d cp $eb ; is this command a pitchbend? - jr nz, Music_duty ; no - call GetNextMusicByte ; yes + jr nz, Music2_duty ; no + call Music2_GetNextMusicByte ; yes ld b, $0 ld hl, $c076 add hl, bc ld [hl], a ; store first param - call GetNextMusicByte + call Music2_GetNextMusicByte ld d, a and $f0 swap a @@ -18946,14 +18946,14 @@ Music_pitchbend: ; 0x936d ld hl, $c02e add hl, bc set 4, [hl] ; set pitchbend flag - call GetNextMusicByte + call Music2_GetNextMusicByte ld d, a - jp Music_notelength + jp Music2_notelength -Music_duty: ; 0x93a5 +Music2_duty: ; 0x93a5 cp $ec ; is this command a duty? - jr nz, Music_tempo ; no - call GetNextMusicByte ; yes + jr nz, Music2_tempo ; no + call Music2_GetNextMusicByte ; yes rrca rrca and $c0 @@ -18961,17 +18961,17 @@ Music_duty: ; 0x93a5 ld hl, $c03e add hl, bc ld [hl], a ; store duty - jp Music_endchannel + jp Music2_endchannel -Music_tempo: ; 0x93ba +Music2_tempo: ; 0x93ba cp $ed ; is this command a tempo? - jr nz, Music_unknownmusic0xee ; no + jr nz, Music2_unknownmusic0xee ; no ld a, c ; yes - cp $4 + cp CH4 jr nc, .sfxChannel - call GetNextMusicByte + call Music2_GetNextMusicByte ld [$c0e8], a ; store first param - call GetNextMusicByte + call Music2_GetNextMusicByte ld [$c0e9], a ; store second param xor a ld [$c0ce], a ; clear RAM @@ -18980,9 +18980,9 @@ Music_tempo: ; 0x93ba ld [$c0d1], a jr .musicChannelDone .sfxChannel - call GetNextMusicByte + call Music2_GetNextMusicByte ld [$c0ea], a ; store first param - call GetNextMusicByte + call Music2_GetNextMusicByte ld [$c0eb], a ; store second param xor a ld [$c0d2], a ; clear RAM @@ -18990,20 +18990,20 @@ Music_tempo: ; 0x93ba ld [$c0d4], a ld [$c0d5], a .musicChannelDone - jp Music_endchannel + jp Music2_endchannel -Music_unknownmusic0xee: ; 0x93fa +Music2_unknownmusic0xee: ; 0x93fa cp $ee ; is this command an unknownmusic0xee? - jr nz, Music_unknownmusic0xef ; no - call GetNextMusicByte ; yes + jr nz, Music2_unknownmusic0xef ; no + call Music2_GetNextMusicByte ; yes ld [$c004], a ; store first param - jp Music_endchannel + jp Music2_endchannel ; this appears to never be used -Music_unknownmusic0xef ; 0x9407 +Music2_unknownmusic0xef ; 0x9407 cp $ef ; is this command an unknownmusic0xef? - jr nz, Music_dutycycle ; no - call GetNextMusicByte ; yes + jr nz, Music2_dutycycle ; no + call Music2_GetNextMusicByte ; yes push bc call Func_9876 pop bc @@ -19015,12 +19015,12 @@ Music_unknownmusic0xef ; 0x9407 xor a ld [$c02d], a .skip - jp Music_endchannel + jp Music2_endchannel -Music_dutycycle: ; 0x9426 +Music2_dutycycle: ; 0x9426 cp $fc ; is this command a dutycycle? - jr nz, Music_stereopanning ; no - call GetNextMusicByte ; yes + jr nz, Music2_stereopanning ; no + call Music2_GetNextMusicByte ; yes ld b, $0 ld hl, $c046 add hl, bc @@ -19032,48 +19032,48 @@ Music_dutycycle: ; 0x9426 ld hl, $c02e add hl, bc set 6, [hl] ; set dutycycle flag - jp Music_endchannel + jp Music2_endchannel -Music_stereopanning: ; 0x9444 +Music2_stereopanning: ; 0x9444 cp $f0 ; is this command a stereopanning? - jr nz, Music_executemusic ; no - call GetNextMusicByte ; yes + jr nz, Music2_executemusic ; no + call Music2_GetNextMusicByte ; yes ld [$ff00+$24], a ; store stereopanning - jp Music_endchannel + jp Music2_endchannel -Music_executemusic: ; 0x9450 +Music2_executemusic: ; 0x9450 cp $f8 ; is this command an executemusic? - jr nz, Music_octave ; no + jr nz, Music2_octave ; no ld b, $0 ; yes ld hl, $c036 add hl, bc set 0, [hl] - jp Music_endchannel + jp Music2_endchannel -Music_octave: ; 0x945f +Music2_octave: ; 0x945f and $f0 cp $e0 ; is this command an octave? - jr nz, Music_unknownsfx0x20 ; no + jr nz, Music2_unknownsfx0x20 ; no ld hl, $c0d6 ; yes ld b, $0 add hl, bc ld a, d and $f ld [hl], a ; store low nibble as octave - jp Music_endchannel + jp Music2_endchannel -Music_unknownsfx0x20: ; 0x9472 +Music2_unknownsfx0x20: ; 0x9472 cp $20 ; is this command an unknownsfx0x20? - jr nz, Music_unknownsfx0x10 ; no + jr nz, Music2_unknownsfx0x10 ; no ld a, c cp CH3 ; is this a noise or sfx channel? - jr c, Music_unknownsfx0x10 ; no + jr c, Music2_unknownsfx0x10 ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, Music_unknownsfx0x10 ; no - call Music_notelength ; yes + jr nz, Music2_unknownsfx0x10 ; no + call Music2_notelength ; yes ld d, a ld b, $0 ld hl, $c03e @@ -19084,19 +19084,19 @@ Music_unknownsfx0x20: ; 0x9472 ld b, $1 call Func_9838 ld [hl], d - call GetNextMusicByte + call Music2_GetNextMusicByte ld d, a ld b, $2 call Func_9838 ld [hl], d - call GetNextMusicByte + call Music2_GetNextMusicByte ld e, a ld a, c cp CH7 ld a, $0 jr z, .sfxNoiseChannel ; only two params for noise channel push de - call GetNextMusicByte + call Music2_GetNextMusicByte pop de .sfxNoiseChannel ld d, a @@ -19107,31 +19107,31 @@ Music_unknownsfx0x20: ; 0x9472 call Func_964b ret -Music_unknownsfx0x10: +Music2_unknownsfx0x10: ld a, c cp CH4 - jr c, Music_note ; if not a sfx + jr c, Music2_note ; if not a sfx ld a, d cp $10 ; is this command a unknownsfx0x10? - jr nz, Music_note ; no - ld b, $0 ; yes + jr nz, Music2_note ; no + ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, Music_note ; no - call GetNextMusicByte + jr nz, Music2_note ; no + call Music2_GetNextMusicByte ; yes ld [$ff00+$10], a - jp Music_endchannel + jp Music2_endchannel -Music_note: +Music2_note: ld a, c cp CH3 - jr nz, Music_notelength ; if not noise channel + jr nz, Music2_notelength ; if not noise channel ld a, d and $f0 cp $b0 ; is this command a dnote? - jr z, Music_dnote ; yes - jr nc, Music_notelength ; no + jr z, Music2_dnote ; yes + jr nc, Music2_notelength ; no swap a ld b, a ld a, d @@ -19142,12 +19142,12 @@ Music_note: push bc jr asm_94fd -Music_dnote: +Music2_dnote: ld a, d and $f push af push bc - call GetNextMusicByte ; get dnote instrument + call Music2_GetNextMusicByte ; get dnote instrument asm_94fd ld d, a ld a, [$c003] @@ -19159,7 +19159,7 @@ asm_94fd pop bc pop de -Music_notelength: ; 0x950a +Music2_notelength: ; 0x950a ld a, d push af and $f @@ -19209,15 +19209,15 @@ Music_notelength: ; 0x950a ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, Music_notepitch + jr nz, Music2_notepitch ld hl, $c02e add hl, bc bit 2, [hl] - jr z, Music_notepitch + jr z, Music2_notepitch pop hl ret -Music_notepitch: ; 0x9568 +Music2_notepitch: ; 0x9568 pop af and $f0 cp $c0 ; compare to rest @@ -19236,7 +19236,7 @@ Music_notepitch: ; 0x9568 cp CH2 jr z, .musicChannel3 cp CH6 - jr nz, .notsfxChannel3 + jr nz, .notSfxChannel3 .musicChannel3 ld b, $0 ld hl, Unknown_9b1f @@ -19245,7 +19245,7 @@ Music_notepitch: ; 0x9568 and [hl] ld [$ff00+$25], a jr .done -.notsfxChannel3 +.notSfxChannel3 ld b, $2 call Func_9838 ld a, $8 @@ -19373,7 +19373,7 @@ Func_964b: ; 0x964b cp CH2 jr z, .channel3 cp CH6 - jr nz, .notsfxChannel3 + jr nz, .notSfxChannel3 ; fall through .channel3 push de @@ -19386,7 +19386,7 @@ Func_964b: ; 0x964b add a ld d, $0 ld e, a - ld hl, Unknown_8361 + ld hl, Music2_Channel3DutyPointers add hl, de ld e, [hl] inc hl @@ -19406,7 +19406,7 @@ Func_964b: ; 0x964b ld a, $80 ld [$ff00+$1a], a pop de -.notsfxChannel3 +.notSfxChannel3 ld a, d or $80 and $c7 @@ -19496,7 +19496,7 @@ Func_96e5: ; 0x96e5 scf ret -Music_ApplyPitchBend: ; 0x96f9 +Music2_ApplyPitchBend: ; 0x96f9 ld hl, $c02e add hl, bc bit 5, [hl] @@ -19687,7 +19687,7 @@ Func_978f: ; 0x978f ld [hl], a ret -Music_ApplyDutyCycle: ; 0x980d +Music2_ApplyDutyCycle: ; 0x980d ld b, $0 ld hl, $c046 add hl, bc @@ -19705,7 +19705,7 @@ Music_ApplyDutyCycle: ; 0x980d ld [hl], a ret -GetNextMusicByte: ; 0x9825 +Music2_GetNextMusicByte: ; 0x9825 ld d, $0 ld a, c add a @@ -19739,17 +19739,17 @@ Func_9838: ; 0x9838 Func_9847: ; 0x9847 ld h, $0 -.asm_9849 +.loop srl a - jr nc, .asm_984e + jr nc, .noCarry add hl, de -.asm_984e +.noCarry sla e rl d and a - jr z, .asm_9857 - jr .asm_9849 -.asm_9857 + jr z, .done + jr .loop +.done ret Func_9858: ; 0x9858 @@ -19764,14 +19764,14 @@ Func_9858: ; 0x9858 inc hl ld d, [hl] ld a, b -.asm_9866 +.loop cp $7 - jr z, .asm_9871 + jr z, .done sra d rr e inc a - jr .asm_9866 -.asm_9871 + jr .loop +.done ld a, $8 add d ld d, a @@ -19796,53 +19796,53 @@ Func_9876: ; 0x9876 ld [$c0e7], a ld d, $8 ld hl, $c016 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c006 - call FillMusicRAM + call FillMusicRAM2 ld d, $4 ld hl, $c026 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c02e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c03e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c046 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c04e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c056 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c05e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c066 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c06e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c036 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c076 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c07e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c086 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c08e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c096 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c09e - call FillMusicRAM + call FillMusicRAM2 ld hl, $c0a6 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c0ae - call FillMusicRAM + call FillMusicRAM2 ld a, $1 ld hl, $c0be - call FillMusicRAM + call FillMusicRAM2 ld hl, $c0b6 - call FillMusicRAM + call FillMusicRAM2 ld hl, $c0c6 - call FillMusicRAM + call FillMusicRAM2 ld [$c0e8], a ld a, $ff ld [$c004], a @@ -20039,11 +20039,11 @@ Func_9a34: ; 0x9a34 ld [$c0e7], a ld d, $a0 ld hl, $c006 - call FillMusicRAM + call FillMusicRAM2 ld a, $1 ld d, $18 ld hl, $c0b6 - call FillMusicRAM + call FillMusicRAM2 ld [$c0e8], a ld [$c0ea], a ld a, $ff @@ -20051,7 +20051,7 @@ Func_9a34: ; 0x9a34 ret ; fills d bytes at hl with a -FillMusicRAM: ; 0x9a89 +FillMusicRAM2: ; 0x9a89 ld b, d .loop ld [hli], a @@ -20140,7 +20140,7 @@ Func_9a8f: ; 0x9a8f ld [hli], a ld [hl], a ld hl, $c012 ; sfx noise channel pointer - ld de, Noise_endchannel + ld de, Noise2_endchannel ld [hl], e inc hl ld [hl], d ; overwrite pointer to point to endchannel @@ -20154,7 +20154,7 @@ Func_9a8f: ; 0x9a8f .asm_9b15 ret -Noise_endchannel: ; 0x9b16 +Noise2_endchannel: ; 0x9b16 endchannel Unknown_9b17: ; 0x9b17 @@ -114032,8 +114032,31 @@ INCLUDE "music/sfx/sfx_1f_11.tx" INCLUDE "music/sfx/sfx_1f_12.tx" INCLUDE "music/sfx/sfx_1f_13.tx" -Unknown_7c361: ; 7c361 (1f:4361) -INCBIN "baserom.gbc",$7c361,$7c3c3 - $7c361 +Music1f_Channel3DutyPointers: ; 7c361 (1f:4361) + dw Music1f_Channel3Duty1 + dw Music1f_Channel3Duty2 + dw Music1f_Channel3Duty3 + dw Music1f_Channel3Duty4 + dw Music1f_Channel3Duty5 + dw SFX_1f_3f_Ch1 + dw SFX_1f_3f_Ch1 + dw SFX_1f_3f_Ch1 + dw SFX_1f_3f_Ch1 + +Music1f_Channel3Duty1: ; 7c373 (1f:4373) + db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 + +Music1f_Channel3Duty2: ; 7c383 (1f:4383) + db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 + +Music1f_Channel3Duty3: ; 7c393 (1f:4393) + db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 + +Music1f_Channel3Duty4: ; 7c3a3 (1f:43a3) + db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 + +Music1f_Channel3Duty5: ; 7c3b3 (1f:43b3) + db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 INCLUDE "music/sfx/sfx_1f_3f.tx" INCLUDE "music/sfx/sfx_1f_56.tx" @@ -114082,9 +114105,7 @@ INCLUDE "music/sfx/sfx_1f_64.tx" INCLUDE "music/sfx/sfx_1f_65.tx" INCLUDE "music/sfx/sfx_1f_66.tx" INCLUDE "music/sfx/sfx_1f_67.tx" - -INCBIN "baserom.gbc",$7c758,$7c7a4 - $7c758 - +INCLUDE "music/sfx/sfx_1f_unused.tx" INCLUDE "music/sfx/sfx_1f_1d.tx" INCLUDE "music/sfx/sfx_1f_37.tx" INCLUDE "music/sfx/sfx_1f_38.tx" @@ -114124,25 +114145,24 @@ INCLUDE "music/sfx/sfx_1f_34.tx" INCLUDE "music/sfx/sfx_1f_35.tx" INCLUDE "music/sfx/sfx_1f_36.tx" -; known jump sources: 441b0 (11:41b0) Func_7d13b: ; 7d13b (1f:513b) ld a, [$FF00+$dc] ld c, $0 - ld hl, Unknown_7d170 ; $5170 -.asm_7d142 + ld hl, OwnedMonValues +.getSfxPointer cp [hl] - jr c, .asm_7d149 + jr c, .gotSfxPointer inc c inc hl - jr .asm_7d142 -.asm_7d149 + jr .getSfxPointer +.gotSfxPointer push bc ld a, $ff ld [$c0ee], a call PlaySoundWaitForCurrent pop bc ld b, $0 - ld hl, Unknown_7d162 ; $5162 + ld hl, PokedexRatingSfxPointers add hl, bc add hl, bc ld a, [hli] @@ -114150,29 +114170,42 @@ Func_7d13b: ; 7d13b (1f:513b) call PlayMusic jp Func_2307 -Unknown_7d162: ; 7d162 (1f:5162) -INCBIN "baserom.gbc",$7d162,$7d170 - $7d162 - -Unknown_7d170: ; 7d170 (1f:5170) -INCBIN "baserom.gbc",$7d170,$7d177 - $7d170 +PokedexRatingSfxPointers: ; 7d162 (1f:5162) + db (SFX_1f_51 - $4000) / 3 + db BANK(SFX_1f_51) + db (SFX_02_41 - $4000) / 3 + db BANK(SFX_02_41) + db (SFX_02_3a - $4000) / 3 + db BANK(SFX_02_3a) + db (SFX_08_46 - $4000) / 3 + db BANK(SFX_08_46) + db (SFX_08_3a - $4000) / 3 + db BANK(SFX_08_3a) + db (SFX_02_42 - $4000) / 3 + db BANK(SFX_02_42) + db (SFX_02_3b - $4000) / 3 + db BANK(SFX_02_3b) + +OwnedMonValues: ; 7d170 (1f:5170) + db 10, 40, 60, 90, 120, 150, $ff Func_7d177: ; 7d177 (1f:5177) - ld c, $0 -.asm_7d179 + ld c, CH0 +.loop ld b, $0 ld hl, $c026 add hl, bc ld a, [hl] and a - jr z, .asm_7d1a5 + jr z, .nextChannel ld a, c - cp $4 - jr nc, .asm_7d1a2 + cp CH4 + jr nc, .applyAffects ; if sfx channel ld a, [$c002] and a - jr z, .asm_7d1a2 + jr z, .applyAffects bit 7, a - jr nz, .asm_7d1a5 + jr nz, .nextChannel set 7, a ld [$c002], a xor a @@ -114180,122 +114213,130 @@ Func_7d177: ; 7d177 (1f:5177) ld [$FF00+$1a], a ld a, $80 ld [$FF00+$1a], a - jr .asm_7d1a5 -.asm_7d1a2 - call Func_7d1ac -.asm_7d1a5 + jr .nextChannel +.applyAffects + call Music1f_Music2_ApplyMusicAffects +.nextChannel ld a, c - inc c - cp $7 - jr nz, .asm_7d179 + inc c ; inc channel number + cp CH7 + jr nz, .loop ret -; known jump sources: 7d1a2 (1f:51a2) -Func_7d1ac: ; 7d1ac (1f:51ac) +; this routine checks flags for music effects currently applied +; to the channel and calls certain functions based on flags. +; known flags for $c02e: +; 1: call has been used +; 3: a toggle used only by this routine for vibrato +; 4: pitchbend flag +; 6: dutycycle flag +Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld b, $0 - ld hl, $c0b6 + ld hl, $c0b6 ; delay until next note add hl, bc ld a, [hl] - cp $1 - jp z, Func_7d244 - dec a + cp $1 ; if delay is 1, play next note + jp z, Music1f_Music2_PlayNextNote + dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp $4 - jr nc, .asm_7d1c8 + cp CH4 + jr nc, .startChecks ; if a sfx channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr z, .asm_7d1c8 + jr z, .startChecks ret -.asm_7d1c8 +.startChecks ld hl, $c02e add hl, bc - bit 6, [hl] - jr z, .asm_7d1d3 - call Func_7d881 -.asm_7d1d3 + bit 6, [hl] ; dutycycle + jr z, .checkForexecutemusic + call Music1f_ApplyDutyCycle +.checkForexecutemusic ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_7d1e5 + jr nz, .checkForPitchBend ld hl, $c02e add hl, bc bit 2, [hl] - jr nz, .asm_7d1f9 -.asm_7d1e5 + jr nz, .disablePitchBendVibrato +.checkForPitchBend ld hl, $c02e add hl, bc - bit 4, [hl] - jr z, .asm_7d1f0 - jp Func_7d76d -.asm_7d1f0 - ld hl, $c04e + bit 4, [hl] ; pitchbend + jr z, .checkVibratoDelay + jp Music1f_ApplyPitchBend +.checkVibratoDelay + ld hl, $c04e ; vibrato delay add hl, bc ld a, [hl] - and a - jr z, .asm_7d1fa - dec [hl] -.asm_7d1f9 + and a ; check if delay is over + jr z, .checkForVibrato + dec [hl] ; otherwise, dec delay +.disablePitchBendVibrato ret -.asm_7d1fa - ld hl, $c056 +.checkForVibrato + ld hl, $c056 ; vibrato rate add hl, bc ld a, [hl] and a - jr nz, .asm_7d203 - ret -.asm_7d203 + jr nz, .vibrato + ret ; no vibrato +.vibrato ld d, a ld hl, $c05e add hl, bc ld a, [hl] and $f and a - jr z, .asm_7d210 - dec [hl] + jr z, .vibratoAlreadyDone + dec [hl] ; apply vibrato pitch change ret -.asm_7d210 +.vibratoAlreadyDone ld a, [hl] swap [hl] or [hl] - ld [hl], a + ld [hl], a ; reset the vibrato value and start again ld hl, $c066 add hl, bc - ld e, [hl] + ld e, [hl] ; get note pitch ld hl, $c02e add hl, bc - bit 3, [hl] - jr z, .asm_7d230 + bit 3, [hl] ; this is the only code that sets/resets bit three so + jr z, .unset ; it continuously alternates which path it takes res 3, [hl] ld a, d and $f ld d, a ld a, e sub d - jr nc, .asm_7d22e + jr nc, .noCarry ld a, $0 -.asm_7d22e - jr .asm_7d23c -.asm_7d230 +.noCarry + jr .done +.unset set 3, [hl] ld a, d and $f0 swap a add e - jr nc, .asm_7d23c + jr nc, .done ld a, $ff -.asm_7d23c +.done ld d, a ld b, $3 call Func_7d8ac ld [hl], d ret -; known jump sources: 7d1b5 (1f:51b5) -Func_7d244: ; 7d244 (1f:5244) +; this routine executes all music commands that take up no time, +; like tempo changes, duty changes etc. and doesn't return +; until the first note is reached +Music1f_Music2_PlayNextNote: ; 7d244 (1f:5244) ld hl, $c06e add hl, bc ld a, [hl] @@ -114306,36 +114347,35 @@ Func_7d244: ; 7d244 (1f:5244) add hl, bc res 4, [hl] res 5, [hl] - call Func_7d25a + call Music1f_endchannel ret -; known jump sources: 7d256 (1f:5256), 7d2b0 (1f:52b0), 7d31a (1f:531a), 7d33c (1f:533c), 7d355 (1f:5355), 7d394 (1f:5394), 7d3a6 (1f:53a6), 7d3de (1f:53de), 7d42b (1f:542b), 7d46b (1f:546b), 7d478 (1f:5478), 7d497 (1f:5497), 7d4b5 (1f:54b5), 7d4c1 (1f:54c1), 7d4d0 (1f:54d0), 7d4e3 (1f:54e3), 7d54c (1f:554c) -Func_7d25a: ; 7d25a (1f:525a) - call Func_7d899 +Music1f_endchannel: ; 7d25a (1f:525a) + call Music1f_GetNextMusicByte ld d, a - cp $ff - jp nz, Func_7d2e8 - ld b, $0 + cp $ff ; is this command an endchannel? + jp nz, Music1f_callchannel ; no + ld b, $0 ; yes ld hl, $c02e add hl, bc bit 1, [hl] - jr nz, .asm_7d298 + jr nz, .returnFromCall ld a, c - cp $3 - jr nc, .asm_7d274 + cp CH3 + jr nc, .noiseOrSfxChannel jr .asm_7d2b3 -.asm_7d274 +.noiseOrSfxChannel res 2, [hl] ld hl, $c036 add hl, bc res 0, [hl] - cp $6 - jr nz, .asm_7d288 + cp CH6 + jr nz, .notSfxChannel3 ld a, $0 ld [$FF00+$1a], a ld a, $80 ld [$FF00+$1a], a -.asm_7d288 +.notSfxChannel3 jr nz, .asm_7d296 ld a, [$c003] and a @@ -114345,7 +114385,7 @@ Func_7d25a: ; 7d25a (1f:525a) jr .asm_7d2b3 .asm_7d296 jr .asm_7d2bc -.asm_7d298 +.returnFromCall res 1, [hl] ld d, $0 ld a, c @@ -114353,7 +114393,7 @@ Func_7d25a: ; 7d25a (1f:525a) ld e, a ld hl, $c006 add hl, de - push hl + push hl ; store current channel address ld hl, $c016 add hl, de ld e, l @@ -114363,10 +114403,10 @@ Func_7d25a: ; 7d25a (1f:525a) ld [hli], a inc de ld a, [de] - ld [hl], a - jp Func_7d25a + ld [hl], a ; loads channel address to return to + jp Music1f_endchannel .asm_7d2b3 - ld hl, Unknown_7db93 ; $5b93 + ld hl, Unknown_7db93 add hl, bc ld a, [$FF00+$25] and [hl] @@ -114384,7 +114424,7 @@ Func_7d25a: ; 7d25a (1f:525a) jr .asm_7d2e2 .asm_7d2d0 ld a, c - cp $4 + cp CH4 jr z, .asm_7d2d9 call Func_7d73b ret c @@ -114399,17 +114439,16 @@ Func_7d25a: ; 7d25a (1f:525a) ld [hl], b ret -; known jump sources: 7d260 (1f:5260) -Func_7d2e8: ; 7d2e8 (1f:52e8) - cp $fd - jp nz, Func_7d31d - call Func_7d899 +Music1f_callchannel: ; 7d2e8 (1f:52e8) + cp $fd ; is this command a callchannel? + jp nz, Music1f_loopchannel ; no + call Music1f_GetNextMusicByte ; yes push af - call Func_7d899 + call Music1f_GetNextMusicByte ld d, a pop af ld e, a - push de + push de ; store pointer ld d, $0 ld a, c add a @@ -114426,43 +114465,43 @@ Func_7d2e8: ; 7d2e8 (1f:52e8) ld [de], a inc de ld a, [hld] - ld [de], a + ld [de], a ; copy current channel address pop de ld [hl], e inc hl - ld [hl], d + ld [hl], d ; overwrite current address with pointer ld b, $0 ld hl, $c02e add hl, bc - set 1, [hl] - jp Func_7d25a + set 1, [hl] ; set the call flag + jp Music1f_endchannel -; known jump sources: 7d2ea (1f:52ea) -Func_7d31d: ; 7d31d (1f:531d) - cp $fe - jp nz, Func_7d358 - call Func_7d899 +Music1f_loopchannel: ; 7d31d (1f:531d) + cp $fe ; is this command a loopchannel? + jp nz, Music1f_notetype ; no + call Music1f_GetNextMusicByte ; yes ld e, a and a - jr z, .asm_7d341 + jr z, .infiniteLoop ld b, $0 ld hl, $c0be add hl, bc ld a, [hl] cp e - jr nz, .asm_7d33f - ld a, $1 + jr nz, .loopAgain + ld a, $1 ; if no more loops to make ld [hl], a - call Func_7d899 - call Func_7d899 - jp Func_7d25a -.asm_7d33f + call Music1f_GetNextMusicByte ; skip pointer + call Music1f_GetNextMusicByte + jp Music1f_endchannel +.loopAgain ; inc loop count inc a ld [hl], a -.asm_7d341 - call Func_7d899 + ; fall through +.infiniteLoop ; overwrite current address with pointer + call Music1f_GetNextMusicByte push af - call Func_7d899 + call Music1f_GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -114473,73 +114512,76 @@ Func_7d31d: ; 7d31d (1f:531d) pop af ld [hli], a ld [hl], b - jp Func_7d25a + jp Music1f_endchannel -; known jump sources: 7d31f (1f:531f) -Func_7d358: ; 7d358 (1f:5358) +Music1f_notetype: ; 7d358 (1f:5358) and $f0 - cp $d0 - jp nz, Func_7d397 - ld a, d + cp $d0 ; is this command a notetype? + jp nz, Music1f_togglecall ; no + ld a, d ; yes and $f ld b, $0 ld hl, $c0c6 add hl, bc - ld [hl], a + ld [hl], a ; store low nibble as speed ld a, c - cp $3 - jr z, .asm_7d394 - call Func_7d899 + cp CH3 + jr z, .noiseChannel ; noise channel has 0 params + call Music1f_GetNextMusicByte ld d, a ld a, c - cp $2 - jr z, .asm_7d380 - cp $6 - jr nz, .asm_7d38d + cp CH2 + jr z, .musicChannel3 + cp CH6 + jr nz, .notChannel3 ld hl, $c0e7 - jr .asm_7d383 -.asm_7d380 + jr .sfxChannel3 +.musicChannel3 ld hl, $c0e6 -.asm_7d383 +.sfxChannel3 ld a, d and $f - ld [hl], a + ld [hl], a ; store low nibble of param as duty ld a, d and $30 sla a ld d, a -.asm_7d38d + ; fall through + + ; if channel 3, store high nibble as volume + ; else, store volume (high nibble) and fade (low nibble) +.notChannel3 ld b, $0 ld hl, $c0de add hl, bc ld [hl], d -.asm_7d394 - jp Func_7d25a +.noiseChannel + jp Music1f_endchannel -; known jump sources: 7d35c (1f:535c) -Func_7d397: ; 7d397 (1f:5397) +Music1f_togglecall: ; 7d397 (1f:5397) ld a, d - cp $e8 - jr nz, .asm_7d3a9 - ld b, $0 + cp $e8 ; is this command an togglecall? + jr nz, Music1f_vibrato ; no + ld b, $0 ; yes ld hl, $c02e add hl, bc ld a, [hl] xor $1 - ld [hl], a - jp Func_7d25a -.asm_7d3a9 - cp $ea - jr nz, .asm_7d3e1 - call Func_7d899 + ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) + jp Music1f_endchannel + +Music1f_vibrato: ; 7d3a9 (1f:53a9) + cp $ea ; is this command a vibrato? + jr nz, Music1f_pitchbend ; no + call Music1f_GetNextMusicByte ; yes ld b, $0 ld hl, $c04e add hl, bc - ld [hl], a + ld [hl], a ; store delay ld hl, $c06e add hl, bc - ld [hl], a - call Func_7d899 + ld [hl], a ; store delay + call Music1f_GetNextMusicByte ld d, a and $f0 swap a @@ -114551,7 +114593,7 @@ Func_7d397: ; 7d397 (1f:5397) adc b swap a or e - ld [hl], a + ld [hl], a ; store rate as both high and low nibbles ld a, d and $f ld d, a @@ -114559,17 +114601,18 @@ Func_7d397: ; 7d397 (1f:5397) add hl, bc swap a or d - ld [hl], a - jp Func_7d25a -.asm_7d3e1 - cp $eb - jr nz, .asm_7d419 - call Func_7d899 + ld [hl], a ; store depth as both high and low nibbles + jp Music1f_endchannel + +Music1f_pitchbend: ; 7d3e1 (1f:53e1) + cp $eb ; is this command a pitchbend? + jr nz, Music1f_duty ; no + call Music1f_GetNextMusicByte ; yes ld b, $0 ld hl, $c076 add hl, bc - ld [hl], a - call Func_7d899 + ld [hl], a ; store first param + call Music1f_GetNextMusicByte ld d, a and $f0 swap a @@ -114580,132 +114623,142 @@ Func_7d397: ; 7d397 (1f:5397) ld b, $0 ld hl, $c0a6 add hl, bc - ld [hl], d + ld [hl], d ; store unknown part of second param ld hl, $c0ae add hl, bc - ld [hl], e + ld [hl], e ; store unknown part of second param ld b, $0 ld hl, $c02e add hl, bc - set 4, [hl] - call Func_7d899 + set 4, [hl] ; set pitchbend flag + call Music1f_GetNextMusicByte ld d, a - jp Func_7d57e -.asm_7d419 - cp $ec - jr nz, .asm_7d42e - call Func_7d899 + jp Music1f_notelength + +Music1f_duty: ; 7d419 (1f:5419) + cp $ec ; is this command a duty? + jr nz, Music1f_tempo ; no + call Music1f_GetNextMusicByte ; yes rrca rrca and $c0 ld b, $0 ld hl, $c03e add hl, bc - ld [hl], a - jp Func_7d25a -.asm_7d42e - cp $ed - jr nz, .asm_7d46e - ld a, c - cp $4 - jr nc, .asm_7d452 - call Func_7d899 - ld [$c0e8], a - call Func_7d899 - ld [$c0e9], a + ld [hl], a ; store duty + jp Music1f_endchannel + +Music1f_tempo: ; 7d42e (1f:542e) + cp $ed ; is this command a tempo? + jr nz, Music1f_unknownmusic0xee ; no + ld a, c ; yes + cp CH4 + jr nc, .sfxChannel + call Music1f_GetNextMusicByte + ld [$c0e8], a ; store first param + call Music1f_GetNextMusicByte + ld [$c0e9], a ; store second param xor a - ld [$c0ce], a + ld [$c0ce], a ; clear RAM ld [$c0cf], a ld [$c0d0], a ld [$c0d1], a - jr .asm_7d46b -.asm_7d452 - call Func_7d899 - ld [$c0ea], a - call Func_7d899 - ld [$c0eb], a + jr .musicChannelDone +.sfxChannel + call Music1f_GetNextMusicByte + ld [$c0ea], a ; store first param + call Music1f_GetNextMusicByte + ld [$c0eb], a ; store second param xor a - ld [$c0d2], a + ld [$c0d2], a ; clear RAM ld [$c0d3], a ld [$c0d4], a ld [$c0d5], a -.asm_7d46b - jp Func_7d25a -.asm_7d46e - cp $ee - jr nz, .asm_7d47b - call Func_7d899 - ld [$c004], a - jp Func_7d25a -.asm_7d47b - cp $ef - jr nz, .asm_7d49a - call Func_7d899 +.musicChannelDone + jp Music1f_endchannel + +Music1f_unknownmusic0xee: ; 7d46e (1f:546e) + cp $ee ; is this command an unknownmusic0xee? + jr nz, Music1f_unknownmusic0xef ; no + call Music1f_GetNextMusicByte ; yes + ld [$c004], a ; store first param + jp Music1f_endchannel + +; this appears to never be used +Music1f_unknownmusic0xef: ; 7d47b (1f:547b) + cp $ef ; is this command an unknownmusic0xef? + jr nz, Music1f_dutycycle ; no + call Music1f_GetNextMusicByte ; yes push bc call Func_7d8ea pop bc ld a, [$c003] and a - jr nz, .asm_7d497 + jr nz, .skip ld a, [$c02d] ld [$c003], a xor a ld [$c02d], a -.asm_7d497 - jp Func_7d25a -.asm_7d49a - cp $fc - jr nz, .asm_7d4b8 - call Func_7d899 +.skip + jp Music1f_endchannel + +Music1f_dutycycle: ; 7d49a (1f:549a) + cp $fc ; is this command a dutycycle? + jr nz, Music1f_stereopanning ; no + call Music1f_GetNextMusicByte ; yes ld b, $0 ld hl, $c046 add hl, bc - ld [hl], a + ld [hl], a ; store full cycle and $c0 ld hl, $c03e add hl, bc - ld [hl], a + ld [hl], a ; store first duty ld hl, $c02e add hl, bc - set 6, [hl] - jp Func_7d25a -.asm_7d4b8 - cp $f0 - jr nz, .asm_7d4c4 - call Func_7d899 - ld [$FF00+$24], a - jp Func_7d25a -.asm_7d4c4 - cp $f8 - jr nz, .asm_7d4d3 - ld b, $0 + set 6, [hl] ; set duty flag + jp Music1f_endchannel + +Music1f_stereopanning: ; 7d4b8 (1f:54b8) + cp $f0 ; is this command a stereopanning? + jr nz, Music1f_executemusic ; no + call Music1f_GetNextMusicByte ; yes + ld [$FF00+$24], a ; store stereopanning + jp Music1f_endchannel + +Music1f_executemusic: ; 7d4c4 (1f:54c4) + cp $f8 ; is this command an executemusic? + jr nz, Music1f_octave ; no + ld b, $0 ; yes ld hl, $c036 add hl, bc set 0, [hl] - jp Func_7d25a -.asm_7d4d3 + jp Music1f_endchannel + +Music1f_octave: ; 7d4d3 (1f:54d3) and $f0 - cp $e0 - jr nz, .asm_7d4e6 - ld hl, $c0d6 + cp $e0 ; is this command an octave? + jr nz, Music1f_unknownsfx0x20 ; no + ld hl, $c0d6 ; yes ld b, $0 add hl, bc ld a, d and $f - ld [hl], a - jp Func_7d25a -.asm_7d4e6 - cp $20 - jr nz, .asm_7d533 + ld [hl], a ; store low nibble as octave + jp Music1f_endchannel + +Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6) + cp $20 ; is this command an unknownsfx0x20? + jr nz, Music1f_unknownsfx0x10 ; no ld a, c - cp $3 - jr c, .asm_7d533 + cp CH3 ; is this a noise or sfx channel? + jr c, Music1f_unknownsfx0x10 ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_7d533 - call Func_7d57e + jr nz, Music1f_unknownsfx0x10 ; no + call Music1f_notelength ; yes ld d, a ld b, $0 ld hl, $c03e @@ -114716,21 +114769,21 @@ Func_7d397: ; 7d397 (1f:5397) ld b, $1 call Func_7d8ac ld [hl], d - call Func_7d899 + call Music1f_GetNextMusicByte ld d, a ld b, $2 call Func_7d8ac ld [hl], d - call Func_7d899 + call Music1f_GetNextMusicByte ld e, a ld a, c - cp $7 + cp CH7 ld a, $0 - jr z, .asm_7d526 + jr z, .sfxNoiseChannel ; only two params for noise channel push de - call Func_7d899 + call Music1f_GetNextMusicByte pop de -.asm_7d526 +.sfxNoiseChannel ld d, a push de call Func_7d69d @@ -114738,30 +114791,32 @@ Func_7d397: ; 7d397 (1f:5397) pop de call Func_7d6bf ret -.asm_7d533 + +Music1f_unknownsfx0x10 ; 7d533 (1f:5533) ld a, c - cp $4 - jr c, .asm_7d54f + cp CH4 + jr c, Music1f_note ; if not a sfx ld a, d - cp $10 - jr nz, .asm_7d54f + cp $10 ; is this command an unknownsfx0x10? + jr nz, Music1f_note ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_7d54f - call Func_7d899 + jr nz, Music1f_note ; no + call Music1f_GetNextMusicByte ; yes ld [$FF00+$10], a - jp Func_7d25a -.asm_7d54f + jp Music1f_endchannel + +Music1f_note: ; 7d54f (1f:554f) ld a, c - cp $3 - jr nz, Func_7d57e + cp CH3 + jr nz, Music1f_notelength ; if not noise channel ld a, d and $f0 - cp $b0 - jr z, .asm_7d569 - jr nc, Func_7d57e + cp $b0 ; is this command a dnote? + jr z, Music1f_dnote ; yes + jr nc, Music1f_notelength ; no swap a ld b, a ld a, d @@ -114770,14 +114825,15 @@ Func_7d397: ; 7d397 (1f:5397) ld a, b push de push bc - jr .asm_7d571 -.asm_7d569 + jr asm_7d571 + +Music1f_dnote: ; 7d569 (1f:5569) ld a, d and $f push af push bc - call Func_7d899 -.asm_7d571 + call Music1f_GetNextMusicByte ; get dnote instrument +asm_7d571 ld d, a ld a, [$c003] and a @@ -114788,14 +114844,13 @@ Func_7d397: ; 7d397 (1f:5397) pop bc pop de -; known jump sources: 7d416 (1f:5416), 7d4f9 (1f:54f9), 7d552 (1f:5552), 7d55b (1f:555b) -Func_7d57e: ; 7d57e (1f:557e) +Music1f_notelength: ; 7d57e (1f:557e) ld a, d push af and $f inc a ld b, $0 - ld e, a + ld e, a ; store note length (in 16ths) ld d, b ld hl, $c0c6 add hl, bc @@ -114803,24 +114858,24 @@ Func_7d57e: ; 7d57e (1f:557e) ld l, b call Func_7d8bb ld a, c - cp $4 - jr nc, .asm_7d59f + cp CH4 + jr nc, .sfxChannel ld a, [$c0e8] ld d, a ld a, [$c0e9] ld e, a - jr .asm_7d5b2 -.asm_7d59f + jr .skip +.sfxChannel ld d, $1 ld e, $0 - cp $7 - jr z, .asm_7d5b2 + cp CH7 + jr z, .skip ; if noise channel call Func_7d707 ld a, [$c0ea] ld d, a ld a, [$c0eb] ld e, a -.asm_7d5b2 +.skip ld a, l ld b, $0 ld hl, $c0ce @@ -114839,41 +114894,43 @@ Func_7d57e: ; 7d57e (1f:557e) ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_7d5dc + jr nz, Music1f_notepitch ld hl, $c02e add hl, bc bit 2, [hl] - jr z, .asm_7d5dc + jr z, Music1f_notepitch pop hl ret -.asm_7d5dc + +Music1f_notepitch: ; 7d5dc (1f:55dc) pop af and $f0 - cp $c0 - jr nz, .asm_7d613 + cp $c0 ; compare to rest + jr nz, .notRest ld a, c - cp $4 - jr nc, .asm_7d5f0 + cp CH4 + jr nc, .sfxChannel ld hl, $c02a add hl, bc ld a, [hl] and a - jr nz, .asm_7d612 -.asm_7d5f0 + jr nz, .quit + ; fall through +.sfxChannel ld a, c - cp $2 - jr z, .asm_7d5f9 - cp $6 - jr nz, .asm_7d606 -.asm_7d5f9 + cp CH2 + jr z, .musicChannel3 + cp CH6 + jr nz, .notSfxChannel3 +.musicChannel3 ld b, $0 - ld hl, Unknown_7db93 ; $5b93 + ld hl, Unknown_7db93 add hl, bc ld a, [$FF00+$25] and [hl] ld [$FF00+$25], a - jr .asm_7d612 -.asm_7d606 + jr .quit +.notSfxChannel3 ld b, $2 call Func_7d8ac ld a, $8 @@ -114881,9 +114938,9 @@ Func_7d57e: ; 7d57e (1f:557e) inc hl ld a, $80 ld [hl], a -.asm_7d612 +.quit ret -.asm_7d613 +.notRest swap a ld b, $0 ld hl, $c0d6 @@ -114899,20 +114956,20 @@ Func_7d57e: ; 7d57e (1f:557e) .asm_7d62c push de ld a, c - cp $4 - jr nc, .asm_7d641 + cp CH4 + jr nc, .skip ; if sfx Channel ld hl, $c02a ld d, $0 ld e, a add hl, de ld a, [hl] and a - jr nz, .asm_7d63f - jr .asm_7d641 -.asm_7d63f + jr nz, .done + jr .skip +.done pop de ret -.asm_7d641 +.skip ld b, $0 ld hl, $c0de add hl, bc @@ -114938,52 +114995,50 @@ Func_7d57e: ; 7d57e (1f:557e) call Func_7d6bf ret -; known jump sources: 7d52b (1f:552b), 7d651 (1f:5651) Func_7d66c: ; 7d66c (1f:566c) ld b, $0 - ld hl, Unknown_7db9b ; $5b9b + ld hl, Unknown_7db9b add hl, bc ld a, [$FF00+$25] or [hl] ld d, a ld a, c - cp $7 - jr z, .asm_7d687 - cp $4 - jr nc, .asm_7d699 + cp CH7 + jr z, .sfxNoiseChannel + cp CH4 + jr nc, .skip ; if sfx channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr nz, .asm_7d699 -.asm_7d687 + jr nz, .skip +.sfxNoiseChannel ld a, [$c004] - ld hl, Unknown_7db9b ; $5b9b + ld hl, Unknown_7db9b add hl, bc and [hl] ld d, a ld a, [$FF00+$25] - ld hl, Unknown_7db93 ; $5b93 + ld hl, Unknown_7db93 add hl, bc and [hl] or d ld d, a -.asm_7d699 +.skip ld a, d ld [$FF00+$25], a ret -; known jump sources: 7d528 (1f:5528), 7d64e (1f:564e) Func_7d69d: ; 7d69d (1f:569d) ld b, $0 ld hl, $c0b6 add hl, bc ld d, [hl] ld a, c - cp $2 - jr z, .asm_7d6b8 - cp $6 - jr z, .asm_7d6b8 + cp CH2 + jr z, .channel3 ; if music channel 3 + cp CH6 + jr z, .channel3 ; if sfx channel 3 ld a, d and $3f ld d, a @@ -114992,31 +115047,31 @@ Func_7d69d: ; 7d69d (1f:569d) ld a, [hl] or d ld d, a -.asm_7d6b8 +.channel3 ld b, $1 call Func_7d8ac ld [hl], d ret -; known jump sources: 7d52f (1f:552f), 7d668 (1f:5668) Func_7d6bf: ; 7d6bf (1f:56bf) ld a, c - cp $2 - jr z, .asm_7d6c8 - cp $6 - jr nz, .asm_7d6f5 -.asm_7d6c8 + cp CH2 + jr z, .channel3 + cp CH6 + jr nz, .notSfxChannel3 + ; fall through +.channel3 push de ld de, $c0e6 - cp $2 - jr z, .asm_7d6d3 + cp CH2 + jr z, .musicChannel3 ld de, $c0e7 -.asm_7d6d3 +.musicChannel3 ld a, [de] add a ld d, $0 ld e, a - ld hl, Unknown_7c361 ; $4361 + ld hl, Music1f_Channel3DutyPointers add hl, de ld e, [hl] inc hl @@ -115025,18 +115080,18 @@ Func_7d6bf: ; 7d6bf (1f:56bf) ld b, $f ld a, $0 ld [$FF00+$1a], a -.asm_7d6e8 +.loop ld a, [de] inc de ld [hli], a ld a, b dec b and a - jr nz, .asm_7d6e8 + jr nz, .loop ld a, $80 ld [$FF00+$1a], a pop de -.asm_7d6f5 +.notSfxChannel3 ld a, d or $80 and $c7 @@ -115049,7 +115104,6 @@ Func_7d6bf: ; 7d6bf (1f:56bf) call Func_7d729 ret -; known jump sources: 7d5a7 (1f:55a7) Func_7d707: ; 7d707 (1f:5707) call Func_7d759 jr nc, .asm_7d71f @@ -115071,7 +115125,6 @@ Func_7d707: ; 7d707 (1f:5707) .asm_7d728 ret -; known jump sources: 7d703 (1f:5703) Func_7d729: ; 7d729 (1f:5729) call Func_7d759 jr nc, .asm_7d73a @@ -115088,7 +115141,6 @@ Func_7d729: ; 7d729 (1f:5729) .asm_7d73a ret -; known jump sources: 7d2d5 (1f:52d5) Func_7d73b: ; 7d73b (1f:573b) call Func_7d759 jr nc, .asm_7d756 @@ -115112,7 +115164,6 @@ Func_7d73b: ; 7d73b (1f:573b) ccf ret -; known jump sources: 7d707 (1f:5707), 7d729 (1f:5729), 7d73b (1f:573b) Func_7d759: ; 7d759 (1f:5759) ld a, [$c02a] cp $14 @@ -115130,12 +115181,11 @@ Func_7d759: ; 7d759 (1f:5759) scf ret -; known jump sources: 7d1ed (1f:51ed) -Func_7d76d: ; 7d76d (1f:576d) +Music1f_ApplyPitchBend: ; 7d76d (1f:576d) ld hl, $c02e add hl, bc bit 5, [hl] - jp nz, Func_7d7b4 + jp nz, .asm_7d7b4 ld hl, $c09e add hl, bc ld e, [hl] @@ -115168,17 +115218,15 @@ Func_7d76d: ; 7d76d (1f:576d) add hl, bc ld a, [hl] cp d - jp c, Func_7d7fa - jr nz, asm_7d7e7 + jp c, .asm_7d7fa + jr nz, .asm_7d7e7 ld hl, $c0ae add hl, bc ld a, [hl] cp e - jp c, Func_7d7fa - jr asm_7d7e7 - -; known jump sources: 7d773 (1f:5773) -Func_7d7b4: ; 7d7b4 (1f:57b4) + jp c, .asm_7d7fa + jr .asm_7d7e7 +.asm_7d7b4 ld hl, $c09e add hl, bc ld a, [hl] @@ -115208,14 +115256,14 @@ Func_7d7b4: ; 7d7b4 (1f:57b4) add hl, bc ld a, d cp [hl] - jr c, Func_7d7fa - jr nz, asm_7d7e7 + jr c, .asm_7d7fa + jr nz, .asm_7d7e7 ld hl, $c0ae add hl, bc ld a, e cp [hl] - jr c, Func_7d7fa -asm_7d7e7: ; 7d7e7 (1f:57e7) + jr c, .asm_7d7fa +.asm_7d7e7 ld hl, $c09e add hl, bc ld [hl], e @@ -115228,16 +115276,13 @@ asm_7d7e7: ; 7d7e7 (1f:57e7) ld [hli], a ld [hl], d ret - -; known jump sources: 7d7a4 (1f:57a4), 7d7af (1f:57af), 7d7db (1f:57db), 7d7e5 (1f:57e5) -Func_7d7fa: ; 7d7fa (1f:57fa) +.asm_7d7fa ld hl, $c02e add hl, bc res 4, [hl] res 5, [hl] ret -; known jump sources: 7d629 (1f:5629) Func_7d803: ; 7d803 (1f:5803) ld hl, $c096 add hl, bc @@ -115327,8 +115372,7 @@ Func_7d803: ; 7d803 (1f:5803) ld [hl], a ret -; known jump sources: 7d1d0 (1f:51d0) -Func_7d881: ; 7d881 (1f:5881) +Music1f_ApplyDutyCycle: ; 7d881 (1f:5881) ld b, $0 ld hl, $c046 add hl, bc @@ -115346,8 +115390,7 @@ Func_7d881: ; 7d881 (1f:5881) ld [hl], a ret -; known jump sources: 7d25a (1f:525a), 7d2ed (1f:52ed), 7d2f1 (1f:52f1), 7d322 (1f:5322), 7d336 (1f:5336), 7d339 (1f:5339), 7d341 (1f:5341), 7d345 (1f:5345), 7d36e (1f:536e), 7d3ad (1f:53ad), 7d3bc (1f:53bc), 7d3e5 (1f:53e5), 7d3ef (1f:53ef), 7d412 (1f:5412), 7d41d (1f:541d), 7d437 (1f:5437), 7d43d (1f:543d), 7d452 (1f:5452), 7d458 (1f:5458), 7d472 (1f:5472), 7d47f (1f:547f), 7d49e (1f:549e), 7d4bc (1f:54bc), 7d50c (1f:550c), 7d516 (1f:5516), 7d522 (1f:5522), 7d547 (1f:5547), 7d56e (1f:556e) -Func_7d899: ; 7d899 (1f:5899) +Music1f_GetNextMusicByte: ; 7d899 (1f:5899) ld d, $0 ld a, c add a @@ -115358,21 +115401,20 @@ Func_7d899: ; 7d899 (1f:5899) ld e, a ld a, [hld] ld d, a - ld a, [de] + ld a, [de] ; get next music command inc de - ld [hl], e + ld [hl], e ; store address of next command inc hl ld [hl], d ret -; known jump sources: 7d23f (1f:523f), 7d508 (1f:5508), 7d512 (1f:5512), 7d608 (1f:5608), 7d64a (1f:564a), 7d6ba (1f:56ba), 7d6fd (1f:56fd), 7d7f3 (1f:57f3), 7d890 (1f:5890) Func_7d8ac: ; 7d8ac (1f:58ac) ld a, c - ld hl, Unknown_7db8b ; $5b8b + ld hl, Unknown_7db8b add l - jr nc, .asm_7d8b4 + jr nc, .noCarry inc h -.asm_7d8b4 +.noCarry ld l, a ld a, [hl] add b @@ -115380,49 +115422,46 @@ Func_7d8ac: ; 7d8ac (1f:58ac) ld h, $ff ret -; known jump sources: 7d58d (1f:558d), 7d5ba (1f:55ba) Func_7d8bb: ; 7d8bb (1f:58bb) ld h, $0 -.asm_7d8bd +.loop srl a - jr nc, .asm_7d8c2 + jr nc, .noCarry add hl, de -.asm_7d8c2 +.noCarry sla e rl d and a - jr z, .asm_7d8cb - jr .asm_7d8bd -.asm_7d8cb + jr z, .done + jr .loop +.done ret -; known jump sources: 7d3fb (1f:53fb), 7d61c (1f:561c) Func_7d8cc: ; 7d8cc (1f:58cc) ld h, $0 ld l, a add hl, hl ld d, h ld e, l - ld hl, Unknown_7dba3 ; $5ba3 + ld hl, Unknown_7dba3 add hl, de ld e, [hl] inc hl ld d, [hl] ld a, b -.asm_7d8da +.loop cp $7 - jr z, .asm_7d8e5 + jr z, .done sra d rr e inc a - jr .asm_7d8da -.asm_7d8e5 + jr .loop +.done ld a, $8 add d ld d, a ret -; known jump sources: 7d483 (1f:5483), 7d579 (1f:5579) Func_7d8ea: ; 7d8ea (1f:58ea) ld [$c001], a cp $ff @@ -115442,53 +115481,53 @@ Func_7d8ea: ; 7d8ea (1f:58ea) ld [$c0e7], a ld d, $8 ld hl, $c016 - call Func_7dafd + call FillMusicRAM1f ld hl, $c006 - call Func_7dafd + call FillMusicRAM1f ld d, $4 ld hl, $c026 - call Func_7dafd + call FillMusicRAM1f ld hl, $c02e - call Func_7dafd + call FillMusicRAM1f ld hl, $c03e - call Func_7dafd + call FillMusicRAM1f ld hl, $c046 - call Func_7dafd + call FillMusicRAM1f ld hl, $c04e - call Func_7dafd + call FillMusicRAM1f ld hl, $c056 - call Func_7dafd + call FillMusicRAM1f ld hl, $c05e - call Func_7dafd + call FillMusicRAM1f ld hl, $c066 - call Func_7dafd + call FillMusicRAM1f ld hl, $c06e - call Func_7dafd + call FillMusicRAM1f ld hl, $c036 - call Func_7dafd + call FillMusicRAM1f ld hl, $c076 - call Func_7dafd + call FillMusicRAM1f ld hl, $c07e - call Func_7dafd + call FillMusicRAM1f ld hl, $c086 - call Func_7dafd + call FillMusicRAM1f ld hl, $c08e - call Func_7dafd + call FillMusicRAM1f ld hl, $c096 - call Func_7dafd + call FillMusicRAM1f ld hl, $c09e - call Func_7dafd + call FillMusicRAM1f ld hl, $c0a6 - call Func_7dafd + call FillMusicRAM1f ld hl, $c0ae - call Func_7dafd + call FillMusicRAM1f ld a, $1 ld hl, $c0be - call Func_7dafd + call FillMusicRAM1f ld hl, $c0b6 - call Func_7dafd + call FillMusicRAM1f ld hl, $c0c6 - call Func_7dafd + call FillMusicRAM1f ld [$c0e8], a ld a, $ff ld [$c004], a @@ -115506,7 +115545,6 @@ Func_7d8ea: ; 7d8ea (1f:58ea) ld [$FF00+$24], a jp Func_7db03 -; known jump sources: 7d8f4 (1f:58f4), 7d8f7 (1f:58f7), 7d8fe (1f:58fe) Func_7d9c2: ; 7d9c2 (1f:59c2) ld l, a ld e, a @@ -115514,7 +115552,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) ld d, h add hl, hl add hl, de - ld de, SFX_Headers_1f ; $4000 + ld de, SFX_Headers_1f add hl, de ld a, h ld [$c0ec], a @@ -115525,9 +115563,7 @@ Func_7d9c2: ; 7d9c2 (1f:59c2) rlca rlca ld c, a - -; known jump sources: 7daa5 (1f:5aa5) -Func_7d9db: ; 7d9db (1f:59db) +.asm_7d9db ld d, c ld a, c add a @@ -115658,9 +115694,8 @@ Func_7d9db: ; 7d9db (1f:59db) and a jp z, Func_7db03 dec c - jp Func_7d9db + jp .asm_7d9db -; known jump sources: 7d8ef (1f:58ef) Func_7daa8: ; 7daa8 (1f:5aa8) ld a, $80 ld [$FF00+$26], a @@ -115689,27 +115724,26 @@ Func_7daa8: ; 7daa8 (1f:5aa8) ld [$c0e7], a ld d, $a0 ld hl, $c006 - call Func_7dafd + call FillMusicRAM1f ld a, $1 ld d, $18 ld hl, $c0b6 - call Func_7dafd + call FillMusicRAM1f ld [$c0e8], a ld [$c0ea], a ld a, $ff ld [$c004], a ret -; known jump sources: 7d916 (1f:5916), 7d91c (1f:591c), 7d924 (1f:5924), 7d92a (1f:592a), 7d930 (1f:5930), 7d936 (1f:5936), 7d93c (1f:593c), 7d942 (1f:5942), 7d948 (1f:5948), 7d94e (1f:594e), 7d954 (1f:5954), 7d95a (1f:595a), 7d960 (1f:5960), 7d966 (1f:5966), 7d96c (1f:596c), 7d972 (1f:5972), 7d978 (1f:5978), 7d97e (1f:597e), 7d984 (1f:5984), 7d98a (1f:598a), 7d992 (1f:5992), 7d998 (1f:5998), 7d99e (1f:599e), 7dae4 (1f:5ae4), 7daee (1f:5aee) -Func_7dafd: ; 7dafd (1f:5afd) +; fills d bytes at hl with a +FillMusicRAM1f: ; 7dafd (1f:5afd) ld b, d -.asm_7dafe +.loop ld [hli], a dec b - jr nz, .asm_7dafe + jr nz, .loop ret -; known jump sources: 7d9bf (1f:59bf), 7daa1 (1f:5aa1) Func_7db03: ; 7db03 (1f:5b03) ld a, [$c001] ld l, a @@ -115718,12 +115752,12 @@ Func_7db03: ; 7db03 (1f:5b03) ld d, h add hl, hl add hl, de - ld de, SFX_Headers_1f ; $4000 + ld de, SFX_Headers_1f add hl, de ld e, l ld d, h ld hl, $c006 - ld a, [de] + ld a, [de] ; get channel number ld b, a rlca rlca @@ -115761,7 +115795,7 @@ Func_7db03: ; 7db03 (1f:5b03) .asm_7db46 pop bc pop hl - ld a, [de] + ld a, [de] ; get channel pointer ld [hli], a inc de ld a, [de] @@ -115790,11 +115824,11 @@ Func_7db03: ; 7db03 (1f:5b03) ld [hli], a ld [hli], a ld [hl], a - ld hl, $c012 - ld de, Unknown_7db8a ; $5b8a + ld hl, $c012 ; sfx noise channel pointer + ld de, Noise1f_endchannel ld [hl], e inc hl - ld [hl], d + ld [hl], d ; overwrite pointer to point to endchannel ld a, [$c005] and a jr nz, .asm_7db89 @@ -115805,20 +115839,34 @@ Func_7db03: ; 7db03 (1f:5b03) .asm_7db89 ret -Unknown_7db8a: ; 7db8a (1f:5b8a) -INCBIN "baserom.gbc",$7db8a,$7db8b - $7db8a +Noise1f_endchannel: ; 7db8a (1f:5b8a) + endchannel Unknown_7db8b: ; 7db8b (1f:5b8b) -INCBIN "baserom.gbc",$7db8b,$7db93 - $7db8b + db $10, $15, $1A, $1F ; channels 0-3 + db $10, $15, $1A, $1F ; channels 4-7 Unknown_7db93: ; 7db93 (1f:5b93) -INCBIN "baserom.gbc",$7db93,$7db9b - $7db93 + db $EE, $DD, $BB, $77 ; channels 0-3 + db $EE, $DD, $BB, $77 ; channels 4-7 Unknown_7db9b: ; 7db9b (1f:5b9b) -INCBIN "baserom.gbc",$7db9b,$7dba3 - $7db9b + db $11, $22, $44, $88 ; channels 0-3 + db $11, $22, $44, $88 ; channels 4-7 Unknown_7dba3: ; 7dba3 (1f:5ba3) -INCBIN "baserom.gbc",$7dba3,$7dbbb - $7dba3 + dw $F82C + dw $F89D + dw $F907 + dw $F96B + dw $F9CA + dw $FA23 + dw $FA77 + dw $FAC7 + dw $FB12 + dw $FB58 + dw $FB9B + dw $FBDA INCLUDE "music/bikeriding.tx" INCLUDE "music/dungeon1.tx" diff --git a/music/sfx/sfx_1f_unused.asm b/music/sfx/sfx_1f_unused.asm new file mode 100755 index 00000000..773c069e --- /dev/null +++ b/music/sfx/sfx_1f_unused.asm @@ -0,0 +1,32 @@ +SFX_1f_unused_Ch1: ; 7c758 (1f:4758) + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + + +SFX_1f_unused_Ch2: ; 7c773 (1f:4773) + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + + +SFX_1f_unused_Ch3: ; 7c78e (1f:478e) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel +; 0x7c7a4 \ No newline at end of file -- cgit v1.2.3 From 086e76a0108d2ebc3f412a0d4b6764663150e15d Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Thu, 24 Oct 2013 03:04:50 -0400 Subject: Music Engine Bank 8 --- main.asm | 1051 ++++++++++++++++++------------------ music/sfx/sfx_08_pokeflute.asm | 15 + music/sfx/sfx_08_pokeflute_ch3.asm | 14 + music/sfx/sfx_08_unused.asm | 32 ++ music/sfx/sfx_08_unused2.asm | 57 ++ 5 files changed, 657 insertions(+), 512 deletions(-) create mode 100755 music/sfx/sfx_08_pokeflute.asm create mode 100755 music/sfx/sfx_08_pokeflute_ch3.asm create mode 100755 music/sfx/sfx_08_unused.asm create mode 100755 music/sfx/sfx_08_unused2.asm diff --git a/main.asm b/main.asm index 11f4c1e3..68055607 100755 --- a/main.asm +++ b/main.asm @@ -5831,10 +5831,10 @@ asm_2324: ; 2324 (0:2324) jr z, .asm_2343 cp $2 jr z, .asm_2332 - ld a, $d2 + ld a, (Music_BikeRiding - $4000) / 3 jr .asm_2334 .asm_2332 - ld a, $d6 + ld a, (Music_Surfing - $4000) / 3 .asm_2334 ld b, a ld a, d @@ -7038,7 +7038,7 @@ DisplayStartMenu: ; 2acd (0:2acd) ld [$2000],a ; ROM bank 4 ld a,[$d700] ; walking/biking/surfing ld [$d11a],a - ld a,$8f ; Start menu sound + ld a, (SFX_02_3f - $4000) / 3 ; Start menu sound call PlaySound RedisplayStartMenu: ; 2adf (0:2adf) @@ -7167,7 +7167,7 @@ AddAmountSoldToMoney: ; 2b9e (0:2b9e) ld a,$13 ld [$d125],a call DisplayTextBoxID ; redraw money text box - ld a,$b2 + ld a, (SFX_02_5a - $4000) / 3 call PlaySoundWaitForCurrent ; play sound jp WaitForSoundToFinish ; wait until sound is done playing @@ -11113,7 +11113,7 @@ INCBIN "baserom.gbc",$43db,$43ea - $43db call PrintGameVersionOnTitleScreen call Delay3 call WaitForSoundToFinish - ld a, $c3 + ld a, (Music_TitleScreen - $4000) / 3 ld [$c0ee], a call PlaySound xor a @@ -13305,8 +13305,8 @@ Func_5317: ; 5317 (1:5317) call Predef ; indirect jump to HealParty (f6a5 (3:76a5)) jp Func_577d .asm_5506 - ld c, $1f - ld a, $d9 + ld c, BANK(Music_GameCorner) + ld a, (Music_GameCorner - $4000) / 3 call PlayMusic jr Func_551c @@ -13945,9 +13945,9 @@ Func_5a5f: ; 5a5f (1:5a5f) ld [$FF00+$b5], a ld a, $a ld [W_CURCHANNELPOINTER], a - ld a, $2 + ld a, BANK(Music_Celadon) ld [$c0f0], a - ld a, $ca + ld a, (Music_Celadon - $4000) / 3 ld [$c0ee], a jp PlaySound @@ -14756,9 +14756,9 @@ Func_60ca: ; 60ca (1:60ca) OakSpeech: ; 6115 (1:6115) ld a,$FF call PlaySound ; stop music - ld a,2 ; bank of song + ld a, BANK(Music_Routes2) ; bank of song ld c,a - ld a,$EF ; song # + ld a, (Music_Routes2 - $4000) / 3 ; song # call PlayMusic ; plays music call ClearScreen call LoadTextBoxTilePatterns @@ -18567,9 +18567,9 @@ Music2_ApplyMusicAffects: ; 0x9138 ld hl, $c02e add hl, bc bit 6, [hl] ; dutycycle - jr z, .checkForexecutemusic + jr z, .checkForExecuteMusic call Music2_ApplyDutyCycle -.checkForexecutemusic +.checkForExecuteMusic ld b, $0 ld hl, $c036 add hl, bc @@ -20190,12 +20190,12 @@ Music_RivalAlternateStart: ; 0x9b47 call PlayMusic ld hl, $c006 ld de, Music_MeetRival_branch_b1a2 - call OverwriteChannelPointer + call Music2_OverwriteChannelPointer ld de, Music_MeetRival_branch_b21d - call OverwriteChannelPointer + call Music2_OverwriteChannelPointer ld de, Music_MeetRival_branch_b2b5 -OverwriteChannelPointer: ; 0x9b60 +Music2_OverwriteChannelPointer: ; 0x9b60 ld a, e ld [hli], a ld a, d @@ -20209,14 +20209,14 @@ Music_RivalAlternateTempo: ; 0x9b65 call PlayMusic ld hl, $c006 ld de, Music_MeetRival_branch_b119 - jp OverwriteChannelPointer + jp Music2_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo: ; 0x9b75 call Music_RivalAlternateStart ld hl, $c006 ld de, Music_MeetRival_branch_b19b - jp OverwriteChannelPointer + jp Music2_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo: ; 0x9b81 @@ -20232,7 +20232,7 @@ Music_Cities1AlternateTempo: ; 0x9b81 call PlayMusic ld hl, $c006 ld de, Music_Cities1_branch_aa6f - jp OverwriteChannelPointer + jp Music2_OverwriteChannelPointer INCLUDE "music/pkmnhealed.tx" INCLUDE "music/routes1.tx" @@ -27593,8 +27593,8 @@ ItemUsePokeflute: ; e140 (3:6140) and a,$80 jr nz,.skipMusic call WaitForSoundToFinish ; wait for sound to end - ld b, BANK(Func_22306) - ld hl, Func_22306 + ld b, BANK(Music_PokeFluteInBattle) + ld hl, Music_PokeFluteInBattle call Bankswitch ; play in-battle pokeflute music .musicWaitLoop ; wait for music to finish playing ld a,[$c02c] @@ -27666,8 +27666,8 @@ PlayedFluteHadEffectText: ; e215 (3:6215) ; play out-of-battle pokeflute music ld a,$ff call PlaySound ; turn off music - ld a,$b8 - ld c,$02 + ld a, (SFX_02_5e - $4000) / 3 + ld c, BANK(SFX_02_5e) call PlayMusic ; play music .musicWaitLoop ; wait for music to finish playing ld a,[$c028] @@ -35552,9 +35552,9 @@ PalletTownScript1: ; 18e81 (6:4e81) ld [$D528],a ld a,$FF call PlaySound ; stop music - ld a,2 + ld a, BANK(Music_MeetProfOak) ld c,a ; song bank - ld a,$DB ; “oak appears” music + ld a, (Music_MeetProfOak - $4000) / 3 ; “oak appears” music call PlayMusic ; plays music ld a,$FC ld [W_JOYPADFORBIDDENBUTTONSMASK],a @@ -36484,8 +36484,8 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld [$c0ee], a call PlaySound .asm_19512 - ld c, $2 - ld a, $de + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic xor a ld [H_CURRENTPRESSEDBUTTONS], a @@ -39741,8 +39741,8 @@ OaksLabScript10: ; 1cd6d (7:4d6d) call Func_34a6 ; face object ld a, $8 ld [$d528], a - ld c, $2 - ld a, $de + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ; play music ld a, $f ld [$ff00+$8c], a @@ -41792,8 +41792,8 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld [W_JOYPADFORBIDDENBUTTONSMASK], a ld [$c0ee], a call PlaySound - ld c, $1f - ld a, $d6 + ld c, BANK(Music_Surfing) + ld a, (Music_Surfing - $4000) / 3 call PlayMusic ld b, BANK(Func_79fc0) ld hl, Func_79fc0 @@ -43616,8 +43616,8 @@ asm_1e9b0: ; 1e9b0 (7:69b0) ld [W_CURCHANNELPOINTER], a dec a call PlaySound - ld c, $2 - ld a, $b9 + ld c, BANK(SFX_02_5f) + ld a, (SFX_02_5f - $4000) / 3 call PlayMusic .asm_1e9c2 ld a, [$c02a] @@ -44056,8 +44056,31 @@ INCLUDE "music/sfx/sfx_08_11.tx" INCLUDE "music/sfx/sfx_08_12.tx" INCLUDE "music/sfx/sfx_08_13.tx" -Unknown_20361: ; 20361 (8:4361) -INCBIN "baserom.gbc",$20361,$203c3 - $20361 +Music8_Channel3DutyPointers: ; 20361 (1f:4361) + dw Music8_Channel3Duty1 + dw Music8_Channel3Duty2 + dw Music8_Channel3Duty3 + dw Music8_Channel3Duty4 + dw Music8_Channel3Duty5 + dw SFX_08_40_Ch1 ; unused + dw SFX_08_40_Ch1 ; unused + dw SFX_08_40_Ch1 ; unused + dw SFX_08_40_Ch1 ; unused + +Music8_Channel3Duty1: ; 20373 (8:4373) + db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 + +Music8_Channel3Duty2: ; 20383 (8:4383) + db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11 + +Music8_Channel3Duty3: ; 20393 (8:4393) + db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31 + +Music8_Channel3Duty4: ; 203a3 (8:43a3) + db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10 + +Music8_Channel3Duty5: ; 203b3 (8:43b3) + db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10 INCLUDE "music/sfx/sfx_08_40.tx" INCLUDE "music/sfx/sfx_08_3f.tx" @@ -44070,10 +44093,7 @@ INCLUDE "music/sfx/sfx_08_42.tx" INCLUDE "music/sfx/sfx_08_43.tx" INCLUDE "music/sfx/sfx_08_44.tx" INCLUDE "music/sfx/sfx_08_45.tx" - -Unknown_2049b: ; 2049b (8:449b) -INCBIN "baserom.gbc",$2049b,$204aa - $2049b - +INCLUDE "music/sfx/sfx_08_pokeflute_ch3.tx" INCLUDE "music/sfx/sfx_08_47.tx" INCLUDE "music/sfx/sfx_08_48.tx" INCLUDE "music/sfx/sfx_08_49.tx" @@ -44122,9 +44142,7 @@ INCLUDE "music/sfx/sfx_08_73.tx" INCLUDE "music/sfx/sfx_08_74.tx" INCLUDE "music/sfx/sfx_08_75.tx" INCLUDE "music/sfx/sfx_08_76.tx" - -INCBIN "baserom.gbc",$2098b,$209d7 - $2098b ; unknown music - +INCLUDE "music/sfx/sfx_08_unused.tx" INCLUDE "music/sfx/sfx_08_1d.tx" INCLUDE "music/sfx/sfx_08_37.tx" INCLUDE "music/sfx/sfx_08_38.tx" @@ -44217,13 +44235,13 @@ asm_213af: ; 213af (8:53af) ret Unknown_213bc: ; 213bc (8:53bc) -INCBIN "baserom.gbc",$213bc,$213c0 - $213bc + db $A0,$E2,$50,$87 Unknown_213c0: ; 213c0 (8:53c0) -INCBIN "baserom.gbc",$213c0,$213c4 - $213c0 + db $B0,$E2,$EE,$86 Unknown_213c4: ; 213c4 (8:53c4) -INCBIN "baserom.gbc",$213c4,$213c8 - $213c4 + db $00,$00,$00,$80 ; known jump sources: 17e4d (5:7e4d) Func_213c8: ; 213c8 (8:53c8) @@ -44831,22 +44849,22 @@ UnnamedText_21865: ; 21865 (8:5865) INCBIN "baserom.gbc",$21878,$21879 - $21878 Func_21879: ; 21879 (8:5879) - ld c, $0 -.asm_2187b + ld c, CH0 +.loop ld b, $0 ld hl, $c026 add hl, bc ld a, [hl] and a - jr z, .asm_218a7 + jr z, .nextChannel ld a, c - cp $4 - jr nc, .asm_218a4 + cp CH4 + jr nc, .applyAffects ; if sfx channel ld a, [$c002] and a - jr z, .asm_218a4 + jr z, .applyAffects bit 7, a - jr nz, .asm_218a7 + jr nz, .nextChannel set 7, a ld [$c002], a xor a @@ -44854,122 +44872,130 @@ Func_21879: ; 21879 (8:5879) ld [$FF00+$1a], a ld a, $80 ld [$FF00+$1a], a - jr .asm_218a7 -.asm_218a4 - call Func_218ae -.asm_218a7 + jr .nextChannel +.applyAffects + call Music8_ApplyMusicAffects +.nextChannel ld a, c inc c - cp $7 - jr nz, .asm_2187b + cp CH7 + jr nz, .loop ret -; known jump sources: 218a4 (8:58a4) -Func_218ae: ; 218ae (8:58ae) +; this routine checks flags for music effects currently applied +; to the channel and calls certain functions based on flags. +; known flags for $c02e: +; 1: call has been used +; 3: a toggle used only by this routine for vibrato +; 4: pitchbend flag +; 6: dutycycle flag +Music8_ApplyMusicAffects: ; 218ae (8:58ae) ld b, $0 - ld hl, $c0b6 + ld hl, $c0b6 ; delay unitl next note add hl, bc ld a, [hl] - cp $1 - jp z, Func_21946 - dec a + cp $1 ; if the delay is 1, play next note + jp z, Music8_PlayNextNote + dec a ; otherwise, decrease the delay timer ld [hl], a ld a, c - cp $4 - jr nc, .asm_218ca + cp CH4 + jr nc, .startChecks ; if a sfx channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr z, .asm_218ca + jr z, .startChecks ret -.asm_218ca +.startChecks ld hl, $c02e add hl, bc - bit 6, [hl] - jr z, .asm_218d5 - call Func_21fcc -.asm_218d5 + bit 6, [hl] ; dutycycle + jr z, .checkForExecuteMusic + call Music8_ApplyDutyCycle +.checkForExecuteMusic ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_218e7 + jr nz, .checkForPitchBend ld hl, $c02e add hl, bc bit 2, [hl] - jr nz, .asm_218fb -.asm_218e7 + jr nz, .disablePitchBendVibrato +.checkForPitchBend ld hl, $c02e add hl, bc - bit 4, [hl] - jr z, .asm_218f2 - jp Func_21eb8 -.asm_218f2 - ld hl, $c04e + bit 4, [hl] ; pitchbend + jr z, .checkVibratoDelay + jp Music8_ApplyPitchBend +.checkVibratoDelay + ld hl, $c04e ; vibrato delay add hl, bc ld a, [hl] - and a - jr z, .asm_218fc - dec [hl] -.asm_218fb + and a ; check if delay is over + jr z, .checkForVibrato + dec [hl] ; otherwise, dec delay +.disablePitchBendVibrato ret -.asm_218fc - ld hl, $c056 +.checkForVibrato + ld hl, $c056 ; vibrato rate add hl, bc ld a, [hl] and a - jr nz, .asm_21905 - ret -.asm_21905 + jr nz, .vibrato + ret ; no vibrato +.vibrato ld d, a ld hl, $c05e add hl, bc ld a, [hl] and $f and a - jr z, .asm_21912 - dec [hl] + jr z, .vibratoAlreadyDone + dec [hl] ; apply vibrato pitch change ret -.asm_21912 +.vibratoAlreadyDone ld a, [hl] swap [hl] or [hl] - ld [hl], a + ld [hl], a ; reset the vibrato value and start again ld hl, $c066 add hl, bc - ld e, [hl] + ld e, [hl] ; get note pitch ld hl, $c02e add hl, bc - bit 3, [hl] - jr z, .asm_21932 + bit 3, [hl] ; this is the only code that sets/resets bit three so + jr z, .unset ; it continuously alternates which path it takes res 3, [hl] ld a, d and $f ld d, a ld a, e sub d - jr nc, .asm_21930 + jr nc, .noCarry ld a, $0 -.asm_21930 - jr .asm_2193e -.asm_21932 +.noCarry + jr .done +.unset set 3, [hl] ld a, d and $f0 swap a add e - jr nc, .asm_2193e + jr nc, .done ld a, $ff -.asm_2193e +.done ld d, a ld b, $3 call Func_21ff7 ld [hl], d ret -; known jump sources: 218b7 (8:58b7) -Func_21946: ; 21946 (8:5946) +; this routine executes all music commands that take up no time, +; like tempo changes, duty changes etc. and doesn't return +; until the first note is reached +Music8_PlayNextNote: ; 21946 (8:5946) ld hl, $c06e add hl, bc ld a, [hl] @@ -44981,42 +45007,41 @@ Func_21946: ; 21946 (8:5946) res 4, [hl] res 5, [hl] ld a, c - cp $4 - jr nz, .asm_21963 + cp CH4 + jr nz, .beginChecks ld a, [$d083] bit 7, a ret nz -.asm_21963 - call Func_21967 +.beginChecks + call Music8_endchannel ret -; known jump sources: 21963 (8:5963), 219bd (8:59bd), 21a27 (8:5a27), 21a49 (8:5a49), 21a62 (8:5a62), 21aa1 (8:5aa1), 21ab3 (8:5ab3), 21aeb (8:5aeb), 21b38 (8:5b38), 21b78 (8:5b78), 21b85 (8:5b85), 21ba4 (8:5ba4), 21bc2 (8:5bc2), 21bce (8:5bce), 21bdd (8:5bdd), 21bf0 (8:5bf0), 21c59 (8:5c59) -Func_21967: ; 21967 (8:5967) - call Func_21fe4 +Music8_endchannel: ; 21967 (8:5967) + call Music8_GetNextMusicByte ld d, a - cp $ff - jp nz, Func_219f5 - ld b, $0 + cp $ff ; is this command an endchannel? + jp nz, Music8_callchannel ; no + ld b, $0 ; yes ld hl, $c02e add hl, bc bit 1, [hl] - jr nz, .asm_219a5 + jr nz, .returnFromCall ld a, c - cp $3 - jr nc, .asm_21981 + cp CH3 + jr nc, .noiseOrSfxChannel jr .asm_219c0 -.asm_21981 +.noiseOrSfxChannel res 2, [hl] ld hl, $c036 add hl, bc res 0, [hl] - cp $6 - jr nz, .asm_21995 + cp CH6 + jr nz, .notSfxChannel3 ld a, $0 ld [$FF00+$1a], a ld a, $80 ld [$FF00+$1a], a -.asm_21995 +.notSfxChannel3 jr nz, .asm_219a3 ld a, [$c003] and a @@ -45026,7 +45051,7 @@ Func_21967: ; 21967 (8:5967) jr .asm_219c0 .asm_219a3 jr .asm_219c9 -.asm_219a5 +.returnFromCall res 1, [hl] ld d, $0 ld a, c @@ -45034,7 +45059,7 @@ Func_21967: ; 21967 (8:5967) ld e, a ld hl, $c006 add hl, de - push hl + push hl ; store current channel address ld hl, $c016 add hl, de ld e, l @@ -45044,10 +45069,10 @@ Func_21967: ; 21967 (8:5967) ld [hli], a inc de ld a, [de] - ld [hl], a - jp Func_21967 + ld [hl], a ; loads channel address to return to + jp Music8_endchannel .asm_219c0 - ld hl, Unknown_222de ; $62de + ld hl, Unknown_222de add hl, bc ld a, [$FF00+$25] and [hl] @@ -45065,7 +45090,7 @@ Func_21967: ; 21967 (8:5967) jr .asm_219ef .asm_219dd ld a, c - cp $4 + cp CH4 jr z, .asm_219e6 call Func_21e6d ret c @@ -45080,17 +45105,16 @@ Func_21967: ; 21967 (8:5967) ld [hl], b ret -; known jump sources: 2196d (8:596d) -Func_219f5: ; 219f5 (8:59f5) - cp $fd - jp nz, Func_21a2a - call Func_21fe4 +Music8_callchannel: ; 219f5 (8:59f5) + cp $fd ; is this command a callchannel? + jp nz, Music8_loopchannel ; no + call Music8_GetNextMusicByte ; yes push af - call Func_21fe4 + call Music8_GetNextMusicByte ld d, a pop af ld e, a - push de + push de ; store pointer ld d, $0 ld a, c add a @@ -45107,43 +45131,43 @@ Func_219f5: ; 219f5 (8:59f5) ld [de], a inc de ld a, [hld] - ld [de], a + ld [de], a ; copy current channel address pop de ld [hl], e inc hl - ld [hl], d + ld [hl], d ; overwrite current address with pointer ld b, $0 ld hl, $c02e add hl, bc - set 1, [hl] - jp Func_21967 + set 1, [hl] ; set the call flag + jp Music8_endchannel -; known jump sources: 219f7 (8:59f7) -Func_21a2a: ; 21a2a (8:5a2a) - cp $fe - jp nz, Func_21a65 - call Func_21fe4 +Music8_loopchannel: ; 21a2a (8:5a2a) + cp $fe ; is this command a loopchannel? + jp nz, Music8_notetype ; no + call Music8_GetNextMusicByte ; yes ld e, a and a - jr z, .asm_21a4e + jr z, .infiniteLoop ld b, $0 ld hl, $c0be add hl, bc ld a, [hl] cp e - jr nz, .asm_21a4c - ld a, $1 + jr nz, .loopAgain + ld a, $1 ; if no more loops to make, ld [hl], a - call Func_21fe4 - call Func_21fe4 - jp Func_21967 -.asm_21a4c + call Music8_GetNextMusicByte ; skip pointer + call Music8_GetNextMusicByte + jp Music8_endchannel +.loopAgain ; inc loop count inc a ld [hl], a -.asm_21a4e - call Func_21fe4 + ; fall through +.infiniteLoop ; overwrite current address with pointer + call Music8_GetNextMusicByte push af - call Func_21fe4 + call Music8_GetNextMusicByte ld b, a ld d, $0 ld a, c @@ -45154,73 +45178,76 @@ Func_21a2a: ; 21a2a (8:5a2a) pop af ld [hli], a ld [hl], b - jp Func_21967 + jp Music8_endchannel -; known jump sources: 21a2c (8:5a2c) -Func_21a65: ; 21a65 (8:5a65) +Music8_notetype: ; 21a65 (8:5a65) and $f0 - cp $d0 - jp nz, Func_21aa4 - ld a, d + cp $d0 ; is this command a notetype? + jp nz, Music8_togglecall ; no + ld a, d ; yes and $f ld b, $0 ld hl, $c0c6 add hl, bc - ld [hl], a + ld [hl], a ; store low nibble as speed ld a, c - cp $3 - jr z, .asm_21aa1 - call Func_21fe4 + cp CH3 + jr z, .noiseChannel ; noise channel has 0 params + call Music8_GetNextMusicByte ld d, a ld a, c - cp $2 - jr z, .asm_21a8d - cp $6 - jr nz, .asm_21a9a + cp CH2 + jr z, .musicChannel3 + cp CH6 + jr nz, .notChannel3 ld hl, $c0e7 - jr .asm_21a90 -.asm_21a8d + jr .sfxChannel3 +.musicChannel3 ld hl, $c0e6 -.asm_21a90 +.sfxChannel3 ld a, d and $f - ld [hl], a + ld [hl], a ; store low nibble of param as duty ld a, d and $30 sla a ld d, a -.asm_21a9a + ; fall through + + ; if channel 3, store high nibble as volume + ; else, store volume (high nibble) and fade (low nibble) +.notChannel3 ld b, $0 ld hl, $c0de add hl, bc ld [hl], d -.asm_21aa1 - jp Func_21967 +.noiseChannel + jp Music8_endchannel -; known jump sources: 21a69 (8:5a69) -Func_21aa4: ; 21aa4 (8:5aa4) +Music8_togglecall: ; 21aa4 (8:5aa4) ld a, d - cp $e8 - jr nz, .asm_21ab6 - ld b, $0 + cp $e8 ; is this command an togglecall? + jr nz, Music8_vibrato ; no + ld b, $0 ; yes ld hl, $c02e add hl, bc ld a, [hl] xor $1 - ld [hl], a - jp Func_21967 -.asm_21ab6 - cp $ea - jr nz, .asm_21aee - call Func_21fe4 + ld [hl], a ; flip bit 0 of $c02e (toggle returning from call) + jp Music8_endchannel + +Music8_vibrato: ; 21ab6 (8:5ab6) + cp $ea ; is this command a vibrato? + jr nz, Music8_pitchbend ; no + call Music8_GetNextMusicByte ; yes ld b, $0 ld hl, $c04e add hl, bc - ld [hl], a + ld [hl], a ; store delay ld hl, $c06e add hl, bc - ld [hl], a - call Func_21fe4 + ld [hl], a ; store delay + call Music8_GetNextMusicByte ld d, a and $f0 swap a @@ -45232,7 +45259,7 @@ Func_21aa4: ; 21aa4 (8:5aa4) adc b swap a or e - ld [hl], a + ld [hl], a ; store rate as both high and low nibbles ld a, d and $f ld d, a @@ -45240,17 +45267,18 @@ Func_21aa4: ; 21aa4 (8:5aa4) add hl, bc swap a or d - ld [hl], a - jp Func_21967 -.asm_21aee - cp $eb - jr nz, .asm_21b26 - call Func_21fe4 + ld [hl], a ; store depth as both high and low nibbles + jp Music8_endchannel + +Music8_pitchbend: ; 21aee (8:5aee) + cp $eb ; is this command a pitchbend? + jr nz, Music8_duty ; no + call Music8_GetNextMusicByte ; yes ld b, $0 ld hl, $c076 add hl, bc - ld [hl], a - call Func_21fe4 + ld [hl], a ; store first param + call Music8_GetNextMusicByte ld d, a and $f0 swap a @@ -45261,132 +45289,142 @@ Func_21aa4: ; 21aa4 (8:5aa4) ld b, $0 ld hl, $c0a6 add hl, bc - ld [hl], d + ld [hl], d ; store unknown part of second param ld hl, $c0ae add hl, bc - ld [hl], e + ld [hl], e ; store unknown part of second param ld b, $0 ld hl, $c02e add hl, bc - set 4, [hl] - call Func_21fe4 + set 4, [hl] ; set pitchbend flag + call Music8_GetNextMusicByte ld d, a - jp Func_21c8b -.asm_21b26 - cp $ec - jr nz, .asm_21b3b - call Func_21fe4 + jp Music8_notelength + +Music8_duty: ; 21b26 (8:5b26) + cp $ec ; is this command a duty? + jr nz, Music8_tempo ; no + call Music8_GetNextMusicByte ; yes rrca rrca and $c0 ld b, $0 ld hl, $c03e add hl, bc - ld [hl], a - jp Func_21967 -.asm_21b3b - cp $ed - jr nz, .asm_21b7b - ld a, c - cp $4 - jr nc, .asm_21b5f - call Func_21fe4 - ld [$c0e8], a - call Func_21fe4 - ld [$c0e9], a + ld [hl], a ; store duty + jp Music8_endchannel + +Music8_tempo: ; 21b3b (8:5b3b) + cp $ed ; is this command a tempo? + jr nz, Music8_unknownmusic0xee ; no + ld a, c ; yes + cp CH4 + jr nc, .sfxChannel + call Music8_GetNextMusicByte + ld [$c0e8], a ; store first param + call Music8_GetNextMusicByte + ld [$c0e9], a ; store second param xor a - ld [$c0ce], a + ld [$c0ce], a ; clear RAM ld [$c0cf], a ld [$c0d0], a ld [$c0d1], a - jr .asm_21b78 -.asm_21b5f - call Func_21fe4 - ld [$c0ea], a - call Func_21fe4 - ld [$c0eb], a + jr .musicChannelDone +.sfxChannel + call Music8_GetNextMusicByte + ld [$c0ea], a ; store first param + call Music8_GetNextMusicByte + ld [$c0eb], a ; store second param xor a - ld [$c0d2], a + ld [$c0d2], a ; clear RAM ld [$c0d3], a ld [$c0d4], a ld [$c0d5], a -.asm_21b78 - jp Func_21967 -.asm_21b7b - cp $ee - jr nz, .asm_21b88 - call Func_21fe4 - ld [$c004], a - jp Func_21967 -.asm_21b88 - cp $ef - jr nz, .asm_21ba7 - call Func_21fe4 +.musicChannelDone + jp Music8_endchannel + +Music8_unknownmusic0xee: ; 21b7b (8:5b7b) + cp $ee ; is this command an unknownmusic0xee? + jr nz, Music8_unknownmusic0xef ; no + call Music8_GetNextMusicByte ; yes + ld [$c004], a ; store first param + jp Music8_endchannel + +; this appears to never be used +Music8_unknownmusic0xef: ; 21b88 (8:5b88) + cp $ef ; is this command an unknownmusic0xef? + jr nz, Music8_dutycycle ; no + call Music8_GetNextMusicByte ; yes push bc call Func_22035 pop bc ld a, [$c003] and a - jr nz, .asm_21ba4 + jr nz, .skip ld a, [$c02d] ld [$c003], a xor a ld [$c02d], a -.asm_21ba4 - jp Func_21967 -.asm_21ba7 - cp $fc - jr nz, .asm_21bc5 - call Func_21fe4 +.skip + jp Music8_endchannel + +Music8_dutycycle: ; 21ba7 (8:5ba7) + cp $fc ; is this command a dutycycle? + jr nz, Music8_stereopanning ; no + call Music8_GetNextMusicByte ; yes ld b, $0 ld hl, $c046 add hl, bc - ld [hl], a + ld [hl], a ; store full cycle and $c0 ld hl, $c03e add hl, bc - ld [hl], a + ld [hl], a ; store first duty ld hl, $c02e add hl, bc - set 6, [hl] - jp Func_21967 -.asm_21bc5 - cp $f0 - jr nz, .asm_21bd1 - call Func_21fe4 + set 6, [hl] ; set dutycycle flag + jp Music8_endchannel + +Music8_stereopanning: ; 21bc5 (8:5bc5) + cp $f0 ; is this command a stereopanning? + jr nz, Music8_executemusic ; no + call Music8_GetNextMusicByte ; yes ld [$FF00+$24], a - jp Func_21967 -.asm_21bd1 - cp $f8 - jr nz, .asm_21be0 - ld b, $0 + jp Music8_endchannel + +Music8_executemusic: ; 21bd1 (8:5bd1) + cp $f8 ; is this command an executemusic? + jr nz, Music8_octave ; no + ld b, $0 ; yes ld hl, $c036 add hl, bc set 0, [hl] - jp Func_21967 -.asm_21be0 + jp Music8_endchannel + +Music8_octave: ; 21be0 (8:5be0) and $f0 - cp $e0 - jr nz, .asm_21bf3 - ld hl, $c0d6 + cp $e0 ; is this command an octave? + jr nz, Music8_unknownsfx0x20 ; no + ld hl, $c0d6 ; yes ld b, $0 add hl, bc ld a, d and $f - ld [hl], a - jp Func_21967 -.asm_21bf3 - cp $20 - jr nz, .asm_21c40 + ld [hl], a ; store low nibble as octave + jp Music8_endchannel + +Music8_unknownsfx0x20: ; 21bf3 + cp $20 ; is this command an unknownsfx0x20? + jr nz, Music8_unknownsfx0x10 ; no ld a, c - cp $3 - jr c, .asm_21c40 + cp CH3 ; is this a noise or sfx channel? + jr c, Music8_unknownsfx0x10 ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_21c40 - call Func_21c8b + jr nz, Music8_unknownsfx0x10 ; no + call Music8_notelength ld d, a ld b, $0 ld hl, $c03e @@ -45397,21 +45435,21 @@ Func_21aa4: ; 21aa4 (8:5aa4) ld b, $1 call Func_21ff7 ld [hl], d - call Func_21fe4 + call Music8_GetNextMusicByte ld d, a ld b, $2 call Func_21ff7 ld [hl], d - call Func_21fe4 + call Music8_GetNextMusicByte ld e, a ld a, c - cp $7 + cp CH7 ld a, $0 - jr z, .asm_21c33 + jr z, .sfxNoiseChannel ; only two params for noise channel push de - call Func_21fe4 + call Music8_GetNextMusicByte pop de -.asm_21c33 +.sfxNoiseChannel ld d, a push de call Func_21daa @@ -45419,30 +45457,32 @@ Func_21aa4: ; 21aa4 (8:5aa4) pop de call Func_21dcc ret -.asm_21c40 + +Music8_unknownsfx0x10: ; 21c40 (8:5c40) ld a, c - cp $4 - jr c, .asm_21c5c + cp CH4 + jr c, Music8_note ; if not a sfx ld a, d - cp $10 - jr nz, .asm_21c5c + cp $10 ; is this command a unknownsfx0x10? + jr nz, Music8_note ; no ld b, $0 ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_21c5c - call Func_21fe4 + jr nz, Music8_note ; no + call Music8_GetNextMusicByte ; yes ld [$FF00+$10], a - jp Func_21967 -.asm_21c5c + jp Music8_endchannel + +Music8_note: ; 21c5c (8:5c5c) ld a, c - cp $3 - jr nz, Func_21c8b + cp CH3 + jr nz, Music8_notelength ; if not noise channel ld a, d and $f0 - cp $b0 - jr z, .asm_21c76 - jr nc, Func_21c8b + cp $b0 ; is this command a dnote? + jr z, Music8_dnote ; yes + jr nc, Music8_notelength ; no swap a ld b, a ld a, d @@ -45451,14 +45491,15 @@ Func_21aa4: ; 21aa4 (8:5aa4) ld a, b push de push bc - jr .asm_21c7e -.asm_21c76 + jr asm_21c7e + +Music8_dnote: ; 21c76 (8:5c76) ld a, d and $f push af push bc - call Func_21fe4 -.asm_21c7e + call Music8_GetNextMusicByte ; get dnote instrument +asm_21c7e ld d, a ld a, [$c003] and a @@ -45469,14 +45510,13 @@ Func_21aa4: ; 21aa4 (8:5aa4) pop bc pop de -; known jump sources: 21b23 (8:5b23), 21c06 (8:5c06), 21c5f (8:5c5f), 21c68 (8:5c68) -Func_21c8b: ; 21c8b (8:5c8b) +Music8_notelength: ; 21c8b (8:5c8b) ld a, d push af and $f inc a ld b, $0 - ld e, a + ld e, a ; store note length (in 16ths) ld d, b ld hl, $c0c6 add hl, bc @@ -45484,24 +45524,24 @@ Func_21c8b: ; 21c8b (8:5c8b) ld l, b call Func_22006 ld a, c - cp $4 - jr nc, .asm_21cac + cp CH4 + jr nc, .sfxChannel ld a, [$c0e8] ld d, a ld a, [$c0e9] ld e, a - jr .asm_21cbf -.asm_21cac + jr .skip +.sfxChannel ld d, $1 ld e, $0 - cp $7 - jr z, .asm_21cbf + cp CH7 + jr z, .skip ; if noise channel call Func_21e2f ld a, [$c0ea] ld d, a ld a, [$c0eb] ld e, a -.asm_21cbf +.skip ld a, l ld b, $0 ld hl, $c0ce @@ -45520,41 +45560,43 @@ Func_21c8b: ; 21c8b (8:5c8b) ld hl, $c036 add hl, bc bit 0, [hl] - jr nz, .asm_21ce9 + jr nz, Music8_notepitch ld hl, $c02e add hl, bc bit 2, [hl] - jr z, .asm_21ce9 + jr z, Music8_notepitch pop hl ret -.asm_21ce9 + +Music8_notepitch: ; 21ce9 (8:5ce9) pop af and $f0 - cp $c0 - jr nz, .asm_21d20 + cp $c0 ; compare to rest + jr nz, .notRest ld a, c - cp $4 - jr nc, .asm_21cfd + cp CH4 + jr nc, .sfxChannel ld hl, $c02a add hl, bc ld a, [hl] and a - jr nz, .asm_21d1f -.asm_21cfd + jr nz, .done + ; fall through +.sfxChannel ld a, c - cp $2 - jr z, .asm_21d06 - cp $6 - jr nz, .asm_21d13 -.asm_21d06 + cp CH2 + jr z, .musicChannel3 + cp CH6 + jr nz, .notSfxChannel3 +.musicChannel3 ld b, $0 - ld hl, Unknown_222de ; $62de + ld hl, Unknown_222de add hl, bc ld a, [$FF00+$25] and [hl] ld [$FF00+$25], a - jr .asm_21d1f -.asm_21d13 + jr .done +.notSfxChannel3 ld b, $2 call Func_21ff7 ld a, $8 @@ -45562,9 +45604,9 @@ Func_21c8b: ; 21c8b (8:5c8b) inc hl ld a, $80 ld [hl], a -.asm_21d1f +.done ret -.asm_21d20 +.notRest swap a ld b, $0 ld hl, $c0d6 @@ -45580,8 +45622,8 @@ Func_21c8b: ; 21c8b (8:5c8b) .asm_21d39 push de ld a, c - cp $4 - jr nc, .asm_21d4e + cp CH4 + jr nc, .skip ; if sfx channel ld hl, $c02a ld d, $0 ld e, a @@ -45589,11 +45631,11 @@ Func_21c8b: ; 21c8b (8:5c8b) ld a, [hl] and a jr nz, .asm_21d4c - jr .asm_21d4e + jr .skip .asm_21d4c pop de ret -.asm_21d4e +.skip ld b, $0 ld hl, $c0de add hl, bc @@ -45619,52 +45661,50 @@ Func_21c8b: ; 21c8b (8:5c8b) call Func_21dcc ret -; known jump sources: 21c38 (8:5c38), 21d5e (8:5d5e) Func_21d79: ; 21d79 (8:5d79) ld b, $0 - ld hl, Unknown_222e6 ; $62e6 + ld hl, Unknown_222e6 add hl, bc ld a, [$FF00+$25] or [hl] ld d, a ld a, c - cp $7 - jr z, .asm_21d94 - cp $4 - jr nc, .asm_21da6 + cp CH7 + jr z, .sfxNoiseChannel + cp CH4 + jr nc, .skip ; if sfx channel ld hl, $c02a add hl, bc ld a, [hl] and a - jr nz, .asm_21da6 -.asm_21d94 + jr nz, .skip +.sfxNoiseChannel ld a, [$c004] - ld hl, Unknown_222e6 ; $62e6 + ld hl, Unknown_222e6 add hl, bc and [hl] ld d, a ld a, [$FF00+$25] - ld hl, Unknown_222de ; $62de + ld hl, Unknown_222de add hl, bc and [hl] or d ld d, a -.asm_21da6 +.skip ld a, d ld [$FF00+$25], a ret -; known jump sources: 21c35 (8:5c35), 21d5b (8:5d5b) Func_21daa: ; 21daa (8:5daa) ld b, $0 ld hl, $c0b6 add hl, bc ld d, [hl] ld a, c - cp $2 - jr z, .asm_21dc5 - cp $6 - jr z, .asm_21dc5 + cp CH2 + jr z, .channel3 ; if music channel 3 + cp CH6 + jr z, .channel3 ; if sfx channel 3 ld a, d and $3f ld d, a @@ -45673,31 +45713,31 @@ Func_21daa: ; 21daa (8:5daa) ld a, [hl] or d ld d, a -.asm_21dc5 +.channel3 ld b, $1 call Func_21ff7 ld [hl], d ret -; known jump sources: 21c3c (8:5c3c), 21d75 (8:5d75) Func_21dcc: ; 21dcc (8:5dcc) ld a, c - cp $2 - jr z, .asm_21dd5 - cp $6 - jr nz, .asm_21e02 -.asm_21dd5 + cp CH2 + jr z, .channel3 + cp CH6 + jr nz, .notSfxChannel3 + ; fall through +.channel3 push de ld de, $c0e6 - cp $2 - jr z, .asm_21de0 + cp CH2 + jr z, .musicChannel3 ld de, $c0e7 -.asm_21de0 +.musicChannel3 ld a, [de] add a ld d, $0 ld e, a - ld hl, Unknown_20361 ; $4361 + ld hl, Music8_Channel3DutyPointers add hl, de ld e, [hl] inc hl @@ -45706,18 +45746,18 @@ Func_21dcc: ; 21dcc (8:5dcc) ld b, $f ld a, $0 ld [$FF00+$1a], a -.asm_21df5 +.loop ld a, [de] inc de ld [hli], a ld a, b dec b and a - jr nz, .asm_21df5 + jr nz, .loop ld a, $80 ld [$FF00+$1a], a pop de -.asm_21e02 +.notSfxChannel3 ld a, d or $80 and $c7 @@ -45728,18 +45768,19 @@ Func_21dcc: ; 21dcc (8:5dcc) inc hl ld [hl], d ld a, c - cp $4 - jr c, .asm_21e18 + cp CH4 + jr c, .musicChannel call Func_21e56 -.asm_21e18 +.musicChannel ret +Func_21e19: ; 21e19 (8:5e19) ld a, c - cp $4 - jr nz, .asm_21e2e ; 0x21e1c $10 + cp CH4 + jr nz, .asm_21e2e ld a, [$d083] bit 7, a - jr z, .asm_21e2e ; 0x21e23 $9 + jr z, .asm_21e2e xor a ld [$c0f1], a ld a, $80 @@ -45747,7 +45788,6 @@ Func_21dcc: ; 21dcc (8:5dcc) .asm_21e2e ret -; known jump sources: 21cb4 (8:5cb4) Func_21e2f: ; 21e2f (8:5e2f) call Func_21e8b jr c, .asm_21e39 @@ -45772,7 +45812,6 @@ Func_21e2f: ; 21e2f (8:5e2f) .asm_21e55 ret -; known jump sources: 21e15 (8:5e15) Func_21e56: ; 21e56 (8:5e56) call Func_21e8b jr c, .asm_21e60 @@ -45792,7 +45831,6 @@ Func_21e56: ; 21e56 (8:5e56) .asm_21e6c ret -; known jump sources: 219e2 (8:59e2) Func_21e6d: ; 21e6d (8:5e6d) call Func_21e8b jr nc, .asm_21e88 @@ -45816,7 +45854,6 @@ Func_21e6d: ; 21e6d (8:5e6d) ccf ret -; known jump sources: 21e2f (8:5e2f), 21e56 (8:5e56), 21e6d (8:5e6d) Func_21e8b: ; 21e8b (8:5e8b) ld a, [$c02a] cp $14 @@ -45834,7 +45871,6 @@ Func_21e8b: ; 21e8b (8:5e8b) scf ret -; known jump sources: 21e34 (8:5e34), 21e5b (8:5e5b) Func_21e9f: ; 21e9f (8:5e9f) ld a, [$c02d] ld b, a @@ -45855,12 +45891,11 @@ Func_21e9f: ; 21e9f (8:5e9f) scf ret -; known jump sources: 218ef (8:58ef) -Func_21eb8: ; 21eb8 (8:5eb8) +Music8_ApplyPitchBend: ; 21eb8 (8:5eb8) ld hl, $c02e add hl, bc bit 5, [hl] - jp nz, Func_21eff + jp nz, .asm_21eff ld hl, $c09e add hl, bc ld e, [hl] @@ -45893,17 +45928,15 @@ Func_21eb8: ; 21eb8 (8:5eb8) add hl, bc ld a, [hl] cp d - jp c, Func_21f45 - jr nz, asm_21f32 + jp c, .asm_21f45 + jr nz, .asm_21f32 ld hl, $c0ae add hl, bc ld a, [hl] cp e - jp c, Func_21f45 - jr asm_21f32 - -; known jump sources: 21ebe (8:5ebe) -Func_21eff: ; 21eff (8:5eff) + jp c, .asm_21f45 + jr .asm_21f32 +.asm_21eff ld hl, $c09e add hl, bc ld a, [hl] @@ -45933,14 +45966,14 @@ Func_21eff: ; 21eff (8:5eff) add hl, bc ld a, d cp [hl] - jr c, Func_21f45 - jr nz, asm_21f32 + jr c, .asm_21f45 + jr nz, .asm_21f32 ld hl, $c0ae add hl, bc ld a, e cp [hl] - jr c, Func_21f45 -asm_21f32: ; 21f32 (8:5f32) + jr c, .asm_21f45 +.asm_21f32 ld hl, $c09e add hl, bc ld [hl], e @@ -45953,16 +45986,13 @@ asm_21f32: ; 21f32 (8:5f32) ld [hli], a ld [hl], d ret - -; known jump sources: 21eef (8:5eef), 21efa (8:5efa), 21f26 (8:5f26), 21f30 (8:5f30) -Func_21f45: ; 21f45 (8:5f45) +.asm_21f45 ld hl, $c02e add hl, bc res 4, [hl] res 5, [hl] ret -; known jump sources: 21d36 (8:5d36) Func_21f4e: ; 21f4e (8:5f4e) ld hl, $c096 add hl, bc @@ -46052,8 +46082,7 @@ Func_21f4e: ; 21f4e (8:5f4e) ld [hl], a ret -; known jump sources: 218d2 (8:58d2) -Func_21fcc: ; 21fcc (8:5fcc) +Music8_ApplyDutyCycle: ; 21fcc (8:5fcc) ld b, $0 ld hl, $c046 add hl, bc @@ -46071,8 +46100,7 @@ Func_21fcc: ; 21fcc (8:5fcc) ld [hl], a ret -; known jump sources: 21967 (8:5967), 219fa (8:59fa), 219fe (8:59fe), 21a2f (8:5a2f), 21a43 (8:5a43), 21a46 (8:5a46), 21a4e (8:5a4e), 21a52 (8:5a52), 21a7b (8:5a7b), 21aba (8:5aba), 21ac9 (8:5ac9), 21af2 (8:5af2), 21afc (8:5afc), 21b1f (8:5b1f), 21b2a (8:5b2a), 21b44 (8:5b44), 21b4a (8:5b4a), 21b5f (8:5b5f), 21b65 (8:5b65), 21b7f (8:5b7f), 21b8c (8:5b8c), 21bab (8:5bab), 21bc9 (8:5bc9), 21c19 (8:5c19), 21c23 (8:5c23), 21c2f (8:5c2f), 21c54 (8:5c54), 21c7b (8:5c7b) -Func_21fe4: ; 21fe4 (8:5fe4) +Music8_GetNextMusicByte: ; 21fe4 (8:5fe4) ld d, $0 ld a, c add a @@ -46083,21 +46111,20 @@ Func_21fe4: ; 21fe4 (8:5fe4) ld e, a ld a, [hld] ld d, a - ld a, [de] + ld a, [de] ; get next music command inc de - ld [hl], e + ld [hl], e ; store address of next command inc hl ld [hl], d ret -; known jump sources: 21941 (8:5941), 21c15 (8:5c15), 21c1f (8:5c1f), 21d15 (8:5d15), 21d57 (8:5d57), 21dc7 (8:5dc7), 21e0a (8:5e0a), 21f3e (8:5f3e), 21fdb (8:5fdb) Func_21ff7: ; 21ff7 (8:5ff7) ld a, c - ld hl, Unknown_222d6 ; $62d6 + ld hl, Unknown_222d6 add l - jr nc, .asm_21fff + jr nc, .noCarry inc h -.asm_21fff +.noCarry ld l, a ld a, [hl] add b @@ -46105,49 +46132,46 @@ Func_21ff7: ; 21ff7 (8:5ff7) ld h, $ff ret -; known jump sources: 21c9a (8:5c9a), 21cc7 (8:5cc7) Func_22006: ; 22006 (8:6006) ld h, $0 -.asm_22008 +.loop srl a - jr nc, .asm_2200d + jr nc, .noCarry add hl, de -.asm_2200d +.noCarry sla e rl d and a - jr z, .asm_22016 - jr .asm_22008 -.asm_22016 + jr z, .done + jr .loop +.done ret -; known jump sources: 21b08 (8:5b08), 21d29 (8:5d29) Func_22017: ; 22017 (8:6017) ld h, $0 ld l, a add hl, hl ld d, h ld e, l - ld hl, Unknown_222ee ; $62ee + ld hl, Unknown_222ee add hl, de ld e, [hl] inc hl ld d, [hl] ld a, b -.asm_22025 - cp $7 - jr z, .asm_22030 +.loop + cp CH7 + jr z, .done sra d rr e inc a - jr .asm_22025 -.asm_22030 + jr .loop +.done ld a, $8 add d ld d, a ret -; known jump sources: 21b90 (8:5b90), 21c86 (8:5c86) Func_22035: ; 22035 (8:6035) ld [$c001], a cp $ff @@ -46167,53 +46191,53 @@ Func_22035: ; 22035 (8:6035) ld [$c0e7], a ld d, $8 ld hl, $c016 - call Func_22248 + call FillMusicRAM8 ld hl, $c006 - call Func_22248 + call FillMusicRAM8 ld d, $4 ld hl, $c026 - call Func_22248 + call FillMusicRAM8 ld hl, $c02e - call Func_22248 + call FillMusicRAM8 ld hl, $c03e - call Func_22248 + call FillMusicRAM8 ld hl, $c046 - call Func_22248 + call FillMusicRAM8 ld hl, $c04e - call Func_22248 + call FillMusicRAM8 ld hl, $c056 - call Func_22248 + call FillMusicRAM8 ld hl, $c05e - call Func_22248 + call FillMusicRAM8 ld hl, $c066 - call Func_22248 + call FillMusicRAM8 ld hl, $c06e - call Func_22248 + call FillMusicRAM8 ld hl, $c036 - call Func_22248 + call FillMusicRAM8 ld hl, $c076 - call Func_22248 + call FillMusicRAM8 ld hl, $c07e - call Func_22248 + call FillMusicRAM8 ld hl, $c086 - call Func_22248 + call FillMusicRAM8 ld hl, $c08e - call Func_22248 + call FillMusicRAM8 ld hl, $c096 - call Func_22248 + call FillMusicRAM8 ld hl, $c09e - call Func_22248 + call FillMusicRAM8 ld hl, $c0a6 - call Func_22248 + call FillMusicRAM8 ld hl, $c0ae - call Func_22248 + call FillMusicRAM8 ld a, $1 ld hl, $c0be - call Func_22248 + call FillMusicRAM8 ld hl, $c0b6 - call Func_22248 + call FillMusicRAM8 ld hl, $c0c6 - call Func_22248 + call FillMusicRAM8 ld [$c0e8], a ld a, $ff ld [$c004], a @@ -46231,7 +46255,6 @@ Func_22035: ; 22035 (8:6035) ld [$FF00+$24], a jp Func_2224e -; known jump sources: 2203f (8:603f), 22042 (8:6042), 22049 (8:6049) Func_2210d: ; 2210d (8:610d) ld l, a ld e, a @@ -46239,7 +46262,7 @@ Func_2210d: ; 2210d (8:610d) ld d, h add hl, hl add hl, de - ld de, SFX_Headers_08 ; $4000 + ld de, SFX_Headers_08 add hl, de ld a, h ld [$c0ec], a @@ -46250,9 +46273,7 @@ Func_2210d: ; 2210d (8:610d) rlca rlca ld c, a - -; known jump sources: 221f0 (8:61f0) -Func_22126: ; 22126 (8:6126) +.asm_22126 ld d, c ld a, c add a @@ -46383,9 +46404,8 @@ Func_22126: ; 22126 (8:6126) and a jp z, Func_2224e dec c - jp Func_22126 + jp .asm_22126 -; known jump sources: 2203a (8:603a) Func_221f3: ; 221f3 (8:61f3) ld a, $80 ld [$FF00+$26], a @@ -46414,27 +46434,26 @@ Func_221f3: ; 221f3 (8:61f3) ld [$c0e7], a ld d, $a0 ld hl, $c006 - call Func_22248 + call FillMusicRAM8 ld a, $1 ld d, $18 ld hl, $c0b6 - call Func_22248 + call FillMusicRAM8 ld [$c0e8], a ld [$c0ea], a ld a, $ff ld [$c004], a ret -; known jump sources: 22061 (8:6061), 22067 (8:6067), 2206f (8:606f), 22075 (8:6075), 2207b (8:607b), 22081 (8:6081), 22087 (8:6087), 2208d (8:608d), 22093 (8:6093), 22099 (8:6099), 2209f (8:609f), 220a5 (8:60a5), 220ab (8:60ab), 220b1 (8:60b1), 220b7 (8:60b7), 220bd (8:60bd), 220c3 (8:60c3), 220c9 (8:60c9), 220cf (8:60cf), 220d5 (8:60d5), 220dd (8:60dd), 220e3 (8:60e3), 220e9 (8:60e9), 2222f (8:622f), 22239 (8:6239) -Func_22248: ; 22248 (8:6248) +; fills d bytes at hl with a +FillMusicRAM8: ; 22248 (8:6248) ld b, d -.asm_22249 +.loop ld [hli], a dec b - jr nz, .asm_22249 + jr nz, .loop ret -; known jump sources: 2210a (8:610a), 221ec (8:61ec) Func_2224e: ; 2224e (8:624e) ld a, [$c001] ld l, a @@ -46443,12 +46462,12 @@ Func_2224e: ; 2224e (8:624e) ld d, h add hl, hl add hl, de - ld de, SFX_Headers_08 ; $4000 + ld de, SFX_Headers_08 add hl, de ld e, l ld d, h ld hl, $c006 - ld a, [de] + ld a, [de] ; get channel number ld b, a rlca rlca @@ -46486,7 +46505,7 @@ Func_2224e: ; 2224e (8:624e) .asm_22291 pop bc pop hl - ld a, [de] + ld a, [de] ; get channel pointer ld [hli], a inc de ld a, [de] @@ -46515,11 +46534,11 @@ Func_2224e: ; 2224e (8:624e) ld [hli], a ld [hli], a ld [hl], a - ld hl, $c012 - ld de, Unknown_222d5 ; $62d5 + ld hl, $c012 ; sfx noise channel pointer + ld de, Noise8_endchannel ld [hl], e inc hl - ld [hl], d + ld [hl], d ; overwrite pointer to point to endchannel ld a, [$c005] and a jr nz, .asm_222d4 @@ -46530,46 +46549,54 @@ Func_2224e: ; 2224e (8:624e) .asm_222d4 ret -Unknown_222d5: ; 222d5 (8:62d5) -INCBIN "baserom.gbc",$222d5,$222d6 - $222d5 +Noise8_endchannel: ; 222d5 (8:62d5) + endchannel Unknown_222d6: ; 222d6 (8:62d6) -INCBIN "baserom.gbc",$222d6,$222de - $222d6 + db $10, $15, $1A, $1F ; channels 0-3 + db $10, $15, $1A, $1F ; channels 4-7 Unknown_222de: ; 222de (8:62de) -INCBIN "baserom.gbc",$222de,$222e6 - $222de + db $EE, $DD, $BB, $77 ; channels 0-3 + db $EE, $DD, $BB, $77 ; channels 4-7 Unknown_222e6: ; 222e6 (8:62e6) -INCBIN "baserom.gbc",$222e6,$222ee - $222e6 + db $11, $22, $44, $88 ; channels 0-3 + db $11, $22, $44, $88 ; channels 4-7 Unknown_222ee: ; 222ee (8:62ee) -INCBIN "baserom.gbc",$222ee,$22306 - $222ee + dw $F82C + dw $F89D + dw $F907 + dw $F96B + dw $F9CA + dw $FA23 + dw $FA77 + dw $FAC7 + dw $FB12 + dw $FB58 + dw $FB9B + dw $FBDA -; known jump sources: e1d6 (3:61d6) -Func_22306: ; 22306 (8:6306) - ld a, $9a +Music_PokeFluteInBattle: ; 22306 (8:6306) + ld a, (SFX_08_46 - $4000) / 3 ; PokeFlute outside of battle call PlaySoundWaitForCurrent ld hl, $c00e - ld de, Unknown_22322 ; $6322 - call Func_2231d - ld de, Unknown_22325 ; $6325 - call Func_2231d - ld de, Unknown_2049b ; $449b - -; known jump sources: 22311 (8:6311), 22317 (8:6317) -Func_2231d: ; 2231d (8:631d) + ld de, SFX_08_PokeFlute_Ch1 + call Music8_OverwriteChannelPointer + ld de, SFX_08_PokeFlute_Ch2 + call Music8_OverwriteChannelPointer + ld de, SFX_08_PokeFlute_Ch3 + +Music8_OverwriteChannelPointer: ; 2231d (8:631d) ld a, e ld [hli], a ld a, d ld [hli], a ret -Unknown_22322: ; 22322 (8:6322) -INCBIN "baserom.gbc",$22322,$22325 - $22322 - -Unknown_22325: ; 22325 (8:6325) -INCBIN "baserom.gbc",$22325,$22370 - $22325 - +INCLUDE "music/sfx/sfx_08_pokeflute.tx" +INCLUDE "music/sfx/sfx_08_unused2.tx" INCLUDE "music/gymleaderbattle.tx" INCLUDE "music/trainerbattle.tx" INCLUDE "music/wildbattle.tx" @@ -60310,7 +60337,7 @@ Func_3c567: ; 3c567 (f:4567) jr .asm_3c5db .asm_3c5d3 call Func_3c643 - ld a, $f9 + ld a, (Music_DefeatedWildMon - $4000) / 3 call Func_3c6ee .asm_3c5db ld hl, W_PLAYERMONCURHP ; $d015 @@ -60426,16 +60453,16 @@ Func_3c664: ; 3c664 (f:4664) ; known jump sources: 3c544 (f:4544), 3c722 (f:4722) TrainerBattleVictory: ; 3c696 (f:4696) call Func_3c643 - ld b, $fc + ld b, (Music_DefeatedGymLeader - $4000) / 3 ld a, [W_GYMLEADERNO] ; $d05c and a - jr nz, .notgymleader - ld b, $f6 ; gym leader win music -.notgymleader + jr nz, .gymleader + ld b, (Music_DefeatedTrainer - $4000) / 3 +.gymleader ld a, [W_TRAINERCLASS] ; $d031 cp SONY3 ; final battle against rival jr nz, .notrival - ld b, $fc ; final rival battle win music + ld b, (Music_DefeatedGymLeader - $4000) / 3 ld hl, W_FLAGS_D733 set 1, [hl] .notrival @@ -60476,7 +60503,7 @@ Func_3c6ee: ; 3c6ee (f:46ee) ld a, $ff ld [$c0ee], a call PlaySoundWaitForCurrent - ld c, $8 + ld c, BANK(Music_DefeatedTrainer) pop af call PlayMusic jp Delay3 @@ -81188,8 +81215,8 @@ Route22Script0: ; 50f00 (14:4f00) ld [$c0ee], a call PlaySound .asm_50f4e - ld c, $2 - ld a, $de + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ld a, $1 ld [$ff00+$8c], a @@ -82930,8 +82957,8 @@ INCBIN "baserom.gbc",$51c17,$51c23 - $51c17 ld a, $ff ld [$c0ee], a call PlaySound - ld c, $2 - ld a, $de + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ld a, $9 ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c @@ -93928,8 +93955,8 @@ PewterPokecenterText3: ; 5c59b (17:459b) jr nz, .asm_5c5c3 ; 0x5c5c5 $fc dec hl push hl - ld c, $1f - ld a, $d0 + ld c, BANK(Music_JigglypuffSong) + ld a, (Music_JigglypuffSong - $4000) / 3 call PlayMusic pop hl .asm_5c5d1 @@ -97135,8 +97162,8 @@ PokemonTower2Script0: ; 6050f (18:450f) ld a, $ff ld [$c0ee], a call PlaySound - ld c, $2 - ld a, $de + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ld hl, $d764 res 6, [hl] @@ -98822,8 +98849,8 @@ SSAnne2Script0: ; 613be (18:53be) ld a, $ff ld [$c0ee], a call PlaySound - ld c, $2 - ld a, $de + ld c, BANK(Music_MeetRival) + ld a, (Music_MeetRival - $4000) / 3 call PlayMusic ld a, [$cd3d] ld [$ff00+$db], a @@ -101232,8 +101259,8 @@ Func_701a0: ; 701a0 (1c:41a0) .asm_701eb ld a, $90 ld [$FF00+$b0], a - ld c, $1f - ld a, $ca + ld c, BANK(Music_HallOfFame) + ld a, (Music_HallOfFame - $4000) / 3 call PlayMusic ld hl, W_PARTYMON1 ; $d164 ld c, $ff @@ -106196,8 +106223,8 @@ Func_7405c: ; 7405c (1d:405c) call EnableLCD ld a, $ff call PlaySoundWaitForCurrent - ld c, $1f - ld a, $c7 + ld c, BANK(Music_Credits) + ld a, (Music_Credits - $4000) / 3 call PlayMusic ld c, $80 call DelayFrames @@ -113783,8 +113810,8 @@ Func_7bde9: ; 7bde9 (1e:7de9) ld a, [$cee9] call PlayCry call WaitForSoundToFinish - ld c, $2 - ld a, $e5 + ld c, BANK(Music_SafariZone) + ld a, (Music_SafariZone - $4000) / 3 call PlayMusic ld c, $50 call DelayFrames @@ -113923,8 +113950,8 @@ Func_7bf15: ; 7bf15 (1e:7f15) add d ld [$FF00+$af], a push bc - ld c, $2 - ld a, $b4 + ld c, BANK(SFX_02_5b) + ld a, (SFX_02_5b - $4000) / 3 call PlayMusic pop bc ld c, $2 @@ -113935,8 +113962,8 @@ Func_7bf15: ; 7bf15 (1e:7f15) ld [$FF00+$af], a ld a, $ff call PlaySound - ld c, $2 - ld a, $b9 + ld c, BANK(SFX_02_5f) + ld a, (SFX_02_5f - $4000) / 3 call PlayMusic .asm_7bf57 ld a, [$c02a] @@ -114038,10 +114065,10 @@ Music1f_Channel3DutyPointers: ; 7c361 (1f:4361) dw Music1f_Channel3Duty3 dw Music1f_Channel3Duty4 dw Music1f_Channel3Duty5 - dw SFX_1f_3f_Ch1 - dw SFX_1f_3f_Ch1 - dw SFX_1f_3f_Ch1 - dw SFX_1f_3f_Ch1 + dw SFX_1f_3f_Ch1 ; unused + dw SFX_1f_3f_Ch1 ; unused + dw SFX_1f_3f_Ch1 ; unused + dw SFX_1f_3f_Ch1 ; unused Music1f_Channel3Duty1: ; 7c373 (1f:4373) db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11 @@ -114252,9 +114279,9 @@ Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac) ld hl, $c02e add hl, bc bit 6, [hl] ; dutycycle - jr z, .checkForexecutemusic + jr z, .checkForExecuteMusic call Music1f_ApplyDutyCycle -.checkForexecutemusic +.checkForExecuteMusic ld b, $0 ld hl, $c036 add hl, bc diff --git a/music/sfx/sfx_08_pokeflute.asm b/music/sfx/sfx_08_pokeflute.asm new file mode 100755 index 00000000..3160f87c --- /dev/null +++ b/music/sfx/sfx_08_pokeflute.asm @@ -0,0 +1,15 @@ +SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) + tempo 1, 0 + + +SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) + executemusic + notetype 8, 0, 0 + rest 5 + rest 7 + rest 5 + rest 5 + rest 5 + rest 5 + endchannel +; 0x2232f \ No newline at end of file diff --git a/music/sfx/sfx_08_pokeflute_ch3.asm b/music/sfx/sfx_08_pokeflute_ch3.asm new file mode 100755 index 00000000..28f1dfd7 --- /dev/null +++ b/music/sfx/sfx_08_pokeflute_ch3.asm @@ -0,0 +1,14 @@ +SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) + executemusic + vibrato 16, 1, 4 + notetype 8, 1, 0 + octave 5 + note E_, 3 + note F_, 3 + note G_, 7 + note A_, 3 + note G_, 3 + octave 6 + note C_, 13 + endchannel +; 0x204aa \ No newline at end of file diff --git a/music/sfx/sfx_08_unused.asm b/music/sfx/sfx_08_unused.asm new file mode 100755 index 00000000..4ba4c212 --- /dev/null +++ b/music/sfx/sfx_08_unused.asm @@ -0,0 +1,32 @@ +SFX_08_unused_Ch1: ; 2098b (8:498b) + dutycycle 240 + unknownsfx0x20 15, 224, 128, 7 + unknownsfx0x20 15, 240, 132, 7 + unknownsfx0x20 15, 195, 224, 5 + unknownsfx0x20 15, 196, 0, 6 + unknownsfx0x20 10, 108, 128, 7 + unknownsfx0x20 8, 113, 132, 7 + endchannel + + +SFX_08_unused_Ch2: ; 209a6 (8:49a6) + dutycycle 5 + unknownsfx0x20 15, 160, 65, 7 + unknownsfx0x20 15, 176, 67, 7 + unknownsfx0x20 15, 147, 177, 5 + unknownsfx0x20 15, 148, 193, 5 + unknownsfx0x20 10, 76, 65, 7 + unknownsfx0x20 8, 49, 70, 7 + endchannel + + +SFX_08_unused_Ch3: ; 209c1 (8:49c1) + unknownnoise0x20 2, 242, 76 + unknownnoise0x20 6, 224, 58 + unknownnoise0x20 15, 208, 58 + unknownnoise0x20 8, 208, 44 + unknownnoise0x20 6, 230, 76 + unknownnoise0x20 12, 125, 76 + unknownnoise0x20 15, 211, 76 + endchannel +; 0x209d7 \ No newline at end of file diff --git a/music/sfx/sfx_08_unused2.asm b/music/sfx/sfx_08_unused2.asm new file mode 100755 index 00000000..be887476 --- /dev/null +++ b/music/sfx/sfx_08_unused2.asm @@ -0,0 +1,57 @@ +SFX_08_unused2_Ch1: ; 2232f (8:632f) + executemusic + tempo 1, 0 + stereopanning 119 + vibrato 6, 2, 6 + duty 2 + togglecall + notetype 6, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + notetype 6, 11, 3 + note G#, 2 + note B_, 2 + octave 4 + note E_, 8 + endchannel + + +SFX_08_unused2_Ch2: ; 22347 (8:6347) + executemusic + vibrato 8, 2, 7 + duty 2 + notetype 6, 12, 1 + octave 4 + note E_, 2 + note E_, 1 + note E_, 1 + notetype 6, 12, 3 + note E_, 2 + note G#, 2 + note B_, 8 + endchannel + + +SFX_08_unused2_Ch3: ; 22359 (8:6359) + executemusic + notetype 6, 1, 0 + octave 4 + note B_, 1 + rest 1 + notetype 3, 1, 0 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + notetype 6, 1, 0 + note B_, 1 + rest 1 + octave 5 + note E_, 1 + rest 1 + octave 4 + note B_, 4 + rest 4 + endchannel +; 0x22370 \ No newline at end of file -- cgit v1.2.3 From 367c7eed6440a8dec3cf74910a64ea9504bbb8c5 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Thu, 24 Oct 2013 04:14:23 -0400 Subject: Add MapSongBanks: --- main.asm | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 499 insertions(+), 3 deletions(-) diff --git a/main.asm b/main.asm index 68055607..d7ffe829 100755 --- a/main.asm +++ b/main.asm @@ -2744,10 +2744,10 @@ LoadMapHeader: ; 107c (0:107c) ld b,$00 ld a,[H_LOADEDROMBANK] push af - ld a,$03 + ld a, BANK(MapSongBanks) ld [H_LOADEDROMBANK],a ld [$2000],a - ld hl,$404d + ld hl, MapSongBanks add hl,bc add hl,bc ld a,[hli] @@ -20315,7 +20315,503 @@ HandleJoypadResetButtons: ; c03c (3:403c) jp z, SoftReset jp GetJoypadState -INCBIN "baserom.gbc",$c04d,$c23d - $c04d +MapSongBanks: ; c04d (3:404d) + db (Music_PalletTown - $4000) / 3 + db BANK(Music_PalletTown) ;PALLET_TOWN + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; VIRIDIAN_CITY + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; PEWTER_CITY + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; CERULEAN_CITY + db (Music_Lavender - $4000) / 3 + db BANK(Music_Lavender) ; LAVENDER_TOWN + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; VERMILION_CITY + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CELADON_CITY + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; FUCHSIA_CITY + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) ; CINNABAR_ISLAND + db (Music_IndigoPlateau - $4000) / 3 + db BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; SAFFRON_CITY + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; unused + db (Music_Routes1 - $4000) / 3 + db BANK(Music_Routes1) ; ROUTE_1 + db (Music_Routes1 - $4000) / 3 + db BANK(Music_Routes1) ; ROUTE_2 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_3 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_4 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_5 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_6 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_7 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_8 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_9 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_10 + db (Music_Routes4 - $4000) / 3 + db BANK(Music_Routes4) ; ROUTE_11 + db (Music_Routes4 - $4000) / 3 + db BANK(Music_Routes4) ; ROUTE_12 + db (Music_Routes4 - $4000) / 3 + db BANK(Music_Routes4) ; ROUTE_13 + db (Music_Routes4 - $4000) / 3 + db BANK(Music_Routes4) ; ROUTE_14 + db (Music_Routes4 - $4000) / 3 + db BANK(Music_Routes4) ; ROUTE_15 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_16 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_17 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_18 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_19 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_20 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_21 + db (Music_Routes3 - $4000) / 3 + db BANK(Music_Routes3) ; ROUTE_22 + db (Music_IndigoPlateau - $4000) / 3 + db BANK(Music_IndigoPlateau) ; ROUTE_23 + db (Music_Routes2 - $4000) / 3 + db BANK(Music_Routes2) ; ROUTE_24 + db (Music_Routes2 - $4000) / 3 + db BANK(Music_Routes2) ; ROUTE_25 + db (Music_PalletTown - $4000) / 3 + db BANK(Music_PalletTown) ; RedsHouse1F + db (Music_PalletTown - $4000) / 3 + db BANK(Music_PalletTown) ; RedsHouse2F + db (Music_PalletTown - $4000) / 3 + db BANK(Music_PalletTown) ; BluesHouse + db (Music_OaksLab - $4000) / 3 + db BANK(Music_OaksLab) ; OaksLab + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; ViridianPokecenter + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; ViridianMart + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; School + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; ViridianHouse + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; ViridianGym + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; DiglettsCaveRoute2 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; ViridianForestexit + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route2House + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route2Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; ViridianForestEntrance + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; ViridianForest + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; MuseumF1 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; MuseumF2 + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; PewterGym + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; PewterHouse1 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; PewterMart + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; PewterHouse2 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; PewterPokecenter + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; MtMoon1 + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; MtMoon2 + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; MtMoon3 + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; CeruleanHouseTrashed + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; CeruleanHouse + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeruleanPokecenter + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; CeruleanGym + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; BikeShop + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeruleanMart + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; MtMoonPokecenter + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; CeruleanHouseTrashed + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route5Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; DayCareM + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route6Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6 + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; FREEZE + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route7Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; UndergroundPathEntranceRoute7 + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ;FREEZE + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route8Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; UndergroundPathEntranceRoute8 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; RockTunnelPokecenter + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; RockTunnel1 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; PowerPlant + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; Route11Gate + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11 + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; Route11GateUpstairs + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route12Gate + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; BillsHouse + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; VermilionPokecenter + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; FanClub + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; VermilionMart + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; VermilionGym + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; VermilionHouse1 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; VermilionDock + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne1 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne2 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne3 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne4 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne5 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne6 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne7 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne8 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne9 + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ; SSAnne10 + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ;unused + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ;unused + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ;unused + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; VictoryRoad1 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ;unused + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ;unused + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ;unused + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ;unused + db (Music_IndigoPlateau - $4000) / 3 + db BANK(Music_IndigoPlateau) ; Lance + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ;unused + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ;unused + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ;unused + db (Music_SSAnne - $4000) / 3 + db BANK(Music_SSAnne) ;unused + db (Music_PalletTown - $4000) / 3 + db BANK(Music_PalletTown) ; HallofFameRoom + db (Music_Routes1 - $4000) / 3 + db BANK(Music_Routes1) ; UndergroundPathNS + db (Music_IndigoPlateau - $4000) / 3 + db BANK(Music_IndigoPlateau) ; Gary + db (Music_Routes1 - $4000) / 3 + db BANK(Music_Routes1) ; UndergroundPathWE + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMart1 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMart2 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMart3 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMart4 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMartRoof + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMartElevator + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonMansion1 + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonMansion2 + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonMansion3 + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonMansion4 + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonMansion5 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonPokecenter + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; CeladonGym + db (Music_GameCorner - $4000) / 3 + db BANK(Music_GameCorner) ; CeladonGameCorner + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CeladonMart5 + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonPrizeRoom + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonDiner + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonHouse + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; CeladonHotel + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; LavenderPokecenter + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower1 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower2 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower3 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower4 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower5 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower6 + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; PokemonTower7 + db (Music_Lavender - $4000) / 3 + db BANK(Music_Lavender) ; LavenderHouse1 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; LavenderMart + db (Music_Lavender - $4000) / 3 + db BANK(Music_Lavender) ; LavenderHouse2 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; FuchsiaMart + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; FuchsiaHouse1 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; FuchsiaPokecenter + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; FuchsiaHouse2 + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; SafariZoneEntrance + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; FuchsiaGym + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; FuchsiaMeetingRoom + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; SeafoamIslands2 + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; SeafoamIslands3 + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; SeafoamIslands4 + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; SeafoamIslands5 + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; VermilionHouse2 + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; FuchsiaHouse3 + db (Music_CinnabarMansion - $4000) / 3 + db BANK(Music_CinnabarMansion) ; Mansion1 + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; CinnabarGym + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) ; Lab1 + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) ; Lab2 + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) ; Lab3 + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) ; Lab4 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CinnabarPokecenter + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; CinnabarMart + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) + db (Music_IndigoPlateau - $4000) / 3 + db BANK(Music_IndigoPlateau) ; IndigoPlateauLobby + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; CopycatsHouseF1 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; CopycatsHouseF2 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; FightingDojo + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; SaffronGym + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; SaffronHouse1 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; SaffronMart + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo1 + db (Music_Pokecenter - $4000) / 3 + db BANK(Music_Pokecenter) ; SaffronPokecenter + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; SaffronHouse2 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route15Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route15GateUpstairs + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route16GateMap + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route16GateUpstairs + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; Route16House + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; Route12House + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route18Gate + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route18GateUpstairs + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; SeafoamIslands1 + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; Route22Gate + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; VictoryRoad2 + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; Route12GateUpstairs + db (Music_Vermilion - $4000) / 3 + db BANK(Music_Vermilion) ; VermilionHouse3 + db (Music_Dungeon2 - $4000) / 3 + db BANK(Music_Dungeon2) ; DiglettsCave + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; VictoryRoad3 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; RocketHideout1 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; RocketHideout2 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; RocketHideout3 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; RocketHideout4 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; RocketHideoutElevator + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo2 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo3 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo4 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo5 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo6 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo7 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo8 + db (Music_CinnabarMansion - $4000) / 3 + db BANK(Music_CinnabarMansion) ; Mansion2 + db (Music_CinnabarMansion - $4000) / 3 + db BANK(Music_CinnabarMansion) ; Mansion3 + db (Music_CinnabarMansion - $4000) / 3 + db BANK(Music_CinnabarMansion) ; Mansion4 + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneEast + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneNorth + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneWest + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneCenter + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneRestHouse1 + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneSecretHouse + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneRestHouse2 + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneRestHouse3 + db (Music_SafariZone - $4000) / 3 + db BANK(Music_SafariZone) ; SafariZoneRestHouse4 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; UnknownDungeon2 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; UnknownDungeon3 + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; UnknownDungeon1 + db (Music_Cities2 - $4000) / 3 + db BANK(Music_Cities2) ; NameRater + db (Music_Cities1 - $4000) / 3 + db BANK(Music_Cities1) ; CeruleanHouse2 + db (Music_Cinnabar - $4000) / 3 + db BANK(Music_Cinnabar) + db (Music_Dungeon3 - $4000) / 3 + db BANK(Music_Dungeon3) ; RockTunnel2 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo9 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo10 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCo11 + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) ; SilphCoElevator + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; BattleCenterM + db (Music_Celadon - $4000) / 3 + db BANK(Music_Celadon) ; TradeCenterM + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) + db (Music_SilphCo - $4000) / 3 + db BANK(Music_SilphCo) + db (Music_Gym - $4000) / 3 + db BANK(Music_Gym) ; Lorelei + db (Music_Dungeon1 - $4000) / 3 + db BANK(Music_Dungeon1) ; Bruno + db (Music_PokemonTower - $4000) / 3 + db BANK(Music_PokemonTower) ; Agatha ; see also MapHeaderPointers MapHeaderBanks: ; c23d (3:423d) -- cgit v1.2.3 From 607cbdb0bd7d309f5a513ed1d727b4e237dab667 Mon Sep 17 00:00:00 2001 From: "U-Fish-PC\\Daniel" Date: Thu, 24 Oct 2013 04:16:38 -0400 Subject: typo --- music/headers/musicheaders02.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/music/headers/musicheaders02.asm b/music/headers/musicheaders02.asm index be7e78e0..ebee47ef 100644 --- a/music/headers/musicheaders02.asm +++ b/music/headers/musicheaders02.asm @@ -172,7 +172,7 @@ Music_Routes4: ; 82d5 (2:42d5) db CH3 dw Music_Routes4_Ch4 -; Route 3, Indigo Plateau +; Route 23, Indigo Plateau Music_IndigoPlateau: ; 82f1 (2:42f1) db ( $C0 | CH0 ) dw Music_IndigoPlateau_Ch1 -- cgit v1.2.3