diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-10-21 19:30:07 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2013-10-21 19:30:07 -0400 |
| commit | d47cdd6e159066fa71a0ca2a0571b10547834159 (patch) | |
| tree | d9ccaae21ca98d628d930c3bcc6f3263ac0286a5 | |
| parent | 74948728aae7402250083e400adf45159e8a18bd (diff) | |
More bank 2 music engine and music/sfx format update
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 @@ -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 |