ref: 7ecf8b1714264ff7891480a1da9beb978356b666
parent: 5c6bcde09f249f09aa2d138557659a6f8bae49e2
parent: 607cbdb0bd7d309f5a513ed1d727b4e237dab667
author: IIMarckus <iimarckus@gmail.com>
date: Wed Oct 30 18:27:36 EDT 2013
Merge branch 'music' of https://github.com/dannye/pokered
--- a/constants.asm
+++ b/constants.asm
@@ -273,6 +273,8 @@
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 @@
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 @@
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
@@ -3483,57 +3499,13 @@
db \1
ENDM
-unknownmusic0xef: MACRO
- db $EF
-ENDM
-
stereopanning: MACRO
db $F0
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
--- a/main.asm
+++ b/main.asm
@@ -1214,12 +1214,12 @@
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
@@ -2743,10 +2743,10 @@
ld b,$00
ld a,[H_LOADEDROMBANK]
push af
- ld a,$03
+ ld a, BANK(MapSongBanks)
ld [H_LOADEDROMBANK],a
ld [$2000],a
- ld hl,$404d
+ ld hl, MapSongBanks
add hl,bc
add hl,bc
ld a,[hli]
@@ -5286,7 +5286,7 @@
ld [$c0ef], a
ld [$c0f0], a
xor a
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
ld [$c0ee], a
ld [$cfca], a
dec a
@@ -5830,10 +5830,10 @@
jr z, .asm_2343
cp $2
jr z, .asm_2332
- ld a, $d2
+ ld a, (Music_BikeRiding - $4000) / 3
jr .asm_2334
.asm_2332
- ld a, $d6
+ ld a, (Music_Surfing - $4000) / 3
.asm_2334
ld b, a
ld a, d
@@ -5855,7 +5855,7 @@
ret z
.asm_2351
ld a, c
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
ld a, b
ld [$cfca], a
ld [$c0ee], a
@@ -5915,7 +5915,7 @@
ld b, a
ld [$c0ee], a
xor a
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
ld a, c
ld [$c0ef], a
ld [$c0f0], a
@@ -5936,7 +5936,7 @@
ld [$c02c], a
ld [$c02d], a
.asm_23c8
- ld a, [$cfc7]
+ ld a, [W_CURCHANNELPOINTER]
and a
jr z, .asm_23e3
ld a, [$c0ee]
@@ -5948,7 +5948,7 @@
cp $ff
jr nz, .asm_2414
xor a
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
.asm_23e3
xor a
ld [$c0ee], a
@@ -5981,11 +5981,11 @@
.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
@@ -6736,7 +6736,7 @@
; 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]
@@ -6771,10 +6771,10 @@
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
@@ -7037,7 +7037,7 @@
ld [$2000],a ; ROM bank 4
ld a,[$d700] ; walking/biking/surfing
ld [$d11a],a
- ld a,$8f ; Start menu sound
+ ld a, (SFX_02_3f - $4000) / 3 ; Start menu sound
call PlaySound
RedisplayStartMenu: ; 2adf (0:2adf)
@@ -7166,7 +7166,7 @@
ld a,$13
ld [$d125],a
call DisplayTextBoxID ; redraw money text box
- ld a,$b2
+ ld a, (SFX_02_5a - $4000) / 3
call PlaySoundWaitForCurrent ; play sound
jp WaitForSoundToFinish ; wait until sound is done playing
@@ -8478,14 +8478,14 @@
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]
@@ -8497,7 +8497,7 @@
jr z, .noEvilTrainer
cp b
jr nz, .evilTrainerListLoop
- ld a, $f6
+ ld a, (Music_MeetEvilTrainer - $4000) / 3
jr .PlaySound
.noEvilTrainer
ld hl, FemaleTrainerList
@@ -8507,10 +8507,10 @@
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
@@ -11112,7 +11112,7 @@
call PrintGameVersionOnTitleScreen
call Delay3
call WaitForSoundToFinish
- ld a, $c3
+ ld a, (Music_TitleScreen - $4000) / 3
ld [$c0ee], a
call PlaySound
xor a
@@ -13304,8 +13304,8 @@
call Predef ; indirect jump to HealParty (f6a5 (3:76a5))
jp Func_577d
.asm_5506
- ld c, $1f
- ld a, $d9
+ ld c, BANK(Music_GameCorner)
+ ld a, (Music_GameCorner - $4000) / 3
call PlayMusic
jr Func_551c
@@ -13844,7 +13844,7 @@
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
@@ -13943,10 +13943,10 @@
ld [W_ISLINKBATTLE], a ; $d12b
ld [$FF00+$b5], a
ld a, $a
- ld [$cfc7], a
- ld a, $2
+ ld [W_CURCHANNELPOINTER], a
+ ld a, BANK(Music_Celadon)
ld [$c0f0], a
- ld a, $ca
+ ld a, (Music_Celadon - $4000) / 3
ld [$c0ee], a
jp PlaySound
@@ -14755,9 +14755,9 @@
OakSpeech: ; 6115 (1:6115)
ld a,$FF
call PlaySound ; stop music
- ld a,2 ; bank of song
+ ld a, BANK(Music_Routes2) ; bank of song
ld c,a
- ld a,$EF ; song #
+ ld a, (Music_Routes2 - $4000) / 3 ; song #
call PlayMusic ; plays music
call ClearScreen
call LoadTextBoxTilePatterns
@@ -14854,7 +14854,7 @@
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
@@ -16639,7 +16639,7 @@
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]
@@ -18368,8 +18368,32 @@
INCLUDE "music/sfx/sfx_02_12.tx"
INCLUDE "music/sfx/sfx_02_13.tx"
-INCBIN "baserom.gbc",$8361,$83c3 - $8361
+Music2_Channel3DutyPointers: ; 0x8361
+ dw Music2_Channel3Duty1
+ dw Music2_Channel3Duty2
+ dw Music2_Channel3Duty3
+ dw Music2_Channel3Duty4
+ dw Music2_Channel3Duty5
+ dw SFX_02_3f_Ch1 ; unused
+ dw SFX_02_3f_Ch1 ; unused
+ dw SFX_02_3f_Ch1 ; unused
+ dw SFX_02_3f_Ch1 ; unused
+Music2_Channel3Duty1: ; 0x8373
+ db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
+
+Music2_Channel3Duty2: ; 0x8383
+ db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
+
+Music2_Channel3Duty3: ; 0x8393
+ db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
+
+Music2_Channel3Duty4: ; 0x83a3
+ db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
+
+Music2_Channel3Duty5: ; 0x83b3
+ db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
+
INCLUDE "music/sfx/sfx_02_3f.tx"
INCLUDE "music/sfx/sfx_02_5e.tx"
INCLUDE "music/sfx/sfx_02_56.tx"
@@ -18404,9 +18428,7 @@
INCLUDE "music/sfx/sfx_02_54.tx"
INCLUDE "music/sfx/sfx_02_55.tx"
INCLUDE "music/sfx/sfx_02_5f.tx"
-
-INCBIN "baserom.gbc",$86e3,$872f - $86e3
-
+INCLUDE "music/sfx/sfx_02_unused.tx"
INCLUDE "music/sfx/sfx_02_1d.tx"
INCLUDE "music/sfx/sfx_02_37.tx"
INCLUDE "music/sfx/sfx_02_38.tx"
@@ -18446,59 +18468,58 @@
INCLUDE "music/sfx/sfx_02_35.tx"
INCLUDE "music/sfx/sfx_02_36.tx"
-Func_90c6: ; 0x90c6
+PlayBattleMusic: ; 0x90c6
xor a
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
ld [$d083], a
dec a
ld [$c0ee], a
- call PlaySound
+ call PlaySound ; stop music
call DelayFrame
- ld c, $8
- ld a, [$d05c]
+ ld c, BANK(Music_GymLeaderBattle)
+ ld a, [W_GYMLEADERNO]
and a
- jr z, .asm_90e3 ; 0x90dd $4
- ld a, $ea
- jr .asm_9100 ; 0x90e1 $1d
-.asm_90e3
- ld a, [$d059]
+ jr z, .notGymLeaderBattle
+ ld a, (Music_GymLeaderBattle - $4000) / 3
+ jr .playSong
+.notGymLeaderBattle
+ ld a, [W_CUROPPONENT]
cp $c8
- jr c, .asm_90fe ; 0x90e8 $14
- cp $f3
- jr z, .asm_90fa ; 0x90ec $c
- cp $f7
- jr nz, .asm_90f6 ; 0x90f0 $4
- ld a, $ea
- jr .asm_9100 ; 0x90f4 $a
-.asm_90f6
- ld a, $ed
- jr .asm_9100 ; 0x90f8 $6
-.asm_90fa
- ld a, $f3
- jr .asm_9100 ; 0x90fc $2
-.asm_90fe
- ld a, $f0
-.asm_9100
+ jr c, .wildBattle
+ cp SONY3 + $c8
+ jr z, .finalBattle
+ cp LANCE + $c8
+ jr nz, .normalTrainerBattle
+ ld a, (Music_GymLeaderBattle - $4000) / 3 ; lance also plays gym leader theme
+ jr .playSong
+.normalTrainerBattle
+ ld a, (Music_TrainerBattle - $4000) / 3
+ jr .playSong
+.finalBattle
+ ld a, (Music_FinalBattle - $4000) / 3
+ jr .playSong
+.wildBattle
+ ld a, (Music_WildBattle - $4000) / 3
+.playSong
jp PlayMusic
-; 0x9103
Func_9103: ; 0x9103
- ld c, $0
-.asm_9105
+ ld c, CH0
+.loop
ld b, $0
ld hl, $c026
add hl, bc
ld a, [hl]
and a
- jr z, .asm_9131 ; 0x910d $22
+ jr z, .nextChannel
ld a, c
- cp $4
- jr nc, .asm_912e ; 0x9112 $1a
+ cp CH4
+ jr nc, .asm_912e ; if sfx channel
ld a, [$c002]
and a
- jr z, .asm_912e ; 0x9118 $14
+ jr z, .asm_912e
bit 7, a
- jr nz, .asm_9131 ; 0x911c $13
+ jr nz, .nextChannel
set 7, a
ld [$c002], a
xor a
@@ -18506,74 +18527,80 @@
ld [$ff00+$1a], a
ld a, $80
ld [$ff00+$1a], a
- jr .asm_9131 ; 0x912c $3
+ jr .nextChannel
.asm_912e
- call Func_9138
-.asm_9131
+ call Music2_ApplyMusicAffects
+.nextChannel
ld a, c
- inc c
- cp $7
- jr nz, .asm_9105 ; 0x9135 $ce
+ inc c ; inc channel number
+ cp CH7
+ jr nz, .loop
ret
-; 0x9138
-Func_9138: ; 0x9138
+; this routine checks flags for music effects currently applied
+; to the channel and calls certain functions based on flags.
+; known flags for $c02e:
+; 1: call has been used
+; 3: a toggle used only by this routine for vibrato
+; 4: pitchbend flag
+; 6: dutycycle flag
+Music2_ApplyMusicAffects: ; 0x9138
ld b, $0
- ld hl, $c0b6
+ ld hl, $c0b6 ; delay unitl next note
add hl, bc
ld a, [hl]
- cp $1
- jp z, Func_91d0
- dec a
+ cp $1 ; if the delay is 1, play next note
+ jp z, Music2_PlayNextNote
+ dec a ; otherwise, decrease the delay timer
ld [hl], a
ld a, c
- cp $4
- jr nc, .asm_9154 ; 0x9149 $9
+ cp CH4
+ jr nc, .startChecks ; if a sfx channel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr z, .asm_9154 ; 0x9151 $1
+ jr z, .startChecks
ret
-.asm_9154
+.startChecks
ld hl, $c02e
add hl, bc
- bit 6, [hl]
- jr z, .asm_915f ; 0x915a $3
- call Func_980d
-.asm_915f
+ bit 6, [hl] ; dutycycle
+ jr z, .checkForExecuteMusic
+ call Music2_ApplyDutyCycle
+.checkForExecuteMusic
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_9171 ; 0x9167 $8
+ jr nz, .checkForPitchBend
ld hl, $c02e
add hl, bc
bit 2, [hl]
- jr nz, .asm_9185 ; 0x916f $14
-.asm_9171
+ jr nz, .disablePitchBendVibrato
+.checkForPitchBend
ld hl, $c02e
add hl, bc
- bit 4, [hl]
- jr z, .asm_917c ; 0x9177 $3
- jp Func_96f9
-.asm_917c
- ld hl, $c04e
+ bit 4, [hl] ; pitchbend
+ jr z, .checkVibratoDelay
+ jp Music2_ApplyPitchBend
+.checkVibratoDelay
+ ld hl, $c04e ; vibrato delay
add hl, bc
ld a, [hl]
- and a
- jr z, .asm_9186 ; 0x9182 $2
- 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 ; 0x918c $1
- ret
-.asm_918f
+ jr nz, .vibrato
+ ret ; no vibrato
+.vibrato
ld d, a
ld hl, $c05e
add hl, bc
@@ -18580,21 +18607,21 @@
ld a, [hl]
and $f
and a
- jr z, .asm_919c ; 0x9198 $2
- 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 ; 0x91ac $e
+ 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
@@ -18601,27 +18628,29 @@
ld d, a
ld a, e
sub d
- jr nc, .asm_91ba ; 0x91b6 $2
+ jr nc, .noCarry
ld a, $0
-.asm_91ba
- jr .asm_91c8 ; 0x91ba $c
-.asm_91bc
+.noCarry
+ jr .done
+.unset
set 3, [hl]
ld a, d
and $f0
swap a
add e
- jr nc, .asm_91c8 ; 0x91c4 $2
+ jr nc, .done
ld a, $ff
-.asm_91c8
+.done
ld d, a
ld b, $3
call Func_9838
ld [hl], d
ret
-; 0x91d0
-Func_91d0 ; 0x91d0
+; this routine executes all music commands that take up no time,
+; like tempo changes, duty changes etc. and doesn't return
+; until the first note is reached
+Music2_PlayNextNote ; 0x91d0
ld hl, $c06e
add hl, bc
ld a, [hl]
@@ -18632,46 +18661,45 @@
add hl, bc
res 4, [hl]
res 5, [hl]
- call Func_91e6
+ call Music2_endchannel
ret
-; 0x91e6
-Func_91e6 ; 0x91e6
- call Func_9825
+Music2_endchannel: ; 0x91e6
+ call Music2_GetNextMusicByte
ld d, a
- cp $ff
- jp nz, Func_9274
- ld b, $0
+ cp $ff ; is this command an endchannel?
+ jp nz, Music2_callchannel ; no
+ ld b, $0 ; yes
ld hl, $c02e
add hl, bc
bit 1, [hl]
- jr nz, .asm_9224 ; 0x91f7 $2b
+ jr nz, .returnFromCall
ld a, c
- cp $3
- jr nc, .asm_9200 ; 0x91fc $2
- jr .asm_923f ; 0x91fe $3f
-.asm_9200
+ cp CH3
+ jr nc, .noiseOrSfxChannel
+ jr .asm_923f
+.noiseOrSfxChannel
res 2, [hl]
ld hl, $c036
add hl, bc
res 0, [hl]
- cp $6
- jr nz, .asm_9214 ; 0x920a $8
+ cp CH6
+ jr nz, .notSfxChannel3
ld a, $0
ld [$ff00+$1a], a
ld a, $80
ld [$ff00+$1a], a
-.asm_9214
- jr nz, .asm_9222 ; 0x9214 $c
+.notSfxChannel3
+ jr nz, .asm_9222
ld a, [$c003]
and a
- jr z, .asm_9222 ; 0x921a $6
+ jr z, .asm_9222
xor a
ld [$c003], a
- jr .asm_923f ; 0x9220 $1d
+ jr .asm_923f
.asm_9222
- jr .asm_9248 ; 0x9222 $24
-.asm_9224
+ jr .asm_9248
+.returnFromCall
res 1, [hl]
ld d, $0
ld a, c
@@ -18679,7 +18707,7 @@
ld e, a
ld hl, $c006
add hl, de
- push hl
+ push hl ; store current channel address
ld hl, $c016
add hl, de
ld e, l
@@ -18689,10 +18717,10 @@
ld [hli], a
inc de
ld a, [de]
- ld [hl], a
- jp Func_91e6
+ ld [hl], a ; loads channel address to return to
+ jp Music2_endchannel
.asm_923f
- ld hl, $5b1f
+ ld hl, Unknown_9b1f
add hl, bc
ld a, [$ff00+$25]
and [hl]
@@ -18700,18 +18728,18 @@
.asm_9248
ld a, [$c02a]
cp $14
- jr nc, .asm_9251 ; 0x924d $2
- jr .asm_926e ; 0x924f $1d
+ jr nc, .asm_9251
+ jr .asm_926e
.asm_9251
ld a, [$c02a]
cp $86
- jr z, .asm_926e ; 0x9256 $16
- jr c, .asm_925c ; 0x9258 $2
- jr .asm_926e ; 0x925a $12
+ jr z, .asm_926e
+ jr c, .asm_925c
+ jr .asm_926e
.asm_925c
ld a, c
- cp $4
- jr z, .asm_9265 ; 0x925f $4
+ cp CH4
+ jr z, .asm_9265
call Func_96c7
ret c
.asm_9265
@@ -18724,18 +18752,17 @@
add hl, bc
ld [hl], b
ret
-; 0x9274
-Func_9274: ; 0x9274
- cp $fd
- jp nz, Func_92a9
- call Func_9825
+Music2_callchannel: ; 0x9274
+ cp $fd ; is this command a callchannel?
+ jp nz, Music2_loopchannel ; no
+ call Music2_GetNextMusicByte ; yes
push af
- call Func_9825
+ call Music2_GetNextMusicByte
ld d, a
pop af
ld e, a
- push de
+ push de ; store pointer
ld d, $0
ld a, c
add a
@@ -18752,43 +18779,43 @@
ld [de], a
inc de
ld a, [hld]
- ld [de], a
+ ld [de], a ; copy current channel address
pop de
ld [hl], e
inc hl
- ld [hl], d
+ ld [hl], d ; overwrite current address with pointer
ld b, $0
ld hl, $c02e
add hl, bc
- set 1, [hl]
- jp Func_91e6
-; 0x92a9
+ set 1, [hl] ; set the call flag
+ jp Music2_endchannel
-Func_92a9: ; 0x92a9
- cp $fe
- jp nz, Func_92e4
- call Func_9825
+Music2_loopchannel: ; 0x92a9
+ cp $fe ; is this command a loopchannel?
+ jp nz, Music2_notetype ; no
+ call Music2_GetNextMusicByte ; yes
ld e, a
and a
- jr z, .asm_92cd ; 0x92b3 $18
+ jr z, .infiniteLoop
ld b, $0
ld hl, $c0be
add hl, bc
ld a, [hl]
cp e
- jr nz, .asm_92cb ; 0x92bd $c
- ld a, $1
+ jr nz, .loopAgain
+ ld a, $1 ; if no more loops to make,
ld [hl], a
- call Func_9825
- call Func_9825
- jp Func_91e6
-.asm_92cb
+ call Music2_GetNextMusicByte ; skip pointer
+ call Music2_GetNextMusicByte
+ jp Music2_endchannel
+.loopAgain ; inc loop count
inc a
ld [hl], a
-.asm_92cd
- call Func_9825
+ ; fall through
+.infiniteLoop ; overwrite current address with pointer
+ call Music2_GetNextMusicByte
push af
- call Func_9825
+ call Music2_GetNextMusicByte
ld b, a
ld d, $0
ld a, c
@@ -18799,73 +18826,76 @@
pop af
ld [hli], a
ld [hl], b
- jp Func_91e6
-; 0x92e4
+ jp Music2_endchannel
-Func_92e4: ; 0x92e4
+Music2_notetype: ; 0x92e4
and $f0
- cp $d0
- jp nz, Func_9323
- ld a, d
+ cp $d0 ; is this command a notetype?
+ jp nz, Music2_togglecall ; no
+ ld a, d ; yes
and $f
ld b, $0
ld hl, $c0c6
add hl, bc
- ld [hl], a
+ ld [hl], a ; store low nibble as speed
ld a, c
- cp $3
- jr z, .asm_9320 ; 0x92f8 $26
- call Func_9825
+ cp CH3
+ jr z, .noiseChannel ; noise channel has 0 params
+ call Music2_GetNextMusicByte
ld d, a
ld a, c
- cp $2
- jr z, .asm_930c ; 0x9301 $9
- cp $6
- jr nz, .asm_9319 ; 0x9305 $12
+ cp CH2
+ jr z, .musicChannel3
+ cp CH6
+ jr nz, .notChannel3
ld hl, $c0e7
- jr .asm_930f ; 0x930a $3
-.asm_930c
+ jr .sfxChannel3
+.musicChannel3
ld hl, $c0e6
-.asm_930f
+.sfxChannel3
ld a, d
and $f
- ld [hl], a
+ ld [hl], a ; store low nibble of param as duty
ld a, d
and $30
sla a
ld d, a
-.asm_9319
+ ; fall through
+
+ ; if channel 3, store high nibble as volume
+ ; else, store volume (high nibble) and fade (low nibble)
+.notChannel3
ld b, $0
ld hl, $c0de
add hl, bc
ld [hl], d
-.asm_9320
- jp Func_91e6
-; 0x9323
+.noiseChannel
+ jp Music2_endchannel
-Func_9323: ; 0x9323
+Music2_togglecall: ; 0x9323
ld a, d
- cp $e8
- jr nz, .asm_9335 ; 0x9326 $d
- ld b, $0
+ cp $e8 ; is this command an togglecall?
+ jr nz, Music2_vibrato ; no
+ ld b, $0 ; yes
ld hl, $c02e
add hl, bc
ld a, [hl]
xor $1
- ld [hl], a
- jp Func_91e6
-.asm_9335
- cp $ea
- jr nz, .asm_936d ; 0x9337 $34
- call Func_9825
+ ld [hl], a ; flip bit 0 of $c02e (toggle returning from call)
+ jp Music2_endchannel
+
+Music2_vibrato: ; 0x9335
+ cp $ea ; is this command a vibrato?
+ jr nz, Music2_pitchbend ; no
+ call Music2_GetNextMusicByte ; yes
ld b, $0
ld hl, $c04e
add hl, bc
- ld [hl], a
+ ld [hl], a ; store delay
ld hl, $c06e
add hl, bc
- ld [hl], a
- call Func_9825
+ ld [hl], a ; store delay
+ call Music2_GetNextMusicByte
ld d, a
and $f0
swap a
@@ -18877,7 +18907,7 @@
adc b
swap a
or e
- ld [hl], a
+ ld [hl], a ; store rate as both high and low nibbles
ld a, d
and $f
ld d, a
@@ -18885,17 +18915,18 @@
add hl, bc
swap a
or d
- ld [hl], a
- jp Func_91e6
-.asm_936d
- cp $eb
- jr nz, .asm_93a5 ; 0x936f $34
- call Func_9825
+ ld [hl], a ; store depth as both high and low nibbles
+ jp Music2_endchannel
+
+Music2_pitchbend: ; 0x936d
+ cp $eb ; is this command a pitchbend?
+ jr nz, Music2_duty ; no
+ call Music2_GetNextMusicByte ; yes
ld b, $0
ld hl, $c076
add hl, bc
- ld [hl], a
- call Func_9825
+ ld [hl], a ; store first param
+ call Music2_GetNextMusicByte
ld d, a
and $f0
swap a
@@ -18906,21 +18937,22 @@
ld b, $0
ld hl, $c0a6
add hl, bc
- ld [hl], d
+ ld [hl], d ; store unknown part of second param
ld hl, $c0ae
add hl, bc
- ld [hl], e
+ ld [hl], e ; store unknown part of second param
ld b, $0
ld hl, $c02e
add hl, bc
- set 4, [hl]
- call Func_9825
+ set 4, [hl] ; set pitchbend flag
+ call Music2_GetNextMusicByte
ld d, a
- jp Func_950a
-.asm_93a5
- cp $ec
- jr nz, .asm_93ba ; 0x93a7 $11
- call Func_9825
+ jp Music2_notelength
+
+Music2_duty: ; 0x93a5
+ cp $ec ; is this command a duty?
+ jr nz, Music2_tempo ; no
+ call Music2_GetNextMusicByte ; yes
rrca
rrca
and $c0
@@ -18927,111 +18959,120 @@
ld b, $0
ld hl, $c03e
add hl, bc
- ld [hl], a
- jp Func_91e6
-.asm_93ba
- cp $ed
- jr nz, .asm_93fa ; 0x93bc $3c
- ld a, c
- cp $4
- jr nc, .asm_93de ; 0x93c1 $1b
- call Func_9825
- ld [$c0e8], a
- call Func_9825
- ld [$c0e9], a
+ ld [hl], a ; store duty
+ jp Music2_endchannel
+
+Music2_tempo: ; 0x93ba
+ cp $ed ; is this command a tempo?
+ jr nz, Music2_unknownmusic0xee ; no
+ ld a, c ; yes
+ cp CH4
+ jr nc, .sfxChannel
+ call Music2_GetNextMusicByte
+ ld [$c0e8], a ; store first param
+ call Music2_GetNextMusicByte
+ ld [$c0e9], a ; store second param
xor a
- ld [$c0ce], a
+ ld [$c0ce], a ; clear RAM
ld [$c0cf], a
ld [$c0d0], a
ld [$c0d1], a
- jr .asm_93f7 ; 0x93dc $19
-.asm_93de
- call Func_9825
- ld [$c0ea], a
- call Func_9825
- ld [$c0eb], a
+ jr .musicChannelDone
+.sfxChannel
+ call Music2_GetNextMusicByte
+ ld [$c0ea], a ; store first param
+ call Music2_GetNextMusicByte
+ ld [$c0eb], a ; store second param
xor a
- ld [$c0d2], a
+ ld [$c0d2], a ; clear RAM
ld [$c0d3], a
ld [$c0d4], a
ld [$c0d5], a
-.asm_93f7
- jp Func_91e6
-.asm_93fa
- cp $ee
- jr nz, .asm_9407 ; 0x93fc $9
- call Func_9825
- ld [$c004], a
- jp Func_91e6
-.asm_9407
- cp $ef
- jr nz, .asm_9426 ; 0x9409 $1b
- call Func_9825
+.musicChannelDone
+ jp Music2_endchannel
+
+Music2_unknownmusic0xee: ; 0x93fa
+ cp $ee ; is this command an unknownmusic0xee?
+ jr nz, Music2_unknownmusic0xef ; no
+ call Music2_GetNextMusicByte ; yes
+ ld [$c004], a ; store first param
+ jp Music2_endchannel
+
+; this appears to never be used
+Music2_unknownmusic0xef ; 0x9407
+ cp $ef ; is this command an unknownmusic0xef?
+ jr nz, Music2_dutycycle ; no
+ call Music2_GetNextMusicByte ; yes
push bc
call Func_9876
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
- jp Func_91e6
-.asm_9426
- cp $fc
- jr nz, .asm_9444 ; 0x9428 $1a
- call Func_9825
+.skip
+ jp Music2_endchannel
+
+Music2_dutycycle: ; 0x9426
+ cp $fc ; is this command a dutycycle?
+ jr nz, Music2_stereopanning ; no
+ call Music2_GetNextMusicByte ; yes
ld b, $0
ld hl, $c046
add hl, bc
- ld [hl], a
+ ld [hl], a ; store full cycle
and $c0
ld hl, $c03e
add hl, bc
- ld [hl], a
+ ld [hl], a ; store first duty
ld hl, $c02e
add hl, bc
- set 6, [hl]
- jp Func_91e6
-.asm_9444
- cp $f0
- jr nz, .asm_9450 ; 0x9446 $8
- call Func_9825
- ld [$ff00+$24], a
- jp Func_91e6
-.asm_9450
- cp $f8
- jr nz, .asm_945f ; 0x9452 $b
- ld b, $0
+ set 6, [hl] ; set dutycycle flag
+ jp Music2_endchannel
+
+Music2_stereopanning: ; 0x9444
+ cp $f0 ; is this command a stereopanning?
+ jr nz, Music2_executemusic ; no
+ call Music2_GetNextMusicByte ; yes
+ ld [$ff00+$24], a ; store stereopanning
+ jp Music2_endchannel
+
+Music2_executemusic: ; 0x9450
+ cp $f8 ; is this command an executemusic?
+ jr nz, Music2_octave ; no
+ ld b, $0 ; yes
ld hl, $c036
add hl, bc
set 0, [hl]
- jp Func_91e6
-.asm_945f
+ jp Music2_endchannel
+
+Music2_octave: ; 0x945f
and $f0
- cp $e0
- jr nz, .asm_9472 ; 0x9463 $d
- ld hl, $c0d6
+ cp $e0 ; is this command an octave?
+ jr nz, Music2_unknownsfx0x20 ; no
+ ld hl, $c0d6 ; yes
ld b, $0
add hl, bc
ld a, d
and $f
- ld [hl], a
- jp Func_91e6
-.asm_9472
- cp $20
- jr nz, .asm_94bf ; 0x9474 $49
+ ld [hl], a ; store low nibble as octave
+ jp Music2_endchannel
+
+Music2_unknownsfx0x20: ; 0x9472
+ cp $20 ; is this command an unknownsfx0x20?
+ jr nz, Music2_unknownsfx0x10 ; no
ld a, c
- cp $3
- jr c, .asm_94bf ; 0x9479 $44
+ cp CH3 ; is this a noise or sfx channel?
+ jr c, Music2_unknownsfx0x10 ; no
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_94bf ; 0x9483 $3a
- call Func_950a
+ jr nz, Music2_unknownsfx0x10 ; no
+ call Music2_notelength ; yes
ld d, a
ld b, $0
ld hl, $c03e
@@ -19042,21 +19083,21 @@
ld b, $1
call Func_9838
ld [hl], d
- call Func_9825
+ call Music2_GetNextMusicByte
ld d, a
ld b, $2
call Func_9838
ld [hl], d
- call Func_9825
+ call Music2_GetNextMusicByte
ld e, a
ld a, c
- cp $7
+ cp CH7
ld a, $0
- jr z, .asm_94b2 ; 0x94ab $5
+ jr z, .sfxNoiseChannel ; only two params for noise channel
push de
- call Func_9825
+ call Music2_GetNextMusicByte
pop de
-.asm_94b2
+.sfxNoiseChannel
ld d, a
push de
call Func_9629
@@ -19064,30 +19105,32 @@
pop de
call Func_964b
ret
-.asm_94bf
+
+Music2_unknownsfx0x10:
ld a, c
- cp $4
- jr c, .asm_94db ; 0x94c2 $17
+ cp CH4
+ jr c, Music2_note ; if not a sfx
ld a, d
- cp $10
- jr nz, .asm_94db ; 0x94c7 $12
+ cp $10 ; is this command a unknownsfx0x10?
+ jr nz, Music2_note ; no
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_94db ; 0x94d1 $8
- call Func_9825
+ jr nz, Music2_note ; no
+ call Music2_GetNextMusicByte ; yes
ld [$ff00+$10], a
- jp Func_91e6
-.asm_94db
+ jp Music2_endchannel
+
+Music2_note:
ld a, c
- cp $3
- jr nz, Func_950a ; 0x94de $2a
+ cp CH3
+ jr nz, Music2_notelength ; if not noise channel
ld a, d
and $f0
- cp $b0
- jr z, .asm_94f5 ; 0x94e5 $e
- jr nc, Func_950a ; 0x94e7 $21
+ cp $b0 ; is this command a dnote?
+ jr z, Music2_dnote ; yes
+ jr nc, Music2_notelength ; no
swap a
ld b, a
ld a, d
@@ -19096,18 +19139,19 @@
ld a, b
push de
push bc
- jr .asm_94fd ; 0x94f3 $8
-.asm_94f5
+ jr asm_94fd
+
+Music2_dnote:
ld a, d
and $f
push af
push bc
- call Func_9825
-.asm_94fd
+ call Music2_GetNextMusicByte ; get dnote instrument
+asm_94fd
ld d, a
ld a, [$c003]
and a
- jr nz, .asm_9508 ; 0x9502 $4
+ jr nz, .asm_9508
ld a, d
call Func_9876
.asm_9508
@@ -19114,13 +19158,13 @@
pop bc
pop de
-Func_950a: ; 0x950a
+Music2_notelength: ; 0x950a
ld a, d
push af
and $f
inc a
ld b, $0
- ld e, a
+ ld e, a ; store note length (in 16ths)
ld d, b
ld hl, $c0c6
add hl, bc
@@ -19128,24 +19172,24 @@
ld l, b
call Func_9847
ld a, c
- cp $4
- jr nc, .asm_952b ; 0x951f $a
+ cp CH4
+ jr nc, .sfxChannel
ld a, [$c0e8]
ld d, a
ld a, [$c0e9]
ld e, a
- jr .asm_953e ; 0x9529 $13
-.asm_952b
+ jr .skip
+.sfxChannel
ld d, $1
ld e, $0
- cp $7
- jr z, .asm_953e ; 0x9531 $b
+ cp CH7
+ jr z, .skip ; if noise channel
call Func_9693
ld a, [$c0ea]
ld d, a
ld a, [$c0eb]
ld e, a
-.asm_953e
+.skip
ld a, l
ld b, $0
ld hl, $c0ce
@@ -19164,41 +19208,43 @@
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_9568 ; 0x955c $a
+ jr nz, Music2_notepitch
ld hl, $c02e
add hl, bc
bit 2, [hl]
- jr z, .asm_9568 ; 0x9564 $2
+ jr z, Music2_notepitch
pop hl
ret
-.asm_9568
+
+Music2_notepitch: ; 0x9568
pop af
and $f0
- cp $c0
- jr nz, .asm_959f ; 0x956d $30
+ cp $c0 ; compare to rest
+ jr nz, .notRest
ld a, c
- cp $4
- jr nc, .asm_957c ; 0x9572 $8
+ cp CH4
+ jr nc, .sfxChannel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_959e ; 0x957a $22
-.asm_957c
+ jr nz, .done
+ ; fall through
+.sfxChannel
ld a, c
- cp $2
- jr z, .asm_9585 ; 0x957f $4
- cp $6
- jr nz, .asm_9592 ; 0x9583 $d
-.asm_9585
+ cp CH2
+ jr z, .musicChannel3
+ cp CH6
+ jr nz, .notSfxChannel3
+.musicChannel3
ld b, $0
- ld hl, $5b1f
+ ld hl, Unknown_9b1f
add hl, bc
ld a, [$ff00+$25]
and [hl]
ld [$ff00+$25], a
- jr .asm_959e ; 0x9590 $c
-.asm_9592
+ jr .done
+.notSfxChannel3
ld b, $2
call Func_9838
ld a, $8
@@ -19206,9 +19252,9 @@
inc hl
ld a, $80
ld [hl], a
-.asm_959e
+.done
ret
-.asm_959f
+.notRest
swap a
ld b, $0
ld hl, $c0d6
@@ -19219,13 +19265,13 @@
ld hl, $c02e
add hl, bc
bit 4, [hl]
- jr z, .asm_95b8 ; 0x95b3 $3
+ jr z, .asm_95b8
call Func_978f
.asm_95b8
push de
ld a, c
- cp $4
- jr nc, .asm_95cd ; 0x95bc $f
+ cp CH4
+ jr nc, .skip ; if sfx channel
ld hl, $c02a
ld d, $0
ld e, a
@@ -19232,12 +19278,12 @@
add hl, de
ld a, [hl]
and a
- jr nz, .asm_95cb ; 0x95c7 $2
- jr .asm_95cd ; 0x95c9 $2
+ jr nz, .asm_95cb
+ jr .skip
.asm_95cb
pop de
ret
-.asm_95cd
+.skip
ld b, $0
ld hl, $c0de
add hl, bc
@@ -19252,9 +19298,9 @@
ld hl, $c02e
add hl, bc
bit 0, [hl]
- jr z, .asm_95ef ; 0x95e9 $4
+ jr z, .asm_95ef
inc e
- jr nc, .asm_95ef ; 0x95ec $1
+ jr nc, .asm_95ef
inc d
.asm_95ef
ld hl, $c066
@@ -19262,42 +19308,40 @@
ld [hl], e
call Func_964b
ret
-; 0x95f8
Func_95f8: ; 0x95f8
ld b, $0
- ld hl, $5b27
+ ld hl, Unknown_9b27
add hl, bc
ld a, [$ff00+$25]
or [hl]
ld d, a
ld a, c
- cp $7
- jr z, .asm_9613 ; 0x9605 $c
- cp $4
- jr nc, .asm_9625 ; 0x9609 $1a
+ cp CH7
+ jr z, .sfxNoiseChannel
+ cp CH4
+ jr nc, .skip ; if sfx channel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_9625 ; 0x9611 $12
-.asm_9613
+ 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
ld d, a
-.asm_9625
+.skip
ld a, d
ld [$ff00+$25], a
ret
-; 0x9629
Func_9629: ; 0x9629
ld b, $0
@@ -19305,10 +19349,10 @@
add hl, bc
ld d, [hl]
ld a, c
- cp $2
- jr z, .asm_9644 ; 0x9633 $f
- cp $6
- jr z, .asm_9644 ; 0x9637 $b
+ cp CH2
+ jr z, .channel3 ; if music channel 3
+ cp CH6
+ jr z, .channel3 ; if sfx channel 3
ld a, d
and $3f
ld d, a
@@ -19317,31 +19361,31 @@
ld a, [hl]
or d
ld d, a
-.asm_9644
+.channel3
ld b, $1
call Func_9838
ld [hl], d
ret
-; 0x964b
Func_964b: ; 0x964b
ld a, c
- cp $2
- jr z, .asm_9654 ; 0x964e $4
- cp $6
- jr nz, .asm_9681 ; 0x9652 $2d
-.asm_9654
+ cp CH2
+ jr z, .channel3
+ cp CH6
+ jr nz, .notSfxChannel3
+ ; fall through
+.channel3
push de
ld de, $c0e6
- cp $2
- jr z, .asm_965f ; 0x965a $3
+ cp CH2
+ jr z, .musicChannel3
ld de, $c0e7
-.asm_965f
+.musicChannel3
ld a, [de]
add a
ld d, $0
ld e, a
- ld hl, $4361
+ ld hl, Music2_Channel3DutyPointers
add hl, de
ld e, [hl]
inc hl
@@ -19350,7 +19394,7 @@
ld b, $f
ld a, $0
ld [$ff00+$1a], a
-.asm_9674
+.loop
ld a, [de]
inc de
ld [hli], a
@@ -19357,11 +19401,11 @@
ld a, b
dec b
and a
- jr nz, .asm_9674 ; 0x967a $f8
+ jr nz, .loop
ld a, $80
ld [$ff00+$1a], a
pop de
-.asm_9681
+.notSfxChannel3
ld a, d
or $80
and $c7
@@ -19373,21 +19417,20 @@
ld [hl], d
call Func_96b5
ret
-; 0x9693
Func_9693: ; 0x9693
call Func_96e5
- jr nc, .asm_96ab ; 0x9696 $13
+ jr nc, .asm_96ab
ld d, $0
ld a, [$c0f2]
add $80
- jr nc, .asm_96a2 ; 0x969f $1
+ jr nc, .asm_96a2
inc d
.asm_96a2
ld [$c0eb], a
ld a, d
ld [$c0ea], a
- jr .asm_96b4 ; 0x96a9 $9
+ jr .asm_96b4
.asm_96ab
xor a
ld [$c0eb], a
@@ -19395,14 +19438,13 @@
ld [$c0ea], a
.asm_96b4
ret
-; 0x96b5
Func_96b5: ; 0x96b5
call Func_96e5
- jr nc, .asm_96c6 ; 0x96b8 $c
+ jr nc, .asm_96c6
ld a, [$c0f1]
add e
- jr nc, .asm_96c1 ; 0x96be $1
+ jr nc, .asm_96c1
inc d
.asm_96c1
dec hl
@@ -19412,11 +19454,10 @@
ld [hl], d
.asm_96c6
ret
-; 0x96c7
Func_96c7: ; 0x96c7
call Func_96e5
- jr nc, .asm_96e2 ; 0x96ca $16
+ jr nc, .asm_96e2
ld hl, $c006
ld e, c
ld d, $0
@@ -19436,17 +19477,16 @@
scf
ccf
ret
-; 0x96e5
Func_96e5: ; 0x96e5
ld a, [$c02a]
cp $14
- jr nc, .asm_96ee ; 0x96ea $2
- jr .asm_96f4 ; 0x96ec $6
+ jr nc, .asm_96ee
+ jr .asm_96f4
.asm_96ee
cp $86
- jr z, .asm_96f4 ; 0x96f0 $2
- jr c, .asm_96f7 ; 0x96f2 $3
+ jr z, .asm_96f4
+ jr c, .asm_96f7
.asm_96f4
scf
ccf
@@ -19454,9 +19494,8 @@
.asm_96f7
scf
ret
-; 0x96f9
-Func_96f9: ; 0x96f9
+Music2_ApplyPitchBend: ; 0x96f9
ld hl, $c02e
add hl, bc
bit 5, [hl]
@@ -19494,13 +19533,13 @@
ld a, [hl]
cp d
jp c, .asm_9786
- jr nz, .asm_9773 ; 0x9733 $3e
+ jr nz, .asm_9773
ld hl, $c0ae
add hl, bc
ld a, [hl]
cp e
jp c, .asm_9786
- jr .asm_9773 ; 0x973e $33
+ jr .asm_9773
.asm_9740
ld hl, $c09e
add hl, bc
@@ -19531,13 +19570,13 @@
add hl, bc
ld a, d
cp [hl]
- jr c, .asm_9786 ; 0x9767 $1d
- jr nz, .asm_9773 ; 0x9769 $8
+ jr c, .asm_9786
+ jr nz, .asm_9773
ld hl, $c0ae
add hl, bc
ld a, e
cp [hl]
- jr c, .asm_9786 ; 0x9771 $13
+ jr c, .asm_9786
.asm_9773
ld hl, $c09e
add hl, bc
@@ -19557,7 +19596,6 @@
res 4, [hl]
res 5, [hl]
ret
-; 0x978f
Func_978f: ; 0x978f
ld hl, $c096
@@ -19572,7 +19610,7 @@
ld hl, $c076
add hl, bc
sub [hl]
- jr nc, .asm_97a7 ; 0x97a3 $2
+ jr nc, .asm_97a7
ld a, $1
.asm_97a7
ld [hl], a
@@ -19586,13 +19624,13 @@
ld hl, $c0a6
add hl, bc
sub [hl]
- jr c, .asm_97c3 ; 0x97b6 $b
+ jr c, .asm_97c3
ld d, a
ld b, $0
ld hl, $c02e
add hl, bc
set 5, [hl]
- jr .asm_97e6 ; 0x97c1 $23
+ jr .asm_97e6
.asm_97c3
ld hl, $c096
add hl, bc
@@ -19625,13 +19663,13 @@
ld a, e
sub [hl]
ld e, a
- jr nc, .asm_97ea ; 0x97ee $fa
+ jr nc, .asm_97ea
ld a, d
and a
- jr z, .asm_97f8 ; 0x97f2 $4
+ jr z, .asm_97f8
dec a
ld d, a
- jr .asm_97ea ; 0x97f6 $f2
+ jr .asm_97ea
.asm_97f8
ld a, e
add [hl]
@@ -19647,9 +19685,8 @@
add hl, bc
ld [hl], a
ret
-; 0x980d
-Func_980d: ; 0x980d
+Music2_ApplyDutyCycle: ; 0x980d
ld b, $0
ld hl, $c046
add hl, bc
@@ -19666,9 +19703,8 @@
or d
ld [hl], a
ret
-; 0x9825
-Func_9825: ; 0x9825
+Music2_GetNextMusicByte: ; 0x9825
ld d, $0
ld a, c
add a
@@ -19679,21 +19715,20 @@
ld e, a
ld a, [hld]
ld d, a
- ld a, [de]
+ ld a, [de] ; get next music command
inc de
- ld [hl], e
+ ld [hl], e ; store address of next command
inc hl
ld [hl], d
ret
-; 0x9838
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
@@ -19700,23 +19735,21 @@
ld l, a
ld h, $ff
ret
-; 0x9847
Func_9847: ; 0x9847
ld h, $0
-.asm_9849
+.loop
srl a
- jr nc, .asm_984e ; 0x984b $1
+ jr nc, .noCarry
add hl, de
-.asm_984e
+.noCarry
sla e
rl d
and a
- jr z, .asm_9857 ; 0x9853 $2
- jr .asm_9849 ; 0x9855 $f2
-.asm_9857
+ jr z, .done
+ jr .loop
+.done
ret
-; 0x9858
Func_9858: ; 0x9858
ld h, $0
@@ -19724,25 +19757,24 @@
add hl, hl
ld d, h
ld e, l
- ld hl, $5b2f
+ ld hl, Unknown_9b2f
add hl, de
ld e, [hl]
inc hl
ld d, [hl]
ld a, b
-.asm_9866
+.loop
cp $7
- jr z, .asm_9871 ; 0x9868 $7
+ jr z, .done
sra d
rr e
inc a
- jr .asm_9866 ; 0x986f $f5
-.asm_9871
+ jr .loop
+.done
ld a, $8
add d
ld d, a
ret
-; 0x9876
Func_9876: ; 0x9876
ld [$c001], a
@@ -19752,7 +19784,7 @@
jp z, Func_994e
jp c, Func_994e
cp $fe
- jr z, .asm_988d ; 0x9888 $3
+ jr z, .asm_988d
jp nc, Func_994e
.asm_988d
xor a
@@ -19763,53 +19795,53 @@
ld [$c0e7], a
ld d, $8
ld hl, $c016
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c006
- call Func_9a89
+ call FillMusicRAM2
ld d, $4
ld hl, $c026
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c02e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c03e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c046
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c04e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c056
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c05e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c066
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c06e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c036
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c076
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c07e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c086
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c08e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c096
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c09e
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c0a6
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c0ae
- call Func_9a89
+ call FillMusicRAM2
ld a, $1
ld hl, $c0be
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c0b6
- call Func_9a89
+ call FillMusicRAM2
ld hl, $c0c6
- call Func_9a89
+ call FillMusicRAM2
ld [$c0e8], a
ld a, $ff
ld [$c004], a
@@ -19826,7 +19858,6 @@
ld a, $77
ld [$ff00+$24], a
jp Func_9a8f
-; 0x994e
Func_994e: ; 0x994e
ld l, a
@@ -19835,7 +19866,7 @@
ld d, h
add hl, hl
add hl, de
- ld de, $4000
+ ld de, SFX_Headers_02
add hl, de
ld a, h
ld [$c0ec], a
@@ -19867,24 +19898,24 @@
add hl, de
ld a, [hl]
and a
- jr z, .asm_99a3 ; 0x9984 $1d
+ jr z, .asm_99a3
ld a, e
cp $7
- jr nz, .asm_999a ; 0x9989 $f
+ jr nz, .asm_999a
ld a, [$c001]
cp $14
- jr nc, .asm_9993 ; 0x9990 $1
+ jr nc, .asm_9993
ret
.asm_9993
ld a, [hl]
cp $14
- jr z, .asm_99a3 ; 0x9996 $b
- jr c, .asm_99a3 ; 0x9998 $9
+ jr z, .asm_99a3
+ jr c, .asm_99a3
.asm_999a
ld a, [$c001]
cp [hl]
- jr z, .asm_99a3 ; 0x999e $3
- jr c, .asm_99a3 ; 0x99a0 $1
+ jr z, .asm_99a3
+ jr c, .asm_99a3
ret
.asm_99a3
xor a
@@ -19969,7 +20000,7 @@
ld [hl], a
ld a, e
cp $4
- jr nz, .asm_9a2b ; 0x9a25 $4
+ jr nz, .asm_9a2b
ld a, $8
ld [$ff00+$10], a
.asm_9a2b
@@ -19978,7 +20009,6 @@
jp z, Func_9a8f
dec c
jp .asm_9967
-; 0x9a34
Func_9a34: ; 0x9a34
ld a, $80
@@ -20008,26 +20038,25 @@
ld [$c0e7], a
ld d, $a0
ld hl, $c006
- call Func_9a89
+ call FillMusicRAM2
ld a, $1
ld d, $18
ld hl, $c0b6
- call Func_9a89
+ call FillMusicRAM2
ld [$c0e8], a
ld [$c0ea], a
ld a, $ff
ld [$c004], a
ret
-; 0x9a89
-Func_9a89: ; 0x9a89
+; fills d bytes at hl with a
+FillMusicRAM2: ; 0x9a89
ld b, d
-.asm_9a8a
+.loop
ld [hli], a
dec b
- jr nz, .asm_9a8a ; 0x9a8c $fc
+ jr nz, .loop
ret
-; 0x9a8f
Func_9a8f: ; 0x9a8f
ld a, [$c001]
@@ -20037,12 +20066,12 @@
ld d, h
add hl, hl
add hl, de
- ld de, $4000
+ ld de, SFX_Headers_02
add hl, de
ld e, l
ld d, h
ld hl, $c006
- ld a, [de]
+ ld a, [de] ; get channel number
ld b, a
rlca
rlca
@@ -20056,11 +20085,11 @@
ld c, $0
.asm_9ab1
cp c
- jr z, .asm_9ab9 ; 0x9ab2 $5
+ jr z, .asm_9ab9
inc c
inc hl
inc hl
- jr .asm_9ab1 ; 0x9ab7 $f8
+ jr .asm_9ab1
.asm_9ab9
push hl
push bc
@@ -20073,7 +20102,7 @@
ld [hl], a
pop af
cp $3
- jr c, .asm_9ad2 ; 0x9aca $6
+ jr c, .asm_9ad2
ld hl, $c02e
add hl, bc
set 2, [hl]
@@ -20080,7 +20109,7 @@
.asm_9ad2
pop bc
pop hl
- ld a, [de]
+ ld a, [de] ; get channel pointer
ld [hli], a
inc de
ld a, [de]
@@ -20092,17 +20121,17 @@
and a
ld a, [de]
inc de
- jr nz, .asm_9ab1 ; 0x9ae0 $cf
+ jr nz, .asm_9ab1
ld a, [$c001]
cp $14
- jr nc, .asm_9aeb ; 0x9ae7 $2
- jr .asm_9b15 ; 0x9ae9 $2a
+ jr nc, .asm_9aeb
+ jr .asm_9b15
.asm_9aeb
ld a, [$c001]
cp $86
- jr z, .asm_9b15 ; 0x9af0 $23
- jr c, .asm_9af6 ; 0x9af2 $2
- jr .asm_9b15 ; 0x9af4 $1f
+ jr z, .asm_9b15
+ jr c, .asm_9af6
+ jr .asm_9b15
.asm_9af6
ld hl, $c02a
ld [hli], a
@@ -20109,14 +20138,14 @@
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $c012
- ld de, $5b16
+ ld hl, $c012 ; sfx noise channel pointer
+ ld de, Noise2_endchannel
ld [hl], e
inc hl
- ld [hl], d
+ ld [hl], d ; overwrite pointer to point to endchannel
ld a, [$c005]
and a
- jr nz, .asm_9b15 ; 0x9b0a $9
+ jr nz, .asm_9b15
ld a, [$ff00+$24]
ld [$c005], a
ld a, $77
@@ -20123,60 +20152,86 @@
ld [$ff00+$24], a
.asm_9b15
ret
-; 0x9b16
-INCBIN "baserom.gbc",$9b16,$9b47 - $9b16
+Noise2_endchannel: ; 0x9b16
+ endchannel
-Func_9b47: ; 0x9b47
- ld c, $2
- ld a, $de
+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
+ 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
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
ld hl, $c006
ld de, Music_MeetRival_branch_b1a2
- call Func_9b60
+ call Music2_OverwriteChannelPointer
ld de, Music_MeetRival_branch_b21d
- call Func_9b60
+ call Music2_OverwriteChannelPointer
ld de, Music_MeetRival_branch_b2b5
-Func_9b60: ; 0x9b60
+Music2_OverwriteChannelPointer: ; 0x9b60
ld a, e
ld [hli], a
ld a, d
ld [hli], a
ret
-; 0x9b65
-Func_9b65: ; 0x9b65
- ld c, $2
- ld a, $de
+; an alternate tempo for MeetRival which is slightly slower
+Music_RivalAlternateTempo: ; 0x9b65
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
ld hl, $c006
ld de, Music_MeetRival_branch_b119
- jp Func_9b60
-; 0x9b75
+ jp Music2_OverwriteChannelPointer
-Func_9b75: ; 0x9b75
- call Func_9b47
+; applies both the alternate start and alternate tempo
+Music_RivalAlternateStartAndTempo: ; 0x9b75
+ call Music_RivalAlternateStart
ld hl, $c006
ld de, Music_MeetRival_branch_b19b
- jp Func_9b60
-; 0x9b81
+ jp Music2_OverwriteChannelPointer
-Func_9b81: ; 0x9b81
+; an alternate tempo for Cities1 which is used for the Hall of Fame room
+Music_Cities1AlternateTempo: ; 0x9b81
ld a, $a
ld [$cfc8], a
ld [$cfc9], a
ld a, $ff
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
ld c, $64
call DelayFrames
- ld c, $2
- ld a, $c3
+ ld c, BANK(Music_Cities1)
+ ld a, (Music_Cities1 - $4000) / 3
call PlayMusic
ld hl, $c006
ld de, Music_Cities1_branch_aa6f
- jp Func_9b60
-; 0x9ba3
+ jp Music2_OverwriteChannelPointer
INCLUDE "music/pkmnhealed.tx"
INCLUDE "music/routes1.tx"
@@ -20259,7 +20314,503 @@
jp z, SoftReset
jp GetJoypadState
-INCBIN "baserom.gbc",$c04d,$c23d - $c04d
+MapSongBanks: ; c04d (3:404d)
+ db (Music_PalletTown - $4000) / 3
+ db BANK(Music_PalletTown) ;PALLET_TOWN
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; VIRIDIAN_CITY
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; PEWTER_CITY
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; CERULEAN_CITY
+ db (Music_Lavender - $4000) / 3
+ db BANK(Music_Lavender) ; LAVENDER_TOWN
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; VERMILION_CITY
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CELADON_CITY
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; FUCHSIA_CITY
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar) ; CINNABAR_ISLAND
+ db (Music_IndigoPlateau - $4000) / 3
+ db BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; SAFFRON_CITY
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; unused
+ db (Music_Routes1 - $4000) / 3
+ db BANK(Music_Routes1) ; ROUTE_1
+ db (Music_Routes1 - $4000) / 3
+ db BANK(Music_Routes1) ; ROUTE_2
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_3
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_4
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_5
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_6
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_7
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_8
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_9
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_10
+ db (Music_Routes4 - $4000) / 3
+ db BANK(Music_Routes4) ; ROUTE_11
+ db (Music_Routes4 - $4000) / 3
+ db BANK(Music_Routes4) ; ROUTE_12
+ db (Music_Routes4 - $4000) / 3
+ db BANK(Music_Routes4) ; ROUTE_13
+ db (Music_Routes4 - $4000) / 3
+ db BANK(Music_Routes4) ; ROUTE_14
+ db (Music_Routes4 - $4000) / 3
+ db BANK(Music_Routes4) ; ROUTE_15
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_16
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_17
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_18
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_19
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_20
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_21
+ db (Music_Routes3 - $4000) / 3
+ db BANK(Music_Routes3) ; ROUTE_22
+ db (Music_IndigoPlateau - $4000) / 3
+ db BANK(Music_IndigoPlateau) ; ROUTE_23
+ db (Music_Routes2 - $4000) / 3
+ db BANK(Music_Routes2) ; ROUTE_24
+ db (Music_Routes2 - $4000) / 3
+ db BANK(Music_Routes2) ; ROUTE_25
+ db (Music_PalletTown - $4000) / 3
+ db BANK(Music_PalletTown) ; RedsHouse1F
+ db (Music_PalletTown - $4000) / 3
+ db BANK(Music_PalletTown) ; RedsHouse2F
+ db (Music_PalletTown - $4000) / 3
+ db BANK(Music_PalletTown) ; BluesHouse
+ db (Music_OaksLab - $4000) / 3
+ db BANK(Music_OaksLab) ; OaksLab
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; ViridianPokecenter
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; ViridianMart
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; School
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; ViridianHouse
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; ViridianGym
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; DiglettsCaveRoute2
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; ViridianForestexit
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route2House
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route2Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; ViridianForestEntrance
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; ViridianForest
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; MuseumF1
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; MuseumF2
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; PewterGym
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; PewterHouse1
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; PewterMart
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; PewterHouse2
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; PewterPokecenter
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; MtMoon1
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; MtMoon2
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; MtMoon3
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; CeruleanHouseTrashed
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; CeruleanHouse
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeruleanPokecenter
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; CeruleanGym
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; BikeShop
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeruleanMart
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; MtMoonPokecenter
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; CeruleanHouseTrashed
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route5Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; DayCareM
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route6Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; FREEZE
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route7Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; UndergroundPathEntranceRoute7
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ;FREEZE
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route8Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; UndergroundPathEntranceRoute8
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; RockTunnelPokecenter
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; RockTunnel1
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; PowerPlant
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; Route11Gate
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; Route11GateUpstairs
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route12Gate
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; BillsHouse
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; VermilionPokecenter
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; FanClub
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; VermilionMart
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; VermilionGym
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; VermilionHouse1
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; VermilionDock
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne1
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne2
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne3
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne4
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne5
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne6
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne7
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne8
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne9
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ; SSAnne10
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ;unused
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ;unused
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ;unused
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; VictoryRoad1
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ;unused
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ;unused
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ;unused
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ;unused
+ db (Music_IndigoPlateau - $4000) / 3
+ db BANK(Music_IndigoPlateau) ; Lance
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ;unused
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ;unused
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ;unused
+ db (Music_SSAnne - $4000) / 3
+ db BANK(Music_SSAnne) ;unused
+ db (Music_PalletTown - $4000) / 3
+ db BANK(Music_PalletTown) ; HallofFameRoom
+ db (Music_Routes1 - $4000) / 3
+ db BANK(Music_Routes1) ; UndergroundPathNS
+ db (Music_IndigoPlateau - $4000) / 3
+ db BANK(Music_IndigoPlateau) ; Gary
+ db (Music_Routes1 - $4000) / 3
+ db BANK(Music_Routes1) ; UndergroundPathWE
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMart1
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMart2
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMart3
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMart4
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMartRoof
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMartElevator
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonMansion1
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonMansion2
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonMansion3
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonMansion4
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonMansion5
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonPokecenter
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; CeladonGym
+ db (Music_GameCorner - $4000) / 3
+ db BANK(Music_GameCorner) ; CeladonGameCorner
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CeladonMart5
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonPrizeRoom
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonDiner
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonHouse
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; CeladonHotel
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; LavenderPokecenter
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower1
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower2
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower3
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower4
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower5
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower6
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; PokemonTower7
+ db (Music_Lavender - $4000) / 3
+ db BANK(Music_Lavender) ; LavenderHouse1
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; LavenderMart
+ db (Music_Lavender - $4000) / 3
+ db BANK(Music_Lavender) ; LavenderHouse2
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; FuchsiaMart
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; FuchsiaHouse1
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; FuchsiaPokecenter
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; FuchsiaHouse2
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; SafariZoneEntrance
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; FuchsiaGym
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; FuchsiaMeetingRoom
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; SeafoamIslands2
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; SeafoamIslands3
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; SeafoamIslands4
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; SeafoamIslands5
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; VermilionHouse2
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; FuchsiaHouse3
+ db (Music_CinnabarMansion - $4000) / 3
+ db BANK(Music_CinnabarMansion) ; Mansion1
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; CinnabarGym
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar) ; Lab1
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar) ; Lab2
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar) ; Lab3
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar) ; Lab4
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CinnabarPokecenter
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; CinnabarMart
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar)
+ db (Music_IndigoPlateau - $4000) / 3
+ db BANK(Music_IndigoPlateau) ; IndigoPlateauLobby
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; CopycatsHouseF1
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; CopycatsHouseF2
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; FightingDojo
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; SaffronGym
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; SaffronHouse1
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; SaffronMart
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo1
+ db (Music_Pokecenter - $4000) / 3
+ db BANK(Music_Pokecenter) ; SaffronPokecenter
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; SaffronHouse2
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route15Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route15GateUpstairs
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route16GateMap
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route16GateUpstairs
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; Route16House
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; Route12House
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route18Gate
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route18GateUpstairs
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; SeafoamIslands1
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; Route22Gate
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; VictoryRoad2
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; Route12GateUpstairs
+ db (Music_Vermilion - $4000) / 3
+ db BANK(Music_Vermilion) ; VermilionHouse3
+ db (Music_Dungeon2 - $4000) / 3
+ db BANK(Music_Dungeon2) ; DiglettsCave
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; VictoryRoad3
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; RocketHideout1
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; RocketHideout2
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; RocketHideout3
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; RocketHideout4
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; RocketHideoutElevator
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1)
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1)
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1)
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo2
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo3
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo4
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo5
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo6
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo7
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo8
+ db (Music_CinnabarMansion - $4000) / 3
+ db BANK(Music_CinnabarMansion) ; Mansion2
+ db (Music_CinnabarMansion - $4000) / 3
+ db BANK(Music_CinnabarMansion) ; Mansion3
+ db (Music_CinnabarMansion - $4000) / 3
+ db BANK(Music_CinnabarMansion) ; Mansion4
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneEast
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneNorth
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneWest
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneCenter
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneRestHouse1
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneSecretHouse
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneRestHouse2
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneRestHouse3
+ db (Music_SafariZone - $4000) / 3
+ db BANK(Music_SafariZone) ; SafariZoneRestHouse4
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; UnknownDungeon2
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; UnknownDungeon3
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; UnknownDungeon1
+ db (Music_Cities2 - $4000) / 3
+ db BANK(Music_Cities2) ; NameRater
+ db (Music_Cities1 - $4000) / 3
+ db BANK(Music_Cities1) ; CeruleanHouse2
+ db (Music_Cinnabar - $4000) / 3
+ db BANK(Music_Cinnabar)
+ db (Music_Dungeon3 - $4000) / 3
+ db BANK(Music_Dungeon3) ; RockTunnel2
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo9
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo10
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCo11
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo) ; SilphCoElevator
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo)
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo)
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; BattleCenterM
+ db (Music_Celadon - $4000) / 3
+ db BANK(Music_Celadon) ; TradeCenterM
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo)
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo)
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo)
+ db (Music_SilphCo - $4000) / 3
+ db BANK(Music_SilphCo)
+ db (Music_Gym - $4000) / 3
+ db BANK(Music_Gym) ; Lorelei
+ db (Music_Dungeon1 - $4000) / 3
+ db BANK(Music_Dungeon1) ; Bruno
+ db (Music_PokemonTower - $4000) / 3
+ db BANK(Music_PokemonTower) ; Agatha
; see also MapHeaderPointers
MapHeaderBanks: ; c23d (3:423d)
@@ -27537,8 +28088,8 @@
and a,$80
jr nz,.skipMusic
call WaitForSoundToFinish ; wait for sound to end
- ld b, BANK(Func_22306)
- ld hl, Func_22306
+ ld b, BANK(Music_PokeFluteInBattle)
+ ld hl, Music_PokeFluteInBattle
call Bankswitch ; play in-battle pokeflute music
.musicWaitLoop ; wait for music to finish playing
ld a,[$c02c]
@@ -27610,8 +28161,8 @@
; play out-of-battle pokeflute music
ld a,$ff
call PlaySound ; turn off music
- ld a,$b8
- ld c,$02
+ ld a, (SFX_02_5e - $4000) / 3
+ ld c, BANK(SFX_02_5e)
call PlayMusic ; play music
.musicWaitLoop ; wait for music to finish playing
ld a,[$c028]
@@ -35496,9 +36047,9 @@
ld [$D528],a
ld a,$FF
call PlaySound ; stop music
- ld a,2
+ ld a, BANK(Music_MeetProfOak)
ld c,a ; song bank
- ld a,$DB ; “oak appears” music
+ ld a, (Music_MeetProfOak - $4000) / 3 ; “oak appears” music
call PlayMusic ; plays music
ld a,$FC
ld [W_JOYPADFORBIDDENBUTTONSMASK],a
@@ -36428,8 +36979,8 @@
ld [$c0ee], a
call PlaySound
.asm_19512
- ld c, $2
- ld a, $de
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
xor a
ld [H_CURRENTPRESSEDBUTTONS], a
@@ -36535,8 +37086,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $1
ld [$ff00+$8c], a
@@ -39685,8 +40236,8 @@
call Func_34a6 ; face object
ld a, $8
ld [$d528], a
- ld c, $2
- ld a, $de
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic ; play music
ld a, $f
ld [$ff00+$8c], a
@@ -39784,8 +40335,8 @@
ld a, $10
ld [$ff00+$8c], a
call DisplayTextID
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $1
ld [$ff00+$8c], a
@@ -39854,8 +40405,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $15
ld [$ff00+$8c], a
@@ -39966,8 +40517,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $1
ld [$ff00+$8c], a
@@ -41736,8 +42287,8 @@
ld [W_JOYPADFORBIDDENBUTTONSMASK], a
ld [$c0ee], a
call PlaySound
- ld c, $1f
- ld a, $d6
+ ld c, BANK(Music_Surfing)
+ ld a, (Music_Surfing - $4000) / 3
call PlayMusic
ld b, BANK(Func_79fc0)
ld hl, Func_79fc0
@@ -43557,11 +44108,11 @@
asm_1e9b0: ; 1e9b0 (7:69b0)
call EnableAutoTextBoxDrawing
xor a
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
dec a
call PlaySound
- ld c, $2
- ld a, $b9
+ ld c, BANK(SFX_02_5f)
+ ld a, (SFX_02_5f - $4000) / 3
call PlayMusic
.asm_1e9c2
ld a, [$c02a]
@@ -44000,9 +44551,32 @@
INCLUDE "music/sfx/sfx_08_12.tx"
INCLUDE "music/sfx/sfx_08_13.tx"
-Unknown_20361: ; 20361 (8:4361)
-INCBIN "baserom.gbc",$20361,$203c3 - $20361
+Music8_Channel3DutyPointers: ; 20361 (1f:4361)
+ dw Music8_Channel3Duty1
+ dw Music8_Channel3Duty2
+ dw Music8_Channel3Duty3
+ dw Music8_Channel3Duty4
+ dw Music8_Channel3Duty5
+ dw SFX_08_40_Ch1 ; unused
+ dw SFX_08_40_Ch1 ; unused
+ dw SFX_08_40_Ch1 ; unused
+ dw SFX_08_40_Ch1 ; unused
+
+Music8_Channel3Duty1: ; 20373 (8:4373)
+ db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
+Music8_Channel3Duty2: ; 20383 (8:4383)
+ db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
+
+Music8_Channel3Duty3: ; 20393 (8:4393)
+ db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
+
+Music8_Channel3Duty4: ; 203a3 (8:43a3)
+ db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
+
+Music8_Channel3Duty5: ; 203b3 (8:43b3)
+ db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
+
INCLUDE "music/sfx/sfx_08_40.tx"
INCLUDE "music/sfx/sfx_08_3f.tx"
INCLUDE "music/sfx/sfx_08_3c.tx"
@@ -44014,10 +44588,7 @@
INCLUDE "music/sfx/sfx_08_43.tx"
INCLUDE "music/sfx/sfx_08_44.tx"
INCLUDE "music/sfx/sfx_08_45.tx"
-
-Unknown_2049b: ; 2049b (8:449b)
-INCBIN "baserom.gbc",$2049b,$204aa - $2049b
-
+INCLUDE "music/sfx/sfx_08_pokeflute_ch3.tx"
INCLUDE "music/sfx/sfx_08_47.tx"
INCLUDE "music/sfx/sfx_08_48.tx"
INCLUDE "music/sfx/sfx_08_49.tx"
@@ -44024,9 +44595,6 @@
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"
@@ -44035,16 +44603,10 @@
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"
@@ -44059,9 +44621,6 @@
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"
@@ -44071,25 +44630,14 @@
INCLUDE "music/sfx/sfx_08_6d.tx"
INCLUDE "music/sfx/sfx_08_6e.tx"
INCLUDE "music/sfx/sfx_08_6f.tx"
-
-INCBIN "baserom.gbc",$207f1,$207fa - $207f1 ; unknown music
-
INCLUDE "music/sfx/sfx_08_70.tx"
INCLUDE "music/sfx/sfx_08_71.tx"
-
-INCBIN "baserom.gbc",$20862,$20875 - $20862 ; unknown music
-
INCLUDE "music/sfx/sfx_08_72.tx"
INCLUDE "music/sfx/sfx_08_73.tx"
INCLUDE "music/sfx/sfx_08_74.tx"
-
-INCBIN "baserom.gbc",$208d5,$208e0 - $208d5 ; unknown music
-
INCLUDE "music/sfx/sfx_08_75.tx"
INCLUDE "music/sfx/sfx_08_76.tx"
-
-INCBIN "baserom.gbc",$2098b,$209d7 - $2098b ; unknown music
-
+INCLUDE "music/sfx/sfx_08_unused.tx"
INCLUDE "music/sfx/sfx_08_1d.tx"
INCLUDE "music/sfx/sfx_08_37.tx"
INCLUDE "music/sfx/sfx_08_38.tx"
@@ -44182,13 +44730,13 @@
ret
Unknown_213bc: ; 213bc (8:53bc)
-INCBIN "baserom.gbc",$213bc,$213c0 - $213bc
+ db $A0,$E2,$50,$87
Unknown_213c0: ; 213c0 (8:53c0)
-INCBIN "baserom.gbc",$213c0,$213c4 - $213c0
+ db $B0,$E2,$EE,$86
Unknown_213c4: ; 213c4 (8:53c4)
-INCBIN "baserom.gbc",$213c4,$213c8 - $213c4
+ db $00,$00,$00,$80
; known jump sources: 17e4d (5:7e4d)
Func_213c8: ; 213c8 (8:53c8)
@@ -44796,22 +45344,22 @@
INCBIN "baserom.gbc",$21878,$21879 - $21878
Func_21879: ; 21879 (8:5879)
- ld c, $0
-.asm_2187b
+ ld c, CH0
+.loop
ld b, $0
ld hl, $c026
add hl, bc
ld a, [hl]
and a
- jr z, .asm_218a7
+ jr z, .nextChannel
ld a, c
- cp $4
- jr nc, .asm_218a4
+ cp CH4
+ jr nc, .applyAffects ; if sfx channel
ld a, [$c002]
and a
- jr z, .asm_218a4
+ jr z, .applyAffects
bit 7, a
- jr nz, .asm_218a7
+ jr nz, .nextChannel
set 7, a
ld [$c002], a
xor a
@@ -44819,74 +45367,80 @@
ld [$FF00+$1a], a
ld a, $80
ld [$FF00+$1a], a
- jr .asm_218a7
-.asm_218a4
- call Func_218ae
-.asm_218a7
+ jr .nextChannel
+.applyAffects
+ call Music8_ApplyMusicAffects
+.nextChannel
ld a, c
inc c
- cp $7
- jr nz, .asm_2187b
+ cp CH7
+ jr nz, .loop
ret
-; known jump sources: 218a4 (8:58a4)
-Func_218ae: ; 218ae (8:58ae)
+; this routine checks flags for music effects currently applied
+; to the channel and calls certain functions based on flags.
+; known flags for $c02e:
+; 1: call has been used
+; 3: a toggle used only by this routine for vibrato
+; 4: pitchbend flag
+; 6: dutycycle flag
+Music8_ApplyMusicAffects: ; 218ae (8:58ae)
ld b, $0
- ld hl, $c0b6
+ ld hl, $c0b6 ; delay unitl next note
add hl, bc
ld a, [hl]
- cp $1
- jp z, Func_21946
- dec a
+ cp $1 ; if the delay is 1, play next note
+ jp z, Music8_PlayNextNote
+ dec a ; otherwise, decrease the delay timer
ld [hl], a
ld a, c
- cp $4
- jr nc, .asm_218ca
+ cp CH4
+ jr nc, .startChecks ; if a sfx channel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr z, .asm_218ca
+ jr z, .startChecks
ret
-.asm_218ca
+.startChecks
ld hl, $c02e
add hl, bc
- bit 6, [hl]
- jr z, .asm_218d5
- call Func_21fcc
-.asm_218d5
+ bit 6, [hl] ; dutycycle
+ jr z, .checkForExecuteMusic
+ call Music8_ApplyDutyCycle
+.checkForExecuteMusic
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_218e7
+ jr nz, .checkForPitchBend
ld hl, $c02e
add hl, bc
bit 2, [hl]
- jr nz, .asm_218fb
-.asm_218e7
+ jr nz, .disablePitchBendVibrato
+.checkForPitchBend
ld hl, $c02e
add hl, bc
- bit 4, [hl]
- jr z, .asm_218f2
- jp Func_21eb8
-.asm_218f2
- ld hl, $c04e
+ bit 4, [hl] ; pitchbend
+ jr z, .checkVibratoDelay
+ jp Music8_ApplyPitchBend
+.checkVibratoDelay
+ ld hl, $c04e ; vibrato delay
add hl, bc
ld a, [hl]
- and a
- jr z, .asm_218fc
- dec [hl]
-.asm_218fb
+ and a ; check if delay is over
+ jr z, .checkForVibrato
+ dec [hl] ; otherwise, dec delay
+.disablePitchBendVibrato
ret
-.asm_218fc
- ld hl, $c056
+.checkForVibrato
+ ld hl, $c056 ; vibrato rate
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_21905
- ret
-.asm_21905
+ jr nz, .vibrato
+ ret ; no vibrato
+.vibrato
ld d, a
ld hl, $c05e
add hl, bc
@@ -44893,21 +45447,21 @@
ld a, [hl]
and $f
and a
- jr z, .asm_21912
- dec [hl]
+ jr z, .vibratoAlreadyDone
+ dec [hl] ; apply vibrato pitch change
ret
-.asm_21912
+.vibratoAlreadyDone
ld a, [hl]
swap [hl]
or [hl]
- ld [hl], a
+ ld [hl], a ; reset the vibrato value and start again
ld hl, $c066
add hl, bc
- ld e, [hl]
+ ld e, [hl] ; get note pitch
ld hl, $c02e
add hl, bc
- bit 3, [hl]
- jr z, .asm_21932
+ bit 3, [hl] ; this is the only code that sets/resets bit three so
+ jr z, .unset ; it continuously alternates which path it takes
res 3, [hl]
ld a, d
and $f
@@ -44914,19 +45468,19 @@
ld d, a
ld a, e
sub d
- jr nc, .asm_21930
+ jr nc, .noCarry
ld a, $0
-.asm_21930
- jr .asm_2193e
-.asm_21932
+.noCarry
+ jr .done
+.unset
set 3, [hl]
ld a, d
and $f0
swap a
add e
- jr nc, .asm_2193e
+ jr nc, .done
ld a, $ff
-.asm_2193e
+.done
ld d, a
ld b, $3
call Func_21ff7
@@ -44933,8 +45487,10 @@
ld [hl], d
ret
-; known jump sources: 218b7 (8:58b7)
-Func_21946: ; 21946 (8:5946)
+; this routine executes all music commands that take up no time,
+; like tempo changes, duty changes etc. and doesn't return
+; until the first note is reached
+Music8_PlayNextNote: ; 21946 (8:5946)
ld hl, $c06e
add hl, bc
ld a, [hl]
@@ -44946,42 +45502,41 @@
res 4, [hl]
res 5, [hl]
ld a, c
- cp $4
- jr nz, .asm_21963
+ cp CH4
+ jr nz, .beginChecks
ld a, [$d083]
bit 7, a
ret nz
-.asm_21963
- call Func_21967
+.beginChecks
+ call Music8_endchannel
ret
-; known jump sources: 21963 (8:5963), 219bd (8:59bd), 21a27 (8:5a27), 21a49 (8:5a49), 21a62 (8:5a62), 21aa1 (8:5aa1), 21ab3 (8:5ab3), 21aeb (8:5aeb), 21b38 (8:5b38), 21b78 (8:5b78), 21b85 (8:5b85), 21ba4 (8:5ba4), 21bc2 (8:5bc2), 21bce (8:5bce), 21bdd (8:5bdd), 21bf0 (8:5bf0), 21c59 (8:5c59)
-Func_21967: ; 21967 (8:5967)
- call Func_21fe4
+Music8_endchannel: ; 21967 (8:5967)
+ call Music8_GetNextMusicByte
ld d, a
- cp $ff
- jp nz, Func_219f5
- ld b, $0
+ cp $ff ; is this command an endchannel?
+ jp nz, Music8_callchannel ; no
+ ld b, $0 ; yes
ld hl, $c02e
add hl, bc
bit 1, [hl]
- jr nz, .asm_219a5
+ jr nz, .returnFromCall
ld a, c
- cp $3
- jr nc, .asm_21981
+ cp CH3
+ jr nc, .noiseOrSfxChannel
jr .asm_219c0
-.asm_21981
+.noiseOrSfxChannel
res 2, [hl]
ld hl, $c036
add hl, bc
res 0, [hl]
- cp $6
- jr nz, .asm_21995
+ cp CH6
+ jr nz, .notSfxChannel3
ld a, $0
ld [$FF00+$1a], a
ld a, $80
ld [$FF00+$1a], a
-.asm_21995
+.notSfxChannel3
jr nz, .asm_219a3
ld a, [$c003]
and a
@@ -44991,7 +45546,7 @@
jr .asm_219c0
.asm_219a3
jr .asm_219c9
-.asm_219a5
+.returnFromCall
res 1, [hl]
ld d, $0
ld a, c
@@ -44999,7 +45554,7 @@
ld e, a
ld hl, $c006
add hl, de
- push hl
+ push hl ; store current channel address
ld hl, $c016
add hl, de
ld e, l
@@ -45009,10 +45564,10 @@
ld [hli], a
inc de
ld a, [de]
- ld [hl], a
- jp Func_21967
+ ld [hl], a ; loads channel address to return to
+ jp Music8_endchannel
.asm_219c0
- ld hl, Unknown_222de ; $62de
+ ld hl, Unknown_222de
add hl, bc
ld a, [$FF00+$25]
and [hl]
@@ -45030,7 +45585,7 @@
jr .asm_219ef
.asm_219dd
ld a, c
- cp $4
+ cp CH4
jr z, .asm_219e6
call Func_21e6d
ret c
@@ -45045,17 +45600,16 @@
ld [hl], b
ret
-; known jump sources: 2196d (8:596d)
-Func_219f5: ; 219f5 (8:59f5)
- cp $fd
- jp nz, Func_21a2a
- call Func_21fe4
+Music8_callchannel: ; 219f5 (8:59f5)
+ cp $fd ; is this command a callchannel?
+ jp nz, Music8_loopchannel ; no
+ call Music8_GetNextMusicByte ; yes
push af
- call Func_21fe4
+ call Music8_GetNextMusicByte
ld d, a
pop af
ld e, a
- push de
+ push de ; store pointer
ld d, $0
ld a, c
add a
@@ -45072,43 +45626,43 @@
ld [de], a
inc de
ld a, [hld]
- ld [de], a
+ ld [de], a ; copy current channel address
pop de
ld [hl], e
inc hl
- ld [hl], d
+ ld [hl], d ; overwrite current address with pointer
ld b, $0
ld hl, $c02e
add hl, bc
- set 1, [hl]
- jp Func_21967
+ set 1, [hl] ; set the call flag
+ jp Music8_endchannel
-; known jump sources: 219f7 (8:59f7)
-Func_21a2a: ; 21a2a (8:5a2a)
- cp $fe
- jp nz, Func_21a65
- call Func_21fe4
+Music8_loopchannel: ; 21a2a (8:5a2a)
+ cp $fe ; is this command a loopchannel?
+ jp nz, Music8_notetype ; no
+ call Music8_GetNextMusicByte ; yes
ld e, a
and a
- jr z, .asm_21a4e
+ jr z, .infiniteLoop
ld b, $0
ld hl, $c0be
add hl, bc
ld a, [hl]
cp e
- jr nz, .asm_21a4c
- ld a, $1
+ jr nz, .loopAgain
+ ld a, $1 ; if no more loops to make,
ld [hl], a
- call Func_21fe4
- call Func_21fe4
- jp Func_21967
-.asm_21a4c
+ call Music8_GetNextMusicByte ; skip pointer
+ call Music8_GetNextMusicByte
+ jp Music8_endchannel
+.loopAgain ; inc loop count
inc a
ld [hl], a
-.asm_21a4e
- call Func_21fe4
+ ; fall through
+.infiniteLoop ; overwrite current address with pointer
+ call Music8_GetNextMusicByte
push af
- call Func_21fe4
+ call Music8_GetNextMusicByte
ld b, a
ld d, $0
ld a, c
@@ -45119,73 +45673,76 @@
pop af
ld [hli], a
ld [hl], b
- jp Func_21967
+ jp Music8_endchannel
-; known jump sources: 21a2c (8:5a2c)
-Func_21a65: ; 21a65 (8:5a65)
+Music8_notetype: ; 21a65 (8:5a65)
and $f0
- cp $d0
- jp nz, Func_21aa4
- ld a, d
+ cp $d0 ; is this command a notetype?
+ jp nz, Music8_togglecall ; no
+ ld a, d ; yes
and $f
ld b, $0
ld hl, $c0c6
add hl, bc
- ld [hl], a
+ ld [hl], a ; store low nibble as speed
ld a, c
- cp $3
- jr z, .asm_21aa1
- call Func_21fe4
+ cp CH3
+ jr z, .noiseChannel ; noise channel has 0 params
+ call Music8_GetNextMusicByte
ld d, a
ld a, c
- cp $2
- jr z, .asm_21a8d
- cp $6
- jr nz, .asm_21a9a
+ cp CH2
+ jr z, .musicChannel3
+ cp CH6
+ jr nz, .notChannel3
ld hl, $c0e7
- jr .asm_21a90
-.asm_21a8d
+ jr .sfxChannel3
+.musicChannel3
ld hl, $c0e6
-.asm_21a90
+.sfxChannel3
ld a, d
and $f
- ld [hl], a
+ ld [hl], a ; store low nibble of param as duty
ld a, d
and $30
sla a
ld d, a
-.asm_21a9a
+ ; fall through
+
+ ; if channel 3, store high nibble as volume
+ ; else, store volume (high nibble) and fade (low nibble)
+.notChannel3
ld b, $0
ld hl, $c0de
add hl, bc
ld [hl], d
-.asm_21aa1
- jp Func_21967
+.noiseChannel
+ jp Music8_endchannel
-; known jump sources: 21a69 (8:5a69)
-Func_21aa4: ; 21aa4 (8:5aa4)
+Music8_togglecall: ; 21aa4 (8:5aa4)
ld a, d
- cp $e8
- jr nz, .asm_21ab6
- ld b, $0
+ cp $e8 ; is this command an togglecall?
+ jr nz, Music8_vibrato ; no
+ ld b, $0 ; yes
ld hl, $c02e
add hl, bc
ld a, [hl]
xor $1
- ld [hl], a
- jp Func_21967
-.asm_21ab6
- cp $ea
- jr nz, .asm_21aee
- call Func_21fe4
+ ld [hl], a ; flip bit 0 of $c02e (toggle returning from call)
+ jp Music8_endchannel
+
+Music8_vibrato: ; 21ab6 (8:5ab6)
+ cp $ea ; is this command a vibrato?
+ jr nz, Music8_pitchbend ; no
+ call Music8_GetNextMusicByte ; yes
ld b, $0
ld hl, $c04e
add hl, bc
- ld [hl], a
+ ld [hl], a ; store delay
ld hl, $c06e
add hl, bc
- ld [hl], a
- call Func_21fe4
+ ld [hl], a ; store delay
+ call Music8_GetNextMusicByte
ld d, a
and $f0
swap a
@@ -45197,7 +45754,7 @@
adc b
swap a
or e
- ld [hl], a
+ ld [hl], a ; store rate as both high and low nibbles
ld a, d
and $f
ld d, a
@@ -45205,17 +45762,18 @@
add hl, bc
swap a
or d
- ld [hl], a
- jp Func_21967
-.asm_21aee
- cp $eb
- jr nz, .asm_21b26
- call Func_21fe4
+ ld [hl], a ; store depth as both high and low nibbles
+ jp Music8_endchannel
+
+Music8_pitchbend: ; 21aee (8:5aee)
+ cp $eb ; is this command a pitchbend?
+ jr nz, Music8_duty ; no
+ call Music8_GetNextMusicByte ; yes
ld b, $0
ld hl, $c076
add hl, bc
- ld [hl], a
- call Func_21fe4
+ ld [hl], a ; store first param
+ call Music8_GetNextMusicByte
ld d, a
and $f0
swap a
@@ -45226,21 +45784,22 @@
ld b, $0
ld hl, $c0a6
add hl, bc
- ld [hl], d
+ ld [hl], d ; store unknown part of second param
ld hl, $c0ae
add hl, bc
- ld [hl], e
+ ld [hl], e ; store unknown part of second param
ld b, $0
ld hl, $c02e
add hl, bc
- set 4, [hl]
- call Func_21fe4
+ set 4, [hl] ; set pitchbend flag
+ call Music8_GetNextMusicByte
ld d, a
- jp Func_21c8b
-.asm_21b26
- cp $ec
- jr nz, .asm_21b3b
- call Func_21fe4
+ jp Music8_notelength
+
+Music8_duty: ; 21b26 (8:5b26)
+ cp $ec ; is this command a duty?
+ jr nz, Music8_tempo ; no
+ call Music8_GetNextMusicByte ; yes
rrca
rrca
and $c0
@@ -45247,111 +45806,120 @@
ld b, $0
ld hl, $c03e
add hl, bc
- ld [hl], a
- jp Func_21967
-.asm_21b3b
- cp $ed
- jr nz, .asm_21b7b
- ld a, c
- cp $4
- jr nc, .asm_21b5f
- call Func_21fe4
- ld [$c0e8], a
- call Func_21fe4
- ld [$c0e9], a
+ ld [hl], a ; store duty
+ jp Music8_endchannel
+
+Music8_tempo: ; 21b3b (8:5b3b)
+ cp $ed ; is this command a tempo?
+ jr nz, Music8_unknownmusic0xee ; no
+ ld a, c ; yes
+ cp CH4
+ jr nc, .sfxChannel
+ call Music8_GetNextMusicByte
+ ld [$c0e8], a ; store first param
+ call Music8_GetNextMusicByte
+ ld [$c0e9], a ; store second param
xor a
- ld [$c0ce], a
+ ld [$c0ce], a ; clear RAM
ld [$c0cf], a
ld [$c0d0], a
ld [$c0d1], a
- jr .asm_21b78
-.asm_21b5f
- call Func_21fe4
- ld [$c0ea], a
- call Func_21fe4
- ld [$c0eb], a
+ jr .musicChannelDone
+.sfxChannel
+ call Music8_GetNextMusicByte
+ ld [$c0ea], a ; store first param
+ call Music8_GetNextMusicByte
+ ld [$c0eb], a ; store second param
xor a
- ld [$c0d2], a
+ ld [$c0d2], a ; clear RAM
ld [$c0d3], a
ld [$c0d4], a
ld [$c0d5], a
-.asm_21b78
- jp Func_21967
-.asm_21b7b
- cp $ee
- jr nz, .asm_21b88
- call Func_21fe4
- ld [$c004], a
- jp Func_21967
-.asm_21b88
- cp $ef
- jr nz, .asm_21ba7
- call Func_21fe4
+.musicChannelDone
+ jp Music8_endchannel
+
+Music8_unknownmusic0xee: ; 21b7b (8:5b7b)
+ cp $ee ; is this command an unknownmusic0xee?
+ jr nz, Music8_unknownmusic0xef ; no
+ call Music8_GetNextMusicByte ; yes
+ ld [$c004], a ; store first param
+ jp Music8_endchannel
+
+; this appears to never be used
+Music8_unknownmusic0xef: ; 21b88 (8:5b88)
+ cp $ef ; is this command an unknownmusic0xef?
+ jr nz, Music8_dutycycle ; no
+ call Music8_GetNextMusicByte ; yes
push bc
call Func_22035
pop bc
ld a, [$c003]
and a
- jr nz, .asm_21ba4
+ jr nz, .skip
ld a, [$c02d]
ld [$c003], a
xor a
ld [$c02d], a
-.asm_21ba4
- jp Func_21967
-.asm_21ba7
- cp $fc
- jr nz, .asm_21bc5
- call Func_21fe4
+.skip
+ jp Music8_endchannel
+
+Music8_dutycycle: ; 21ba7 (8:5ba7)
+ cp $fc ; is this command a dutycycle?
+ jr nz, Music8_stereopanning ; no
+ call Music8_GetNextMusicByte ; yes
ld b, $0
ld hl, $c046
add hl, bc
- ld [hl], a
+ ld [hl], a ; store full cycle
and $c0
ld hl, $c03e
add hl, bc
- ld [hl], a
+ ld [hl], a ; store first duty
ld hl, $c02e
add hl, bc
- set 6, [hl]
- jp Func_21967
-.asm_21bc5
- cp $f0
- jr nz, .asm_21bd1
- call Func_21fe4
+ set 6, [hl] ; set dutycycle flag
+ jp Music8_endchannel
+
+Music8_stereopanning: ; 21bc5 (8:5bc5)
+ cp $f0 ; is this command a stereopanning?
+ jr nz, Music8_executemusic ; no
+ call Music8_GetNextMusicByte ; yes
ld [$FF00+$24], a
- jp Func_21967
-.asm_21bd1
- cp $f8
- jr nz, .asm_21be0
- ld b, $0
+ jp Music8_endchannel
+
+Music8_executemusic: ; 21bd1 (8:5bd1)
+ cp $f8 ; is this command an executemusic?
+ jr nz, Music8_octave ; no
+ ld b, $0 ; yes
ld hl, $c036
add hl, bc
set 0, [hl]
- jp Func_21967
-.asm_21be0
+ jp Music8_endchannel
+
+Music8_octave: ; 21be0 (8:5be0)
and $f0
- cp $e0
- jr nz, .asm_21bf3
- ld hl, $c0d6
+ cp $e0 ; is this command an octave?
+ jr nz, Music8_unknownsfx0x20 ; no
+ ld hl, $c0d6 ; yes
ld b, $0
add hl, bc
ld a, d
and $f
- ld [hl], a
- jp Func_21967
-.asm_21bf3
- cp $20
- jr nz, .asm_21c40
+ ld [hl], a ; store low nibble as octave
+ jp Music8_endchannel
+
+Music8_unknownsfx0x20: ; 21bf3
+ cp $20 ; is this command an unknownsfx0x20?
+ jr nz, Music8_unknownsfx0x10 ; no
ld a, c
- cp $3
- jr c, .asm_21c40
+ cp CH3 ; is this a noise or sfx channel?
+ jr c, Music8_unknownsfx0x10 ; no
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_21c40
- call Func_21c8b
+ jr nz, Music8_unknownsfx0x10 ; no
+ call Music8_notelength
ld d, a
ld b, $0
ld hl, $c03e
@@ -45362,21 +45930,21 @@
ld b, $1
call Func_21ff7
ld [hl], d
- call Func_21fe4
+ call Music8_GetNextMusicByte
ld d, a
ld b, $2
call Func_21ff7
ld [hl], d
- call Func_21fe4
+ call Music8_GetNextMusicByte
ld e, a
ld a, c
- cp $7
+ cp CH7
ld a, $0
- jr z, .asm_21c33
+ jr z, .sfxNoiseChannel ; only two params for noise channel
push de
- call Func_21fe4
+ call Music8_GetNextMusicByte
pop de
-.asm_21c33
+.sfxNoiseChannel
ld d, a
push de
call Func_21daa
@@ -45384,30 +45952,32 @@
pop de
call Func_21dcc
ret
-.asm_21c40
+
+Music8_unknownsfx0x10: ; 21c40 (8:5c40)
ld a, c
- cp $4
- jr c, .asm_21c5c
+ cp CH4
+ jr c, Music8_note ; if not a sfx
ld a, d
- cp $10
- jr nz, .asm_21c5c
+ cp $10 ; is this command a unknownsfx0x10?
+ jr nz, Music8_note ; no
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_21c5c
- call Func_21fe4
+ jr nz, Music8_note ; no
+ call Music8_GetNextMusicByte ; yes
ld [$FF00+$10], a
- jp Func_21967
-.asm_21c5c
+ jp Music8_endchannel
+
+Music8_note: ; 21c5c (8:5c5c)
ld a, c
- cp $3
- jr nz, Func_21c8b
+ cp CH3
+ jr nz, Music8_notelength ; if not noise channel
ld a, d
and $f0
- cp $b0
- jr z, .asm_21c76
- jr nc, Func_21c8b
+ cp $b0 ; is this command a dnote?
+ jr z, Music8_dnote ; yes
+ jr nc, Music8_notelength ; no
swap a
ld b, a
ld a, d
@@ -45416,14 +45986,15 @@
ld a, b
push de
push bc
- jr .asm_21c7e
-.asm_21c76
+ jr asm_21c7e
+
+Music8_dnote: ; 21c76 (8:5c76)
ld a, d
and $f
push af
push bc
- call Func_21fe4
-.asm_21c7e
+ call Music8_GetNextMusicByte ; get dnote instrument
+asm_21c7e
ld d, a
ld a, [$c003]
and a
@@ -45434,14 +46005,13 @@
pop bc
pop de
-; known jump sources: 21b23 (8:5b23), 21c06 (8:5c06), 21c5f (8:5c5f), 21c68 (8:5c68)
-Func_21c8b: ; 21c8b (8:5c8b)
+Music8_notelength: ; 21c8b (8:5c8b)
ld a, d
push af
and $f
inc a
ld b, $0
- ld e, a
+ ld e, a ; store note length (in 16ths)
ld d, b
ld hl, $c0c6
add hl, bc
@@ -45449,24 +46019,24 @@
ld l, b
call Func_22006
ld a, c
- cp $4
- jr nc, .asm_21cac
+ cp CH4
+ jr nc, .sfxChannel
ld a, [$c0e8]
ld d, a
ld a, [$c0e9]
ld e, a
- jr .asm_21cbf
-.asm_21cac
+ jr .skip
+.sfxChannel
ld d, $1
ld e, $0
- cp $7
- jr z, .asm_21cbf
+ cp CH7
+ jr z, .skip ; if noise channel
call Func_21e2f
ld a, [$c0ea]
ld d, a
ld a, [$c0eb]
ld e, a
-.asm_21cbf
+.skip
ld a, l
ld b, $0
ld hl, $c0ce
@@ -45485,41 +46055,43 @@
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_21ce9
+ jr nz, Music8_notepitch
ld hl, $c02e
add hl, bc
bit 2, [hl]
- jr z, .asm_21ce9
+ jr z, Music8_notepitch
pop hl
ret
-.asm_21ce9
+
+Music8_notepitch: ; 21ce9 (8:5ce9)
pop af
and $f0
- cp $c0
- jr nz, .asm_21d20
+ cp $c0 ; compare to rest
+ jr nz, .notRest
ld a, c
- cp $4
- jr nc, .asm_21cfd
+ cp CH4
+ jr nc, .sfxChannel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_21d1f
-.asm_21cfd
+ jr nz, .done
+ ; fall through
+.sfxChannel
ld a, c
- cp $2
- jr z, .asm_21d06
- cp $6
- jr nz, .asm_21d13
-.asm_21d06
+ cp CH2
+ jr z, .musicChannel3
+ cp CH6
+ jr nz, .notSfxChannel3
+.musicChannel3
ld b, $0
- ld hl, Unknown_222de ; $62de
+ ld hl, Unknown_222de
add hl, bc
ld a, [$FF00+$25]
and [hl]
ld [$FF00+$25], a
- jr .asm_21d1f
-.asm_21d13
+ jr .done
+.notSfxChannel3
ld b, $2
call Func_21ff7
ld a, $8
@@ -45527,9 +46099,9 @@
inc hl
ld a, $80
ld [hl], a
-.asm_21d1f
+.done
ret
-.asm_21d20
+.notRest
swap a
ld b, $0
ld hl, $c0d6
@@ -45545,8 +46117,8 @@
.asm_21d39
push de
ld a, c
- cp $4
- jr nc, .asm_21d4e
+ cp CH4
+ jr nc, .skip ; if sfx channel
ld hl, $c02a
ld d, $0
ld e, a
@@ -45554,11 +46126,11 @@
ld a, [hl]
and a
jr nz, .asm_21d4c
- jr .asm_21d4e
+ jr .skip
.asm_21d4c
pop de
ret
-.asm_21d4e
+.skip
ld b, $0
ld hl, $c0de
add hl, bc
@@ -45584,42 +46156,40 @@
call Func_21dcc
ret
-; known jump sources: 21c38 (8:5c38), 21d5e (8:5d5e)
Func_21d79: ; 21d79 (8:5d79)
ld b, $0
- ld hl, Unknown_222e6 ; $62e6
+ ld hl, Unknown_222e6
add hl, bc
ld a, [$FF00+$25]
or [hl]
ld d, a
ld a, c
- cp $7
- jr z, .asm_21d94
- cp $4
- jr nc, .asm_21da6
+ cp CH7
+ jr z, .sfxNoiseChannel
+ cp CH4
+ jr nc, .skip ; if sfx channel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_21da6
-.asm_21d94
+ jr nz, .skip
+.sfxNoiseChannel
ld a, [$c004]
- ld hl, Unknown_222e6 ; $62e6
+ ld hl, Unknown_222e6
add hl, bc
and [hl]
ld d, a
ld a, [$FF00+$25]
- ld hl, Unknown_222de ; $62de
+ ld hl, Unknown_222de
add hl, bc
and [hl]
or d
ld d, a
-.asm_21da6
+.skip
ld a, d
ld [$FF00+$25], a
ret
-; known jump sources: 21c35 (8:5c35), 21d5b (8:5d5b)
Func_21daa: ; 21daa (8:5daa)
ld b, $0
ld hl, $c0b6
@@ -45626,10 +46196,10 @@
add hl, bc
ld d, [hl]
ld a, c
- cp $2
- jr z, .asm_21dc5
- cp $6
- jr z, .asm_21dc5
+ cp CH2
+ jr z, .channel3 ; if music channel 3
+ cp CH6
+ jr z, .channel3 ; if sfx channel 3
ld a, d
and $3f
ld d, a
@@ -45638,31 +46208,31 @@
ld a, [hl]
or d
ld d, a
-.asm_21dc5
+.channel3
ld b, $1
call Func_21ff7
ld [hl], d
ret
-; known jump sources: 21c3c (8:5c3c), 21d75 (8:5d75)
Func_21dcc: ; 21dcc (8:5dcc)
ld a, c
- cp $2
- jr z, .asm_21dd5
- cp $6
- jr nz, .asm_21e02
-.asm_21dd5
+ cp CH2
+ jr z, .channel3
+ cp CH6
+ jr nz, .notSfxChannel3
+ ; fall through
+.channel3
push de
ld de, $c0e6
- cp $2
- jr z, .asm_21de0
+ cp CH2
+ jr z, .musicChannel3
ld de, $c0e7
-.asm_21de0
+.musicChannel3
ld a, [de]
add a
ld d, $0
ld e, a
- ld hl, Unknown_20361 ; $4361
+ ld hl, Music8_Channel3DutyPointers
add hl, de
ld e, [hl]
inc hl
@@ -45671,7 +46241,7 @@
ld b, $f
ld a, $0
ld [$FF00+$1a], a
-.asm_21df5
+.loop
ld a, [de]
inc de
ld [hli], a
@@ -45678,11 +46248,11 @@
ld a, b
dec b
and a
- jr nz, .asm_21df5
+ jr nz, .loop
ld a, $80
ld [$FF00+$1a], a
pop de
-.asm_21e02
+.notSfxChannel3
ld a, d
or $80
and $c7
@@ -45693,18 +46263,19 @@
inc hl
ld [hl], d
ld a, c
- cp $4
- jr c, .asm_21e18
+ cp CH4
+ jr c, .musicChannel
call Func_21e56
-.asm_21e18
+.musicChannel
ret
+Func_21e19: ; 21e19 (8:5e19)
ld a, c
- cp $4
- jr nz, .asm_21e2e ; 0x21e1c $10
+ cp CH4
+ jr nz, .asm_21e2e
ld a, [$d083]
bit 7, a
- jr z, .asm_21e2e ; 0x21e23 $9
+ jr z, .asm_21e2e
xor a
ld [$c0f1], a
ld a, $80
@@ -45712,7 +46283,6 @@
.asm_21e2e
ret
-; known jump sources: 21cb4 (8:5cb4)
Func_21e2f: ; 21e2f (8:5e2f)
call Func_21e8b
jr c, .asm_21e39
@@ -45737,7 +46307,6 @@
.asm_21e55
ret
-; known jump sources: 21e15 (8:5e15)
Func_21e56: ; 21e56 (8:5e56)
call Func_21e8b
jr c, .asm_21e60
@@ -45757,7 +46326,6 @@
.asm_21e6c
ret
-; known jump sources: 219e2 (8:59e2)
Func_21e6d: ; 21e6d (8:5e6d)
call Func_21e8b
jr nc, .asm_21e88
@@ -45781,7 +46349,6 @@
ccf
ret
-; known jump sources: 21e2f (8:5e2f), 21e56 (8:5e56), 21e6d (8:5e6d)
Func_21e8b: ; 21e8b (8:5e8b)
ld a, [$c02a]
cp $14
@@ -45799,7 +46366,6 @@
scf
ret
-; known jump sources: 21e34 (8:5e34), 21e5b (8:5e5b)
Func_21e9f: ; 21e9f (8:5e9f)
ld a, [$c02d]
ld b, a
@@ -45820,12 +46386,11 @@
scf
ret
-; known jump sources: 218ef (8:58ef)
-Func_21eb8: ; 21eb8 (8:5eb8)
+Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
ld hl, $c02e
add hl, bc
bit 5, [hl]
- jp nz, Func_21eff
+ jp nz, .asm_21eff
ld hl, $c09e
add hl, bc
ld e, [hl]
@@ -45858,17 +46423,15 @@
add hl, bc
ld a, [hl]
cp d
- jp c, Func_21f45
- jr nz, asm_21f32
+ jp c, .asm_21f45
+ jr nz, .asm_21f32
ld hl, $c0ae
add hl, bc
ld a, [hl]
cp e
- jp c, Func_21f45
- jr asm_21f32
-
-; known jump sources: 21ebe (8:5ebe)
-Func_21eff: ; 21eff (8:5eff)
+ jp c, .asm_21f45
+ jr .asm_21f32
+.asm_21eff
ld hl, $c09e
add hl, bc
ld a, [hl]
@@ -45898,14 +46461,14 @@
add hl, bc
ld a, d
cp [hl]
- jr c, Func_21f45
- jr nz, asm_21f32
+ jr c, .asm_21f45
+ jr nz, .asm_21f32
ld hl, $c0ae
add hl, bc
ld a, e
cp [hl]
- jr c, Func_21f45
-asm_21f32: ; 21f32 (8:5f32)
+ jr c, .asm_21f45
+.asm_21f32
ld hl, $c09e
add hl, bc
ld [hl], e
@@ -45918,9 +46481,7 @@
ld [hli], a
ld [hl], d
ret
-
-; known jump sources: 21eef (8:5eef), 21efa (8:5efa), 21f26 (8:5f26), 21f30 (8:5f30)
-Func_21f45: ; 21f45 (8:5f45)
+.asm_21f45
ld hl, $c02e
add hl, bc
res 4, [hl]
@@ -45927,7 +46488,6 @@
res 5, [hl]
ret
-; known jump sources: 21d36 (8:5d36)
Func_21f4e: ; 21f4e (8:5f4e)
ld hl, $c096
add hl, bc
@@ -46017,8 +46577,7 @@
ld [hl], a
ret
-; known jump sources: 218d2 (8:58d2)
-Func_21fcc: ; 21fcc (8:5fcc)
+Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
ld b, $0
ld hl, $c046
add hl, bc
@@ -46036,8 +46595,7 @@
ld [hl], a
ret
-; known jump sources: 21967 (8:5967), 219fa (8:59fa), 219fe (8:59fe), 21a2f (8:5a2f), 21a43 (8:5a43), 21a46 (8:5a46), 21a4e (8:5a4e), 21a52 (8:5a52), 21a7b (8:5a7b), 21aba (8:5aba), 21ac9 (8:5ac9), 21af2 (8:5af2), 21afc (8:5afc), 21b1f (8:5b1f), 21b2a (8:5b2a), 21b44 (8:5b44), 21b4a (8:5b4a), 21b5f (8:5b5f), 21b65 (8:5b65), 21b7f (8:5b7f), 21b8c (8:5b8c), 21bab (8:5bab), 21bc9 (8:5bc9), 21c19 (8:5c19), 21c23 (8:5c23), 21c2f (8:5c2f), 21c54 (8:5c54), 21c7b (8:5c7b)
-Func_21fe4: ; 21fe4 (8:5fe4)
+Music8_GetNextMusicByte: ; 21fe4 (8:5fe4)
ld d, $0
ld a, c
add a
@@ -46048,21 +46606,20 @@
ld e, a
ld a, [hld]
ld d, a
- ld a, [de]
+ ld a, [de] ; get next music command
inc de
- ld [hl], e
+ ld [hl], e ; store address of next command
inc hl
ld [hl], d
ret
-; known jump sources: 21941 (8:5941), 21c15 (8:5c15), 21c1f (8:5c1f), 21d15 (8:5d15), 21d57 (8:5d57), 21dc7 (8:5dc7), 21e0a (8:5e0a), 21f3e (8:5f3e), 21fdb (8:5fdb)
Func_21ff7: ; 21ff7 (8:5ff7)
ld a, c
- ld hl, Unknown_222d6 ; $62d6
+ ld hl, Unknown_222d6
add l
- jr nc, .asm_21fff
+ jr nc, .noCarry
inc h
-.asm_21fff
+.noCarry
ld l, a
ld a, [hl]
add b
@@ -46070,23 +46627,21 @@
ld h, $ff
ret
-; known jump sources: 21c9a (8:5c9a), 21cc7 (8:5cc7)
Func_22006: ; 22006 (8:6006)
ld h, $0
-.asm_22008
+.loop
srl a
- jr nc, .asm_2200d
+ jr nc, .noCarry
add hl, de
-.asm_2200d
+.noCarry
sla e
rl d
and a
- jr z, .asm_22016
- jr .asm_22008
-.asm_22016
+ jr z, .done
+ jr .loop
+.done
ret
-; known jump sources: 21b08 (8:5b08), 21d29 (8:5d29)
Func_22017: ; 22017 (8:6017)
ld h, $0
ld l, a
@@ -46093,26 +46648,25 @@
add hl, hl
ld d, h
ld e, l
- ld hl, Unknown_222ee ; $62ee
+ ld hl, Unknown_222ee
add hl, de
ld e, [hl]
inc hl
ld d, [hl]
ld a, b
-.asm_22025
- cp $7
- jr z, .asm_22030
+.loop
+ cp CH7
+ jr z, .done
sra d
rr e
inc a
- jr .asm_22025
-.asm_22030
+ jr .loop
+.done
ld a, $8
add d
ld d, a
ret
-; known jump sources: 21b90 (8:5b90), 21c86 (8:5c86)
Func_22035: ; 22035 (8:6035)
ld [$c001], a
cp $ff
@@ -46132,53 +46686,53 @@
ld [$c0e7], a
ld d, $8
ld hl, $c016
- call Func_22248
+ call FillMusicRAM8
ld hl, $c006
- call Func_22248
+ call FillMusicRAM8
ld d, $4
ld hl, $c026
- call Func_22248
+ call FillMusicRAM8
ld hl, $c02e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c03e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c046
- call Func_22248
+ call FillMusicRAM8
ld hl, $c04e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c056
- call Func_22248
+ call FillMusicRAM8
ld hl, $c05e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c066
- call Func_22248
+ call FillMusicRAM8
ld hl, $c06e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c036
- call Func_22248
+ call FillMusicRAM8
ld hl, $c076
- call Func_22248
+ call FillMusicRAM8
ld hl, $c07e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c086
- call Func_22248
+ call FillMusicRAM8
ld hl, $c08e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c096
- call Func_22248
+ call FillMusicRAM8
ld hl, $c09e
- call Func_22248
+ call FillMusicRAM8
ld hl, $c0a6
- call Func_22248
+ call FillMusicRAM8
ld hl, $c0ae
- call Func_22248
+ call FillMusicRAM8
ld a, $1
ld hl, $c0be
- call Func_22248
+ call FillMusicRAM8
ld hl, $c0b6
- call Func_22248
+ call FillMusicRAM8
ld hl, $c0c6
- call Func_22248
+ call FillMusicRAM8
ld [$c0e8], a
ld a, $ff
ld [$c004], a
@@ -46196,7 +46750,6 @@
ld [$FF00+$24], a
jp Func_2224e
-; known jump sources: 2203f (8:603f), 22042 (8:6042), 22049 (8:6049)
Func_2210d: ; 2210d (8:610d)
ld l, a
ld e, a
@@ -46204,7 +46757,7 @@
ld d, h
add hl, hl
add hl, de
- ld de, SFX_Headers_08 ; $4000
+ ld de, SFX_Headers_08
add hl, de
ld a, h
ld [$c0ec], a
@@ -46215,9 +46768,7 @@
rlca
rlca
ld c, a
-
-; known jump sources: 221f0 (8:61f0)
-Func_22126: ; 22126 (8:6126)
+.asm_22126
ld d, c
ld a, c
add a
@@ -46348,9 +46899,8 @@
and a
jp z, Func_2224e
dec c
- jp Func_22126
+ jp .asm_22126
-; known jump sources: 2203a (8:603a)
Func_221f3: ; 221f3 (8:61f3)
ld a, $80
ld [$FF00+$26], a
@@ -46379,11 +46929,11 @@
ld [$c0e7], a
ld d, $a0
ld hl, $c006
- call Func_22248
+ call FillMusicRAM8
ld a, $1
ld d, $18
ld hl, $c0b6
- call Func_22248
+ call FillMusicRAM8
ld [$c0e8], a
ld [$c0ea], a
ld a, $ff
@@ -46390,16 +46940,15 @@
ld [$c004], a
ret
-; known jump sources: 22061 (8:6061), 22067 (8:6067), 2206f (8:606f), 22075 (8:6075), 2207b (8:607b), 22081 (8:6081), 22087 (8:6087), 2208d (8:608d), 22093 (8:6093), 22099 (8:6099), 2209f (8:609f), 220a5 (8:60a5), 220ab (8:60ab), 220b1 (8:60b1), 220b7 (8:60b7), 220bd (8:60bd), 220c3 (8:60c3), 220c9 (8:60c9), 220cf (8:60cf), 220d5 (8:60d5), 220dd (8:60dd), 220e3 (8:60e3), 220e9 (8:60e9), 2222f (8:622f), 22239 (8:6239)
-Func_22248: ; 22248 (8:6248)
+; fills d bytes at hl with a
+FillMusicRAM8: ; 22248 (8:6248)
ld b, d
-.asm_22249
+.loop
ld [hli], a
dec b
- jr nz, .asm_22249
+ jr nz, .loop
ret
-; known jump sources: 2210a (8:610a), 221ec (8:61ec)
Func_2224e: ; 2224e (8:624e)
ld a, [$c001]
ld l, a
@@ -46408,12 +46957,12 @@
ld d, h
add hl, hl
add hl, de
- ld de, SFX_Headers_08 ; $4000
+ ld de, SFX_Headers_08
add hl, de
ld e, l
ld d, h
ld hl, $c006
- ld a, [de]
+ ld a, [de] ; get channel number
ld b, a
rlca
rlca
@@ -46451,7 +47000,7 @@
.asm_22291
pop bc
pop hl
- ld a, [de]
+ ld a, [de] ; get channel pointer
ld [hli], a
inc de
ld a, [de]
@@ -46480,11 +47029,11 @@
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $c012
- ld de, Unknown_222d5 ; $62d5
+ ld hl, $c012 ; sfx noise channel pointer
+ ld de, Noise8_endchannel
ld [hl], e
inc hl
- ld [hl], d
+ ld [hl], d ; overwrite pointer to point to endchannel
ld a, [$c005]
and a
jr nz, .asm_222d4
@@ -46495,34 +47044,46 @@
.asm_222d4
ret
-Unknown_222d5: ; 222d5 (8:62d5)
-INCBIN "baserom.gbc",$222d5,$222d6 - $222d5
+Noise8_endchannel: ; 222d5 (8:62d5)
+ endchannel
Unknown_222d6: ; 222d6 (8:62d6)
-INCBIN "baserom.gbc",$222d6,$222de - $222d6
+ db $10, $15, $1A, $1F ; channels 0-3
+ db $10, $15, $1A, $1F ; channels 4-7
Unknown_222de: ; 222de (8:62de)
-INCBIN "baserom.gbc",$222de,$222e6 - $222de
+ db $EE, $DD, $BB, $77 ; channels 0-3
+ db $EE, $DD, $BB, $77 ; channels 4-7
Unknown_222e6: ; 222e6 (8:62e6)
-INCBIN "baserom.gbc",$222e6,$222ee - $222e6
+ db $11, $22, $44, $88 ; channels 0-3
+ db $11, $22, $44, $88 ; channels 4-7
Unknown_222ee: ; 222ee (8:62ee)
-INCBIN "baserom.gbc",$222ee,$22306 - $222ee
+ dw $F82C
+ dw $F89D
+ dw $F907
+ dw $F96B
+ dw $F9CA
+ dw $FA23
+ dw $FA77
+ dw $FAC7
+ dw $FB12
+ dw $FB58
+ dw $FB9B
+ dw $FBDA
-; known jump sources: e1d6 (3:61d6)
-Func_22306: ; 22306 (8:6306)
- ld a, $9a
+Music_PokeFluteInBattle: ; 22306 (8:6306)
+ ld a, (SFX_08_46 - $4000) / 3 ; PokeFlute outside of battle
call PlaySoundWaitForCurrent
ld hl, $c00e
- ld de, Unknown_22322 ; $6322
- call Func_2231d
- ld de, Unknown_22325 ; $6325
- call Func_2231d
- ld de, Unknown_2049b ; $449b
+ ld de, SFX_08_PokeFlute_Ch1
+ call Music8_OverwriteChannelPointer
+ ld de, SFX_08_PokeFlute_Ch2
+ call Music8_OverwriteChannelPointer
+ ld de, SFX_08_PokeFlute_Ch3
-; known jump sources: 22311 (8:6311), 22317 (8:6317)
-Func_2231d: ; 2231d (8:631d)
+Music8_OverwriteChannelPointer: ; 2231d (8:631d)
ld a, e
ld [hli], a
ld a, d
@@ -46529,12 +47090,8 @@
ld [hli], a
ret
-Unknown_22322: ; 22322 (8:6322)
-INCBIN "baserom.gbc",$22322,$22325 - $22322
-
-Unknown_22325: ; 22325 (8:6325)
-INCBIN "baserom.gbc",$22325,$22370 - $22325
-
+INCLUDE "music/sfx/sfx_08_pokeflute.tx"
+INCLUDE "music/sfx/sfx_08_unused2.tx"
INCLUDE "music/gymleaderbattle.tx"
INCLUDE "music/trainerbattle.tx"
INCLUDE "music/wildbattle.tx"
@@ -60276,7 +60833,7 @@
jr .asm_3c5db
.asm_3c5d3
call Func_3c643
- ld a, $f9
+ ld a, (Music_DefeatedWildMon - $4000) / 3
call Func_3c6ee
.asm_3c5db
ld hl, W_PLAYERMONCURHP ; $d015
@@ -60392,16 +60949,16 @@
; known jump sources: 3c544 (f:4544), 3c722 (f:4722)
TrainerBattleVictory: ; 3c696 (f:4696)
call Func_3c643
- ld b, $fc
+ ld b, (Music_DefeatedGymLeader - $4000) / 3
ld a, [W_GYMLEADERNO] ; $d05c
and a
- jr nz, .notgymleader
- ld b, $f6 ; gym leader win music
-.notgymleader
+ jr nz, .gymleader
+ ld b, (Music_DefeatedTrainer - $4000) / 3
+.gymleader
ld a, [W_TRAINERCLASS] ; $d031
cp SONY3 ; final battle against rival
jr nz, .notrival
- ld b, $fc ; final rival battle win music
+ ld b, (Music_DefeatedGymLeader - $4000) / 3
ld hl, W_FLAGS_D733
set 1, [hl]
.notrival
@@ -60442,7 +60999,7 @@
ld a, $ff
ld [$c0ee], a
call PlaySoundWaitForCurrent
- ld c, $8
+ ld c, BANK(Music_DefeatedTrainer)
pop af
call PlayMusic
jp Delay3
@@ -81154,8 +81711,8 @@
ld [$c0ee], a
call PlaySound
.asm_50f4e
- ld c, $2
- ld a, $de
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
ld a, $1
ld [$ff00+$8c], a
@@ -81232,8 +81789,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, [$cf0d]
cp $1
@@ -81303,9 +81860,9 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b65)
- ld hl, Func_9b65
- call Bankswitch ; indirect jump to Func_9b65 (9b65 (2:5b65))
+ ld b, BANK(Music_RivalAlternateTempo)
+ ld hl, Music_RivalAlternateTempo
+ call Bankswitch ; indirect jump to Music_RivalAlternateTempo (9b65 (2:5b65))
ld a, $2
ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c
call Func_50ee6
@@ -81381,9 +81938,9 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b75)
- ld hl, Func_9b75
- call Bankswitch ; indirect jump to Func_9b75 (9b75 (2:5b75))
+ ld b, BANK(Music_RivalAlternateStartAndTempo)
+ ld hl, Music_RivalAlternateStartAndTempo
+ call Bankswitch ; indirect jump to Music_RivalAlternateStartAndTempo (9b75 (2:5b75))
ld a, [$cf0d]
cp $1
jr nz, .asm_51134
@@ -82896,8 +83453,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld c, $2
- ld a, $de
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
ld a, $9
ld [H_DOWNARROWBLINKCNT2], a ; $FF00+$8c
@@ -82976,9 +83533,9 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
- call Bankswitch ; indirect jump to Func_9b47 (9b47 (2:5b47))
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
+ call Bankswitch ; indirect jump to Music_RivalAlternateStart (9b47 (2:5b47))
ld de, Unknown_51d1d ; $5d1d
ld a, [$cf0d]
cp $1
@@ -83890,9 +84447,9 @@
ld a, $2
ld [W_BATTLETYPE], a ; $d05a
.asm_525f9
- ld hl, Func_90c6
- ld b, BANK(Func_90c6)
- jp Bankswitch ; indirect jump to Func_90c6 (90c6 (2:50c6))
+ ld hl, PlayBattleMusic
+ ld b, BANK(PlayBattleMusic)
+ jp Bankswitch ; indirect jump to PlayBattleMusic (90c6 (2:50c6))
; known jump sources: 3f9b6 (f:79b6)
Func_52601: ; 52601 (14:6601)
@@ -93894,8 +94451,8 @@
jr nz, .asm_5c5c3 ; 0x5c5c5 $fc
dec hl
push hl
- ld c, $1f
- ld a, $d0
+ ld c, BANK(Music_JigglypuffSong)
+ ld a, (Music_JigglypuffSong - $4000) / 3
call PlayMusic
pop hl
.asm_5c5d1
@@ -97101,8 +97658,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld c, $2
- ld a, $de
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
ld hl, $d764
res 6, [hl]
@@ -97157,8 +97714,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $2
ld [W_POKEMONTOWER2CURSCRIPT], a
@@ -98788,8 +99345,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld c, $2
- ld a, $de
+ ld c, BANK(Music_MeetRival)
+ ld a, (Music_MeetRival - $4000) / 3
call PlayMusic
ld a, [$cd3d]
ld [$ff00+$db], a
@@ -98908,8 +99465,8 @@
ld a, $ff
ld [$c0ee], a
call PlaySound
- ld b, BANK(Func_9b47)
- ld hl, Func_9b47
+ ld b, BANK(Music_RivalAlternateStart)
+ ld hl, Music_RivalAlternateStart
call Bankswitch
ld a, $3
ld [W_SSANNE2CURSCRIPT], a
@@ -101198,8 +101755,8 @@
.asm_701eb
ld a, $90
ld [$FF00+$b0], a
- ld c, $1f
- ld a, $ca
+ ld c, BANK(Music_HallOfFame)
+ ld a, (Music_HallOfFame - $4000) / 3
call PlayMusic
ld hl, W_PARTYMON1 ; $d164
ld c, $ff
@@ -101476,7 +102033,7 @@
ld [$cfc8], a
ld [$cfc9], a
ld a, $ff
- ld [$cfc7], a
+ ld [W_CURCHANNELPOINTER], a
jp GBFadeOut2
; known jump sources: 7027 (1:7027)
@@ -101498,12 +102055,12 @@
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
@@ -106162,8 +106719,8 @@
call EnableLCD
ld a, $ff
call PlaySoundWaitForCurrent
- ld c, $1f
- ld a, $c7
+ ld c, BANK(Music_Credits)
+ ld a, (Music_Credits - $4000) / 3
call PlayMusic
ld c, $80
call DelayFrames
@@ -109927,8 +110484,8 @@
ret
GaryScript4: ; 75fe4 (1d:5fe4)
- ld b, BANK(Func_9b81)
- ld hl, Func_9b81
+ ld b, BANK(Music_Cities1AlternateTempo)
+ ld hl, Music_Cities1AlternateTempo
call Bankswitch
ld a, $2
ld [$ff00+$8c], a
@@ -113749,8 +114306,8 @@
ld a, [$cee9]
call PlayCry
call WaitForSoundToFinish
- ld c, $2
- ld a, $e5
+ ld c, BANK(Music_SafariZone)
+ ld a, (Music_SafariZone - $4000) / 3
call PlayMusic
ld c, $50
call DelayFrames
@@ -113889,8 +114446,8 @@
add d
ld [$FF00+$af], a
push bc
- ld c, $2
- ld a, $b4
+ ld c, BANK(SFX_02_5b)
+ ld a, (SFX_02_5b - $4000) / 3
call PlayMusic
pop bc
ld c, $2
@@ -113901,8 +114458,8 @@
ld [$FF00+$af], a
ld a, $ff
call PlaySound
- ld c, $2
- ld a, $b9
+ ld c, BANK(SFX_02_5f)
+ ld a, (SFX_02_5f - $4000) / 3
call PlayMusic
.asm_7bf57
ld a, [$c02a]
@@ -113998,9 +114555,32 @@
INCLUDE "music/sfx/sfx_1f_12.tx"
INCLUDE "music/sfx/sfx_1f_13.tx"
-Unknown_7c361: ; 7c361 (1f:4361)
-INCBIN "baserom.gbc",$7c361,$7c3c3 - $7c361
+Music1f_Channel3DutyPointers: ; 7c361 (1f:4361)
+ dw Music1f_Channel3Duty1
+ dw Music1f_Channel3Duty2
+ dw Music1f_Channel3Duty3
+ dw Music1f_Channel3Duty4
+ dw Music1f_Channel3Duty5
+ dw SFX_1f_3f_Ch1 ; unused
+ dw SFX_1f_3f_Ch1 ; unused
+ dw SFX_1f_3f_Ch1 ; unused
+ dw SFX_1f_3f_Ch1 ; unused
+
+Music1f_Channel3Duty1: ; 7c373 (1f:4373)
+ db $02,$46,$8A,$CE,$FF,$FE,$ED,$DC,$CB,$A9,$87,$65,$44,$33,$22,$11
+Music1f_Channel3Duty2: ; 7c383 (1f:4383)
+ db $02,$46,$8A,$CE,$EF,$FF,$FE,$EE,$DD,$CB,$A9,$87,$65,$43,$22,$11
+
+Music1f_Channel3Duty3: ; 7c393 (1f:4393)
+ db $13,$69,$BD,$EE,$EE,$FF,$FF,$ED,$DE,$FF,$FF,$EE,$EE,$DB,$96,$31
+
+Music1f_Channel3Duty4: ; 7c3a3 (1f:43a3)
+ db $02,$46,$8A,$CD,$EF,$FE,$DE,$FF,$EE,$DC,$BA,$98,$76,$54,$32,$10
+
+Music1f_Channel3Duty5: ; 7c3b3 (1f:43b3)
+ db $01,$23,$45,$67,$8A,$CD,$EE,$F7,$7F,$EE,$DC,$A8,$76,$54,$32,$10
+
INCLUDE "music/sfx/sfx_1f_3f.tx"
INCLUDE "music/sfx/sfx_1f_56.tx"
INCLUDE "music/sfx/sfx_1f_57.tx"
@@ -114048,9 +114628,7 @@
INCLUDE "music/sfx/sfx_1f_65.tx"
INCLUDE "music/sfx/sfx_1f_66.tx"
INCLUDE "music/sfx/sfx_1f_67.tx"
-
-INCBIN "baserom.gbc",$7c758,$7c7a4 - $7c758
-
+INCLUDE "music/sfx/sfx_1f_unused.tx"
INCLUDE "music/sfx/sfx_1f_1d.tx"
INCLUDE "music/sfx/sfx_1f_37.tx"
INCLUDE "music/sfx/sfx_1f_38.tx"
@@ -114090,18 +114668,17 @@
INCLUDE "music/sfx/sfx_1f_35.tx"
INCLUDE "music/sfx/sfx_1f_36.tx"
-; known jump sources: 441b0 (11:41b0)
Func_7d13b: ; 7d13b (1f:513b)
ld a, [$FF00+$dc]
ld c, $0
- ld hl, Unknown_7d170 ; $5170
-.asm_7d142
+ ld hl, OwnedMonValues
+.getSfxPointer
cp [hl]
- jr c, .asm_7d149
+ jr c, .gotSfxPointer
inc c
inc hl
- jr .asm_7d142
-.asm_7d149
+ jr .getSfxPointer
+.gotSfxPointer
push bc
ld a, $ff
ld [$c0ee], a
@@ -114108,7 +114685,7 @@
call PlaySoundWaitForCurrent
pop bc
ld b, $0
- ld hl, Unknown_7d162 ; $5162
+ ld hl, PokedexRatingSfxPointers
add hl, bc
add hl, bc
ld a, [hli]
@@ -114116,29 +114693,42 @@
call PlayMusic
jp Func_2307
-Unknown_7d162: ; 7d162 (1f:5162)
-INCBIN "baserom.gbc",$7d162,$7d170 - $7d162
+PokedexRatingSfxPointers: ; 7d162 (1f:5162)
+ db (SFX_1f_51 - $4000) / 3
+ db BANK(SFX_1f_51)
+ db (SFX_02_41 - $4000) / 3
+ db BANK(SFX_02_41)
+ db (SFX_02_3a - $4000) / 3
+ db BANK(SFX_02_3a)
+ db (SFX_08_46 - $4000) / 3
+ db BANK(SFX_08_46)
+ db (SFX_08_3a - $4000) / 3
+ db BANK(SFX_08_3a)
+ db (SFX_02_42 - $4000) / 3
+ db BANK(SFX_02_42)
+ db (SFX_02_3b - $4000) / 3
+ db BANK(SFX_02_3b)
-Unknown_7d170: ; 7d170 (1f:5170)
-INCBIN "baserom.gbc",$7d170,$7d177 - $7d170
+OwnedMonValues: ; 7d170 (1f:5170)
+ db 10, 40, 60, 90, 120, 150, $ff
Func_7d177: ; 7d177 (1f:5177)
- ld c, $0
-.asm_7d179
+ ld c, CH0
+.loop
ld b, $0
ld hl, $c026
add hl, bc
ld a, [hl]
and a
- jr z, .asm_7d1a5
+ jr z, .nextChannel
ld a, c
- cp $4
- jr nc, .asm_7d1a2
+ cp CH4
+ jr nc, .applyAffects ; if sfx channel
ld a, [$c002]
and a
- jr z, .asm_7d1a2
+ jr z, .applyAffects
bit 7, a
- jr nz, .asm_7d1a5
+ jr nz, .nextChannel
set 7, a
ld [$c002], a
xor a
@@ -114146,74 +114736,80 @@
ld [$FF00+$1a], a
ld a, $80
ld [$FF00+$1a], a
- jr .asm_7d1a5
-.asm_7d1a2
- call Func_7d1ac
-.asm_7d1a5
+ jr .nextChannel
+.applyAffects
+ call Music1f_Music2_ApplyMusicAffects
+.nextChannel
ld a, c
- inc c
- cp $7
- jr nz, .asm_7d179
+ inc c ; inc channel number
+ cp CH7
+ jr nz, .loop
ret
-; known jump sources: 7d1a2 (1f:51a2)
-Func_7d1ac: ; 7d1ac (1f:51ac)
+; this routine checks flags for music effects currently applied
+; to the channel and calls certain functions based on flags.
+; known flags for $c02e:
+; 1: call has been used
+; 3: a toggle used only by this routine for vibrato
+; 4: pitchbend flag
+; 6: dutycycle flag
+Music1f_Music2_ApplyMusicAffects: ; 7d1ac (1f:51ac)
ld b, $0
- ld hl, $c0b6
+ ld hl, $c0b6 ; delay until next note
add hl, bc
ld a, [hl]
- cp $1
- jp z, Func_7d244
- dec a
+ cp $1 ; if delay is 1, play next note
+ jp z, Music1f_Music2_PlayNextNote
+ dec a ; otherwise, decrease the delay timer
ld [hl], a
ld a, c
- cp $4
- jr nc, .asm_7d1c8
+ cp CH4
+ jr nc, .startChecks ; if a sfx channel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr z, .asm_7d1c8
+ jr z, .startChecks
ret
-.asm_7d1c8
+.startChecks
ld hl, $c02e
add hl, bc
- bit 6, [hl]
- jr z, .asm_7d1d3
- call Func_7d881
-.asm_7d1d3
+ bit 6, [hl] ; dutycycle
+ jr z, .checkForExecuteMusic
+ call Music1f_ApplyDutyCycle
+.checkForExecuteMusic
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_7d1e5
+ jr nz, .checkForPitchBend
ld hl, $c02e
add hl, bc
bit 2, [hl]
- jr nz, .asm_7d1f9
-.asm_7d1e5
+ jr nz, .disablePitchBendVibrato
+.checkForPitchBend
ld hl, $c02e
add hl, bc
- bit 4, [hl]
- jr z, .asm_7d1f0
- jp Func_7d76d
-.asm_7d1f0
- ld hl, $c04e
+ bit 4, [hl] ; pitchbend
+ jr z, .checkVibratoDelay
+ jp Music1f_ApplyPitchBend
+.checkVibratoDelay
+ ld hl, $c04e ; vibrato delay
add hl, bc
ld a, [hl]
- and a
- jr z, .asm_7d1fa
- dec [hl]
-.asm_7d1f9
+ and a ; check if delay is over
+ jr z, .checkForVibrato
+ dec [hl] ; otherwise, dec delay
+.disablePitchBendVibrato
ret
-.asm_7d1fa
- ld hl, $c056
+.checkForVibrato
+ ld hl, $c056 ; vibrato rate
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_7d203
- ret
-.asm_7d203
+ jr nz, .vibrato
+ ret ; no vibrato
+.vibrato
ld d, a
ld hl, $c05e
add hl, bc
@@ -114220,21 +114816,21 @@
ld a, [hl]
and $f
and a
- jr z, .asm_7d210
- dec [hl]
+ jr z, .vibratoAlreadyDone
+ dec [hl] ; apply vibrato pitch change
ret
-.asm_7d210
+.vibratoAlreadyDone
ld a, [hl]
swap [hl]
or [hl]
- ld [hl], a
+ ld [hl], a ; reset the vibrato value and start again
ld hl, $c066
add hl, bc
- ld e, [hl]
+ ld e, [hl] ; get note pitch
ld hl, $c02e
add hl, bc
- bit 3, [hl]
- jr z, .asm_7d230
+ bit 3, [hl] ; this is the only code that sets/resets bit three so
+ jr z, .unset ; it continuously alternates which path it takes
res 3, [hl]
ld a, d
and $f
@@ -114241,19 +114837,19 @@
ld d, a
ld a, e
sub d
- jr nc, .asm_7d22e
+ jr nc, .noCarry
ld a, $0
-.asm_7d22e
- jr .asm_7d23c
-.asm_7d230
+.noCarry
+ jr .done
+.unset
set 3, [hl]
ld a, d
and $f0
swap a
add e
- jr nc, .asm_7d23c
+ jr nc, .done
ld a, $ff
-.asm_7d23c
+.done
ld d, a
ld b, $3
call Func_7d8ac
@@ -114260,8 +114856,10 @@
ld [hl], d
ret
-; known jump sources: 7d1b5 (1f:51b5)
-Func_7d244: ; 7d244 (1f:5244)
+; this routine executes all music commands that take up no time,
+; like tempo changes, duty changes etc. and doesn't return
+; until the first note is reached
+Music1f_Music2_PlayNextNote: ; 7d244 (1f:5244)
ld hl, $c06e
add hl, bc
ld a, [hl]
@@ -114272,36 +114870,35 @@
add hl, bc
res 4, [hl]
res 5, [hl]
- call Func_7d25a
+ call Music1f_endchannel
ret
-; known jump sources: 7d256 (1f:5256), 7d2b0 (1f:52b0), 7d31a (1f:531a), 7d33c (1f:533c), 7d355 (1f:5355), 7d394 (1f:5394), 7d3a6 (1f:53a6), 7d3de (1f:53de), 7d42b (1f:542b), 7d46b (1f:546b), 7d478 (1f:5478), 7d497 (1f:5497), 7d4b5 (1f:54b5), 7d4c1 (1f:54c1), 7d4d0 (1f:54d0), 7d4e3 (1f:54e3), 7d54c (1f:554c)
-Func_7d25a: ; 7d25a (1f:525a)
- call Func_7d899
+Music1f_endchannel: ; 7d25a (1f:525a)
+ call Music1f_GetNextMusicByte
ld d, a
- cp $ff
- jp nz, Func_7d2e8
- ld b, $0
+ cp $ff ; is this command an endchannel?
+ jp nz, Music1f_callchannel ; no
+ ld b, $0 ; yes
ld hl, $c02e
add hl, bc
bit 1, [hl]
- jr nz, .asm_7d298
+ jr nz, .returnFromCall
ld a, c
- cp $3
- jr nc, .asm_7d274
+ cp CH3
+ jr nc, .noiseOrSfxChannel
jr .asm_7d2b3
-.asm_7d274
+.noiseOrSfxChannel
res 2, [hl]
ld hl, $c036
add hl, bc
res 0, [hl]
- cp $6
- jr nz, .asm_7d288
+ cp CH6
+ jr nz, .notSfxChannel3
ld a, $0
ld [$FF00+$1a], a
ld a, $80
ld [$FF00+$1a], a
-.asm_7d288
+.notSfxChannel3
jr nz, .asm_7d296
ld a, [$c003]
and a
@@ -114311,7 +114908,7 @@
jr .asm_7d2b3
.asm_7d296
jr .asm_7d2bc
-.asm_7d298
+.returnFromCall
res 1, [hl]
ld d, $0
ld a, c
@@ -114319,7 +114916,7 @@
ld e, a
ld hl, $c006
add hl, de
- push hl
+ push hl ; store current channel address
ld hl, $c016
add hl, de
ld e, l
@@ -114329,10 +114926,10 @@
ld [hli], a
inc de
ld a, [de]
- ld [hl], a
- jp Func_7d25a
+ ld [hl], a ; loads channel address to return to
+ jp Music1f_endchannel
.asm_7d2b3
- ld hl, Unknown_7db93 ; $5b93
+ ld hl, Unknown_7db93
add hl, bc
ld a, [$FF00+$25]
and [hl]
@@ -114350,7 +114947,7 @@
jr .asm_7d2e2
.asm_7d2d0
ld a, c
- cp $4
+ cp CH4
jr z, .asm_7d2d9
call Func_7d73b
ret c
@@ -114365,17 +114962,16 @@
ld [hl], b
ret
-; known jump sources: 7d260 (1f:5260)
-Func_7d2e8: ; 7d2e8 (1f:52e8)
- cp $fd
- jp nz, Func_7d31d
- call Func_7d899
+Music1f_callchannel: ; 7d2e8 (1f:52e8)
+ cp $fd ; is this command a callchannel?
+ jp nz, Music1f_loopchannel ; no
+ call Music1f_GetNextMusicByte ; yes
push af
- call Func_7d899
+ call Music1f_GetNextMusicByte
ld d, a
pop af
ld e, a
- push de
+ push de ; store pointer
ld d, $0
ld a, c
add a
@@ -114392,43 +114988,43 @@
ld [de], a
inc de
ld a, [hld]
- ld [de], a
+ ld [de], a ; copy current channel address
pop de
ld [hl], e
inc hl
- ld [hl], d
+ ld [hl], d ; overwrite current address with pointer
ld b, $0
ld hl, $c02e
add hl, bc
- set 1, [hl]
- jp Func_7d25a
+ set 1, [hl] ; set the call flag
+ jp Music1f_endchannel
-; known jump sources: 7d2ea (1f:52ea)
-Func_7d31d: ; 7d31d (1f:531d)
- cp $fe
- jp nz, Func_7d358
- call Func_7d899
+Music1f_loopchannel: ; 7d31d (1f:531d)
+ cp $fe ; is this command a loopchannel?
+ jp nz, Music1f_notetype ; no
+ call Music1f_GetNextMusicByte ; yes
ld e, a
and a
- jr z, .asm_7d341
+ jr z, .infiniteLoop
ld b, $0
ld hl, $c0be
add hl, bc
ld a, [hl]
cp e
- jr nz, .asm_7d33f
- ld a, $1
+ jr nz, .loopAgain
+ ld a, $1 ; if no more loops to make
ld [hl], a
- call Func_7d899
- call Func_7d899
- jp Func_7d25a
-.asm_7d33f
+ call Music1f_GetNextMusicByte ; skip pointer
+ call Music1f_GetNextMusicByte
+ jp Music1f_endchannel
+.loopAgain ; inc loop count
inc a
ld [hl], a
-.asm_7d341
- call Func_7d899
+ ; fall through
+.infiniteLoop ; overwrite current address with pointer
+ call Music1f_GetNextMusicByte
push af
- call Func_7d899
+ call Music1f_GetNextMusicByte
ld b, a
ld d, $0
ld a, c
@@ -114439,73 +115035,76 @@
pop af
ld [hli], a
ld [hl], b
- jp Func_7d25a
+ jp Music1f_endchannel
-; known jump sources: 7d31f (1f:531f)
-Func_7d358: ; 7d358 (1f:5358)
+Music1f_notetype: ; 7d358 (1f:5358)
and $f0
- cp $d0
- jp nz, Func_7d397
- ld a, d
+ cp $d0 ; is this command a notetype?
+ jp nz, Music1f_togglecall ; no
+ ld a, d ; yes
and $f
ld b, $0
ld hl, $c0c6
add hl, bc
- ld [hl], a
+ ld [hl], a ; store low nibble as speed
ld a, c
- cp $3
- jr z, .asm_7d394
- call Func_7d899
+ cp CH3
+ jr z, .noiseChannel ; noise channel has 0 params
+ call Music1f_GetNextMusicByte
ld d, a
ld a, c
- cp $2
- jr z, .asm_7d380
- cp $6
- jr nz, .asm_7d38d
+ cp CH2
+ jr z, .musicChannel3
+ cp CH6
+ jr nz, .notChannel3
ld hl, $c0e7
- jr .asm_7d383
-.asm_7d380
+ jr .sfxChannel3
+.musicChannel3
ld hl, $c0e6
-.asm_7d383
+.sfxChannel3
ld a, d
and $f
- ld [hl], a
+ ld [hl], a ; store low nibble of param as duty
ld a, d
and $30
sla a
ld d, a
-.asm_7d38d
+ ; fall through
+
+ ; if channel 3, store high nibble as volume
+ ; else, store volume (high nibble) and fade (low nibble)
+.notChannel3
ld b, $0
ld hl, $c0de
add hl, bc
ld [hl], d
-.asm_7d394
- jp Func_7d25a
+.noiseChannel
+ jp Music1f_endchannel
-; known jump sources: 7d35c (1f:535c)
-Func_7d397: ; 7d397 (1f:5397)
+Music1f_togglecall: ; 7d397 (1f:5397)
ld a, d
- cp $e8
- jr nz, .asm_7d3a9
- ld b, $0
+ cp $e8 ; is this command an togglecall?
+ jr nz, Music1f_vibrato ; no
+ ld b, $0 ; yes
ld hl, $c02e
add hl, bc
ld a, [hl]
xor $1
- ld [hl], a
- jp Func_7d25a
-.asm_7d3a9
- cp $ea
- jr nz, .asm_7d3e1
- call Func_7d899
+ ld [hl], a ; flip bit 0 of $c02e (toggle returning from call)
+ jp Music1f_endchannel
+
+Music1f_vibrato: ; 7d3a9 (1f:53a9)
+ cp $ea ; is this command a vibrato?
+ jr nz, Music1f_pitchbend ; no
+ call Music1f_GetNextMusicByte ; yes
ld b, $0
ld hl, $c04e
add hl, bc
- ld [hl], a
+ ld [hl], a ; store delay
ld hl, $c06e
add hl, bc
- ld [hl], a
- call Func_7d899
+ ld [hl], a ; store delay
+ call Music1f_GetNextMusicByte
ld d, a
and $f0
swap a
@@ -114517,7 +115116,7 @@
adc b
swap a
or e
- ld [hl], a
+ ld [hl], a ; store rate as both high and low nibbles
ld a, d
and $f
ld d, a
@@ -114525,17 +115124,18 @@
add hl, bc
swap a
or d
- ld [hl], a
- jp Func_7d25a
-.asm_7d3e1
- cp $eb
- jr nz, .asm_7d419
- call Func_7d899
+ ld [hl], a ; store depth as both high and low nibbles
+ jp Music1f_endchannel
+
+Music1f_pitchbend: ; 7d3e1 (1f:53e1)
+ cp $eb ; is this command a pitchbend?
+ jr nz, Music1f_duty ; no
+ call Music1f_GetNextMusicByte ; yes
ld b, $0
ld hl, $c076
add hl, bc
- ld [hl], a
- call Func_7d899
+ ld [hl], a ; store first param
+ call Music1f_GetNextMusicByte
ld d, a
and $f0
swap a
@@ -114546,21 +115146,22 @@
ld b, $0
ld hl, $c0a6
add hl, bc
- ld [hl], d
+ ld [hl], d ; store unknown part of second param
ld hl, $c0ae
add hl, bc
- ld [hl], e
+ ld [hl], e ; store unknown part of second param
ld b, $0
ld hl, $c02e
add hl, bc
- set 4, [hl]
- call Func_7d899
+ set 4, [hl] ; set pitchbend flag
+ call Music1f_GetNextMusicByte
ld d, a
- jp Func_7d57e
-.asm_7d419
- cp $ec
- jr nz, .asm_7d42e
- call Func_7d899
+ jp Music1f_notelength
+
+Music1f_duty: ; 7d419 (1f:5419)
+ cp $ec ; is this command a duty?
+ jr nz, Music1f_tempo ; no
+ call Music1f_GetNextMusicByte ; yes
rrca
rrca
and $c0
@@ -114567,111 +115168,120 @@
ld b, $0
ld hl, $c03e
add hl, bc
- ld [hl], a
- jp Func_7d25a
-.asm_7d42e
- cp $ed
- jr nz, .asm_7d46e
- ld a, c
- cp $4
- jr nc, .asm_7d452
- call Func_7d899
- ld [$c0e8], a
- call Func_7d899
- ld [$c0e9], a
+ ld [hl], a ; store duty
+ jp Music1f_endchannel
+
+Music1f_tempo: ; 7d42e (1f:542e)
+ cp $ed ; is this command a tempo?
+ jr nz, Music1f_unknownmusic0xee ; no
+ ld a, c ; yes
+ cp CH4
+ jr nc, .sfxChannel
+ call Music1f_GetNextMusicByte
+ ld [$c0e8], a ; store first param
+ call Music1f_GetNextMusicByte
+ ld [$c0e9], a ; store second param
xor a
- ld [$c0ce], a
+ ld [$c0ce], a ; clear RAM
ld [$c0cf], a
ld [$c0d0], a
ld [$c0d1], a
- jr .asm_7d46b
-.asm_7d452
- call Func_7d899
- ld [$c0ea], a
- call Func_7d899
- ld [$c0eb], a
+ jr .musicChannelDone
+.sfxChannel
+ call Music1f_GetNextMusicByte
+ ld [$c0ea], a ; store first param
+ call Music1f_GetNextMusicByte
+ ld [$c0eb], a ; store second param
xor a
- ld [$c0d2], a
+ ld [$c0d2], a ; clear RAM
ld [$c0d3], a
ld [$c0d4], a
ld [$c0d5], a
-.asm_7d46b
- jp Func_7d25a
-.asm_7d46e
- cp $ee
- jr nz, .asm_7d47b
- call Func_7d899
- ld [$c004], a
- jp Func_7d25a
-.asm_7d47b
- cp $ef
- jr nz, .asm_7d49a
- call Func_7d899
+.musicChannelDone
+ jp Music1f_endchannel
+
+Music1f_unknownmusic0xee: ; 7d46e (1f:546e)
+ cp $ee ; is this command an unknownmusic0xee?
+ jr nz, Music1f_unknownmusic0xef ; no
+ call Music1f_GetNextMusicByte ; yes
+ ld [$c004], a ; store first param
+ jp Music1f_endchannel
+
+; this appears to never be used
+Music1f_unknownmusic0xef: ; 7d47b (1f:547b)
+ cp $ef ; is this command an unknownmusic0xef?
+ jr nz, Music1f_dutycycle ; no
+ call Music1f_GetNextMusicByte ; yes
push bc
call Func_7d8ea
pop bc
ld a, [$c003]
and a
- jr nz, .asm_7d497
+ jr nz, .skip
ld a, [$c02d]
ld [$c003], a
xor a
ld [$c02d], a
-.asm_7d497
- jp Func_7d25a
-.asm_7d49a
- cp $fc
- jr nz, .asm_7d4b8
- call Func_7d899
+.skip
+ jp Music1f_endchannel
+
+Music1f_dutycycle: ; 7d49a (1f:549a)
+ cp $fc ; is this command a dutycycle?
+ jr nz, Music1f_stereopanning ; no
+ call Music1f_GetNextMusicByte ; yes
ld b, $0
ld hl, $c046
add hl, bc
- ld [hl], a
+ ld [hl], a ; store full cycle
and $c0
ld hl, $c03e
add hl, bc
- ld [hl], a
+ ld [hl], a ; store first duty
ld hl, $c02e
add hl, bc
- set 6, [hl]
- jp Func_7d25a
-.asm_7d4b8
- cp $f0
- jr nz, .asm_7d4c4
- call Func_7d899
- ld [$FF00+$24], a
- jp Func_7d25a
-.asm_7d4c4
- cp $f8
- jr nz, .asm_7d4d3
- ld b, $0
+ set 6, [hl] ; set duty flag
+ jp Music1f_endchannel
+
+Music1f_stereopanning: ; 7d4b8 (1f:54b8)
+ cp $f0 ; is this command a stereopanning?
+ jr nz, Music1f_executemusic ; no
+ call Music1f_GetNextMusicByte ; yes
+ ld [$FF00+$24], a ; store stereopanning
+ jp Music1f_endchannel
+
+Music1f_executemusic: ; 7d4c4 (1f:54c4)
+ cp $f8 ; is this command an executemusic?
+ jr nz, Music1f_octave ; no
+ ld b, $0 ; yes
ld hl, $c036
add hl, bc
set 0, [hl]
- jp Func_7d25a
-.asm_7d4d3
+ jp Music1f_endchannel
+
+Music1f_octave: ; 7d4d3 (1f:54d3)
and $f0
- cp $e0
- jr nz, .asm_7d4e6
- ld hl, $c0d6
+ cp $e0 ; is this command an octave?
+ jr nz, Music1f_unknownsfx0x20 ; no
+ ld hl, $c0d6 ; yes
ld b, $0
add hl, bc
ld a, d
and $f
- ld [hl], a
- jp Func_7d25a
-.asm_7d4e6
- cp $20
- jr nz, .asm_7d533
+ ld [hl], a ; store low nibble as octave
+ jp Music1f_endchannel
+
+Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6)
+ cp $20 ; is this command an unknownsfx0x20?
+ jr nz, Music1f_unknownsfx0x10 ; no
ld a, c
- cp $3
- jr c, .asm_7d533
+ cp CH3 ; is this a noise or sfx channel?
+ jr c, Music1f_unknownsfx0x10 ; no
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_7d533
- call Func_7d57e
+ jr nz, Music1f_unknownsfx0x10 ; no
+ call Music1f_notelength ; yes
ld d, a
ld b, $0
ld hl, $c03e
@@ -114682,21 +115292,21 @@
ld b, $1
call Func_7d8ac
ld [hl], d
- call Func_7d899
+ call Music1f_GetNextMusicByte
ld d, a
ld b, $2
call Func_7d8ac
ld [hl], d
- call Func_7d899
+ call Music1f_GetNextMusicByte
ld e, a
ld a, c
- cp $7
+ cp CH7
ld a, $0
- jr z, .asm_7d526
+ jr z, .sfxNoiseChannel ; only two params for noise channel
push de
- call Func_7d899
+ call Music1f_GetNextMusicByte
pop de
-.asm_7d526
+.sfxNoiseChannel
ld d, a
push de
call Func_7d69d
@@ -114704,30 +115314,32 @@
pop de
call Func_7d6bf
ret
-.asm_7d533
+
+Music1f_unknownsfx0x10 ; 7d533 (1f:5533)
ld a, c
- cp $4
- jr c, .asm_7d54f
+ cp CH4
+ jr c, Music1f_note ; if not a sfx
ld a, d
- cp $10
- jr nz, .asm_7d54f
+ cp $10 ; is this command an unknownsfx0x10?
+ jr nz, Music1f_note ; no
ld b, $0
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_7d54f
- call Func_7d899
+ jr nz, Music1f_note ; no
+ call Music1f_GetNextMusicByte ; yes
ld [$FF00+$10], a
- jp Func_7d25a
-.asm_7d54f
+ jp Music1f_endchannel
+
+Music1f_note: ; 7d54f (1f:554f)
ld a, c
- cp $3
- jr nz, Func_7d57e
+ cp CH3
+ jr nz, Music1f_notelength ; if not noise channel
ld a, d
and $f0
- cp $b0
- jr z, .asm_7d569
- jr nc, Func_7d57e
+ cp $b0 ; is this command a dnote?
+ jr z, Music1f_dnote ; yes
+ jr nc, Music1f_notelength ; no
swap a
ld b, a
ld a, d
@@ -114736,14 +115348,15 @@
ld a, b
push de
push bc
- jr .asm_7d571
-.asm_7d569
+ jr asm_7d571
+
+Music1f_dnote: ; 7d569 (1f:5569)
ld a, d
and $f
push af
push bc
- call Func_7d899
-.asm_7d571
+ call Music1f_GetNextMusicByte ; get dnote instrument
+asm_7d571
ld d, a
ld a, [$c003]
and a
@@ -114754,14 +115367,13 @@
pop bc
pop de
-; known jump sources: 7d416 (1f:5416), 7d4f9 (1f:54f9), 7d552 (1f:5552), 7d55b (1f:555b)
-Func_7d57e: ; 7d57e (1f:557e)
+Music1f_notelength: ; 7d57e (1f:557e)
ld a, d
push af
and $f
inc a
ld b, $0
- ld e, a
+ ld e, a ; store note length (in 16ths)
ld d, b
ld hl, $c0c6
add hl, bc
@@ -114769,24 +115381,24 @@
ld l, b
call Func_7d8bb
ld a, c
- cp $4
- jr nc, .asm_7d59f
+ cp CH4
+ jr nc, .sfxChannel
ld a, [$c0e8]
ld d, a
ld a, [$c0e9]
ld e, a
- jr .asm_7d5b2
-.asm_7d59f
+ jr .skip
+.sfxChannel
ld d, $1
ld e, $0
- cp $7
- jr z, .asm_7d5b2
+ cp CH7
+ jr z, .skip ; if noise channel
call Func_7d707
ld a, [$c0ea]
ld d, a
ld a, [$c0eb]
ld e, a
-.asm_7d5b2
+.skip
ld a, l
ld b, $0
ld hl, $c0ce
@@ -114805,41 +115417,43 @@
ld hl, $c036
add hl, bc
bit 0, [hl]
- jr nz, .asm_7d5dc
+ jr nz, Music1f_notepitch
ld hl, $c02e
add hl, bc
bit 2, [hl]
- jr z, .asm_7d5dc
+ jr z, Music1f_notepitch
pop hl
ret
-.asm_7d5dc
+
+Music1f_notepitch: ; 7d5dc (1f:55dc)
pop af
and $f0
- cp $c0
- jr nz, .asm_7d613
+ cp $c0 ; compare to rest
+ jr nz, .notRest
ld a, c
- cp $4
- jr nc, .asm_7d5f0
+ cp CH4
+ jr nc, .sfxChannel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_7d612
-.asm_7d5f0
+ jr nz, .quit
+ ; fall through
+.sfxChannel
ld a, c
- cp $2
- jr z, .asm_7d5f9
- cp $6
- jr nz, .asm_7d606
-.asm_7d5f9
+ cp CH2
+ jr z, .musicChannel3
+ cp CH6
+ jr nz, .notSfxChannel3
+.musicChannel3
ld b, $0
- ld hl, Unknown_7db93 ; $5b93
+ ld hl, Unknown_7db93
add hl, bc
ld a, [$FF00+$25]
and [hl]
ld [$FF00+$25], a
- jr .asm_7d612
-.asm_7d606
+ jr .quit
+.notSfxChannel3
ld b, $2
call Func_7d8ac
ld a, $8
@@ -114847,9 +115461,9 @@
inc hl
ld a, $80
ld [hl], a
-.asm_7d612
+.quit
ret
-.asm_7d613
+.notRest
swap a
ld b, $0
ld hl, $c0d6
@@ -114865,8 +115479,8 @@
.asm_7d62c
push de
ld a, c
- cp $4
- jr nc, .asm_7d641
+ cp CH4
+ jr nc, .skip ; if sfx Channel
ld hl, $c02a
ld d, $0
ld e, a
@@ -114873,12 +115487,12 @@
add hl, de
ld a, [hl]
and a
- jr nz, .asm_7d63f
- jr .asm_7d641
-.asm_7d63f
+ jr nz, .done
+ jr .skip
+.done
pop de
ret
-.asm_7d641
+.skip
ld b, $0
ld hl, $c0de
add hl, bc
@@ -114904,42 +115518,40 @@
call Func_7d6bf
ret
-; known jump sources: 7d52b (1f:552b), 7d651 (1f:5651)
Func_7d66c: ; 7d66c (1f:566c)
ld b, $0
- ld hl, Unknown_7db9b ; $5b9b
+ ld hl, Unknown_7db9b
add hl, bc
ld a, [$FF00+$25]
or [hl]
ld d, a
ld a, c
- cp $7
- jr z, .asm_7d687
- cp $4
- jr nc, .asm_7d699
+ cp CH7
+ jr z, .sfxNoiseChannel
+ cp CH4
+ jr nc, .skip ; if sfx channel
ld hl, $c02a
add hl, bc
ld a, [hl]
and a
- jr nz, .asm_7d699
-.asm_7d687
+ jr nz, .skip
+.sfxNoiseChannel
ld a, [$c004]
- ld hl, Unknown_7db9b ; $5b9b
+ ld hl, Unknown_7db9b
add hl, bc
and [hl]
ld d, a
ld a, [$FF00+$25]
- ld hl, Unknown_7db93 ; $5b93
+ ld hl, Unknown_7db93
add hl, bc
and [hl]
or d
ld d, a
-.asm_7d699
+.skip
ld a, d
ld [$FF00+$25], a
ret
-; known jump sources: 7d528 (1f:5528), 7d64e (1f:564e)
Func_7d69d: ; 7d69d (1f:569d)
ld b, $0
ld hl, $c0b6
@@ -114946,10 +115558,10 @@
add hl, bc
ld d, [hl]
ld a, c
- cp $2
- jr z, .asm_7d6b8
- cp $6
- jr z, .asm_7d6b8
+ cp CH2
+ jr z, .channel3 ; if music channel 3
+ cp CH6
+ jr z, .channel3 ; if sfx channel 3
ld a, d
and $3f
ld d, a
@@ -114958,31 +115570,31 @@
ld a, [hl]
or d
ld d, a
-.asm_7d6b8
+.channel3
ld b, $1
call Func_7d8ac
ld [hl], d
ret
-; known jump sources: 7d52f (1f:552f), 7d668 (1f:5668)
Func_7d6bf: ; 7d6bf (1f:56bf)
ld a, c
- cp $2
- jr z, .asm_7d6c8
- cp $6
- jr nz, .asm_7d6f5
-.asm_7d6c8
+ cp CH2
+ jr z, .channel3
+ cp CH6
+ jr nz, .notSfxChannel3
+ ; fall through
+.channel3
push de
ld de, $c0e6
- cp $2
- jr z, .asm_7d6d3
+ cp CH2
+ jr z, .musicChannel3
ld de, $c0e7
-.asm_7d6d3
+.musicChannel3
ld a, [de]
add a
ld d, $0
ld e, a
- ld hl, Unknown_7c361 ; $4361
+ ld hl, Music1f_Channel3DutyPointers
add hl, de
ld e, [hl]
inc hl
@@ -114991,7 +115603,7 @@
ld b, $f
ld a, $0
ld [$FF00+$1a], a
-.asm_7d6e8
+.loop
ld a, [de]
inc de
ld [hli], a
@@ -114998,11 +115610,11 @@
ld a, b
dec b
and a
- jr nz, .asm_7d6e8
+ jr nz, .loop
ld a, $80
ld [$FF00+$1a], a
pop de
-.asm_7d6f5
+.notSfxChannel3
ld a, d
or $80
and $c7
@@ -115015,7 +115627,6 @@
call Func_7d729
ret
-; known jump sources: 7d5a7 (1f:55a7)
Func_7d707: ; 7d707 (1f:5707)
call Func_7d759
jr nc, .asm_7d71f
@@ -115037,7 +115648,6 @@
.asm_7d728
ret
-; known jump sources: 7d703 (1f:5703)
Func_7d729: ; 7d729 (1f:5729)
call Func_7d759
jr nc, .asm_7d73a
@@ -115054,7 +115664,6 @@
.asm_7d73a
ret
-; known jump sources: 7d2d5 (1f:52d5)
Func_7d73b: ; 7d73b (1f:573b)
call Func_7d759
jr nc, .asm_7d756
@@ -115078,7 +115687,6 @@
ccf
ret
-; known jump sources: 7d707 (1f:5707), 7d729 (1f:5729), 7d73b (1f:573b)
Func_7d759: ; 7d759 (1f:5759)
ld a, [$c02a]
cp $14
@@ -115096,12 +115704,11 @@
scf
ret
-; known jump sources: 7d1ed (1f:51ed)
-Func_7d76d: ; 7d76d (1f:576d)
+Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
ld hl, $c02e
add hl, bc
bit 5, [hl]
- jp nz, Func_7d7b4
+ jp nz, .asm_7d7b4
ld hl, $c09e
add hl, bc
ld e, [hl]
@@ -115134,17 +115741,15 @@
add hl, bc
ld a, [hl]
cp d
- jp c, Func_7d7fa
- jr nz, asm_7d7e7
+ jp c, .asm_7d7fa
+ jr nz, .asm_7d7e7
ld hl, $c0ae
add hl, bc
ld a, [hl]
cp e
- jp c, Func_7d7fa
- jr asm_7d7e7
-
-; known jump sources: 7d773 (1f:5773)
-Func_7d7b4: ; 7d7b4 (1f:57b4)
+ jp c, .asm_7d7fa
+ jr .asm_7d7e7
+.asm_7d7b4
ld hl, $c09e
add hl, bc
ld a, [hl]
@@ -115174,14 +115779,14 @@
add hl, bc
ld a, d
cp [hl]
- jr c, Func_7d7fa
- jr nz, asm_7d7e7
+ jr c, .asm_7d7fa
+ jr nz, .asm_7d7e7
ld hl, $c0ae
add hl, bc
ld a, e
cp [hl]
- jr c, Func_7d7fa
-asm_7d7e7: ; 7d7e7 (1f:57e7)
+ jr c, .asm_7d7fa
+.asm_7d7e7
ld hl, $c09e
add hl, bc
ld [hl], e
@@ -115194,9 +115799,7 @@
ld [hli], a
ld [hl], d
ret
-
-; known jump sources: 7d7a4 (1f:57a4), 7d7af (1f:57af), 7d7db (1f:57db), 7d7e5 (1f:57e5)
-Func_7d7fa: ; 7d7fa (1f:57fa)
+.asm_7d7fa
ld hl, $c02e
add hl, bc
res 4, [hl]
@@ -115203,7 +115806,6 @@
res 5, [hl]
ret
-; known jump sources: 7d629 (1f:5629)
Func_7d803: ; 7d803 (1f:5803)
ld hl, $c096
add hl, bc
@@ -115293,8 +115895,7 @@
ld [hl], a
ret
-; known jump sources: 7d1d0 (1f:51d0)
-Func_7d881: ; 7d881 (1f:5881)
+Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
ld b, $0
ld hl, $c046
add hl, bc
@@ -115312,8 +115913,7 @@
ld [hl], a
ret
-; known jump sources: 7d25a (1f:525a), 7d2ed (1f:52ed), 7d2f1 (1f:52f1), 7d322 (1f:5322), 7d336 (1f:5336), 7d339 (1f:5339), 7d341 (1f:5341), 7d345 (1f:5345), 7d36e (1f:536e), 7d3ad (1f:53ad), 7d3bc (1f:53bc), 7d3e5 (1f:53e5), 7d3ef (1f:53ef), 7d412 (1f:5412), 7d41d (1f:541d), 7d437 (1f:5437), 7d43d (1f:543d), 7d452 (1f:5452), 7d458 (1f:5458), 7d472 (1f:5472), 7d47f (1f:547f), 7d49e (1f:549e), 7d4bc (1f:54bc), 7d50c (1f:550c), 7d516 (1f:5516), 7d522 (1f:5522), 7d547 (1f:5547), 7d56e (1f:556e)
-Func_7d899: ; 7d899 (1f:5899)
+Music1f_GetNextMusicByte: ; 7d899 (1f:5899)
ld d, $0
ld a, c
add a
@@ -115324,21 +115924,20 @@
ld e, a
ld a, [hld]
ld d, a
- ld a, [de]
+ ld a, [de] ; get next music command
inc de
- ld [hl], e
+ ld [hl], e ; store address of next command
inc hl
ld [hl], d
ret
-; known jump sources: 7d23f (1f:523f), 7d508 (1f:5508), 7d512 (1f:5512), 7d608 (1f:5608), 7d64a (1f:564a), 7d6ba (1f:56ba), 7d6fd (1f:56fd), 7d7f3 (1f:57f3), 7d890 (1f:5890)
Func_7d8ac: ; 7d8ac (1f:58ac)
ld a, c
- ld hl, Unknown_7db8b ; $5b8b
+ ld hl, Unknown_7db8b
add l
- jr nc, .asm_7d8b4
+ jr nc, .noCarry
inc h
-.asm_7d8b4
+.noCarry
ld l, a
ld a, [hl]
add b
@@ -115346,23 +115945,21 @@
ld h, $ff
ret
-; known jump sources: 7d58d (1f:558d), 7d5ba (1f:55ba)
Func_7d8bb: ; 7d8bb (1f:58bb)
ld h, $0
-.asm_7d8bd
+.loop
srl a
- jr nc, .asm_7d8c2
+ jr nc, .noCarry
add hl, de
-.asm_7d8c2
+.noCarry
sla e
rl d
and a
- jr z, .asm_7d8cb
- jr .asm_7d8bd
-.asm_7d8cb
+ jr z, .done
+ jr .loop
+.done
ret
-; known jump sources: 7d3fb (1f:53fb), 7d61c (1f:561c)
Func_7d8cc: ; 7d8cc (1f:58cc)
ld h, $0
ld l, a
@@ -115369,26 +115966,25 @@
add hl, hl
ld d, h
ld e, l
- ld hl, Unknown_7dba3 ; $5ba3
+ ld hl, Unknown_7dba3
add hl, de
ld e, [hl]
inc hl
ld d, [hl]
ld a, b
-.asm_7d8da
+.loop
cp $7
- jr z, .asm_7d8e5
+ jr z, .done
sra d
rr e
inc a
- jr .asm_7d8da
-.asm_7d8e5
+ jr .loop
+.done
ld a, $8
add d
ld d, a
ret
-; known jump sources: 7d483 (1f:5483), 7d579 (1f:5579)
Func_7d8ea: ; 7d8ea (1f:58ea)
ld [$c001], a
cp $ff
@@ -115408,53 +116004,53 @@
ld [$c0e7], a
ld d, $8
ld hl, $c016
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c006
- call Func_7dafd
+ call FillMusicRAM1f
ld d, $4
ld hl, $c026
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c02e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c03e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c046
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c04e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c056
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c05e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c066
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c06e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c036
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c076
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c07e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c086
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c08e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c096
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c09e
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c0a6
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c0ae
- call Func_7dafd
+ call FillMusicRAM1f
ld a, $1
ld hl, $c0be
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c0b6
- call Func_7dafd
+ call FillMusicRAM1f
ld hl, $c0c6
- call Func_7dafd
+ call FillMusicRAM1f
ld [$c0e8], a
ld a, $ff
ld [$c004], a
@@ -115472,7 +116068,6 @@
ld [$FF00+$24], a
jp Func_7db03
-; known jump sources: 7d8f4 (1f:58f4), 7d8f7 (1f:58f7), 7d8fe (1f:58fe)
Func_7d9c2: ; 7d9c2 (1f:59c2)
ld l, a
ld e, a
@@ -115480,7 +116075,7 @@
ld d, h
add hl, hl
add hl, de
- ld de, SFX_Headers_1f ; $4000
+ ld de, SFX_Headers_1f
add hl, de
ld a, h
ld [$c0ec], a
@@ -115491,9 +116086,7 @@
rlca
rlca
ld c, a
-
-; known jump sources: 7daa5 (1f:5aa5)
-Func_7d9db: ; 7d9db (1f:59db)
+.asm_7d9db
ld d, c
ld a, c
add a
@@ -115624,9 +116217,8 @@
and a
jp z, Func_7db03
dec c
- jp Func_7d9db
+ jp .asm_7d9db
-; known jump sources: 7d8ef (1f:58ef)
Func_7daa8: ; 7daa8 (1f:5aa8)
ld a, $80
ld [$FF00+$26], a
@@ -115655,11 +116247,11 @@
ld [$c0e7], a
ld d, $a0
ld hl, $c006
- call Func_7dafd
+ call FillMusicRAM1f
ld a, $1
ld d, $18
ld hl, $c0b6
- call Func_7dafd
+ call FillMusicRAM1f
ld [$c0e8], a
ld [$c0ea], a
ld a, $ff
@@ -115666,16 +116258,15 @@
ld [$c004], a
ret
-; known jump sources: 7d916 (1f:5916), 7d91c (1f:591c), 7d924 (1f:5924), 7d92a (1f:592a), 7d930 (1f:5930), 7d936 (1f:5936), 7d93c (1f:593c), 7d942 (1f:5942), 7d948 (1f:5948), 7d94e (1f:594e), 7d954 (1f:5954), 7d95a (1f:595a), 7d960 (1f:5960), 7d966 (1f:5966), 7d96c (1f:596c), 7d972 (1f:5972), 7d978 (1f:5978), 7d97e (1f:597e), 7d984 (1f:5984), 7d98a (1f:598a), 7d992 (1f:5992), 7d998 (1f:5998), 7d99e (1f:599e), 7dae4 (1f:5ae4), 7daee (1f:5aee)
-Func_7dafd: ; 7dafd (1f:5afd)
+; fills d bytes at hl with a
+FillMusicRAM1f: ; 7dafd (1f:5afd)
ld b, d
-.asm_7dafe
+.loop
ld [hli], a
dec b
- jr nz, .asm_7dafe
+ jr nz, .loop
ret
-; known jump sources: 7d9bf (1f:59bf), 7daa1 (1f:5aa1)
Func_7db03: ; 7db03 (1f:5b03)
ld a, [$c001]
ld l, a
@@ -115684,12 +116275,12 @@
ld d, h
add hl, hl
add hl, de
- ld de, SFX_Headers_1f ; $4000
+ ld de, SFX_Headers_1f
add hl, de
ld e, l
ld d, h
ld hl, $c006
- ld a, [de]
+ ld a, [de] ; get channel number
ld b, a
rlca
rlca
@@ -115727,7 +116318,7 @@
.asm_7db46
pop bc
pop hl
- ld a, [de]
+ ld a, [de] ; get channel pointer
ld [hli], a
inc de
ld a, [de]
@@ -115756,11 +116347,11 @@
ld [hli], a
ld [hli], a
ld [hl], a
- ld hl, $c012
- ld de, Unknown_7db8a ; $5b8a
+ ld hl, $c012 ; sfx noise channel pointer
+ ld de, Noise1f_endchannel
ld [hl], e
inc hl
- ld [hl], d
+ ld [hl], d ; overwrite pointer to point to endchannel
ld a, [$c005]
and a
jr nz, .asm_7db89
@@ -115771,20 +116362,34 @@
.asm_7db89
ret
-Unknown_7db8a: ; 7db8a (1f:5b8a)
-INCBIN "baserom.gbc",$7db8a,$7db8b - $7db8a
+Noise1f_endchannel: ; 7db8a (1f:5b8a)
+ endchannel
Unknown_7db8b: ; 7db8b (1f:5b8b)
-INCBIN "baserom.gbc",$7db8b,$7db93 - $7db8b
+ db $10, $15, $1A, $1F ; channels 0-3
+ db $10, $15, $1A, $1F ; channels 4-7
Unknown_7db93: ; 7db93 (1f:5b93)
-INCBIN "baserom.gbc",$7db93,$7db9b - $7db93
+ db $EE, $DD, $BB, $77 ; channels 0-3
+ db $EE, $DD, $BB, $77 ; channels 4-7
Unknown_7db9b: ; 7db9b (1f:5b9b)
-INCBIN "baserom.gbc",$7db9b,$7dba3 - $7db9b
+ db $11, $22, $44, $88 ; channels 0-3
+ db $11, $22, $44, $88 ; channels 4-7
Unknown_7dba3: ; 7dba3 (1f:5ba3)
-INCBIN "baserom.gbc",$7dba3,$7dbbb - $7dba3
+ dw $F82C
+ dw $F89D
+ dw $F907
+ dw $F96B
+ dw $F9CA
+ dw $FA23
+ dw $FA77
+ dw $FAC7
+ dw $FB12
+ dw $FB58
+ dw $FB9B
+ dw $FBDA
INCLUDE "music/bikeriding.tx"
INCLUDE "music/dungeon1.tx"
--- a/music/bikeriding.asm
+++ b/music/bikeriding.asm
@@ -47,7 +47,7 @@
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 @@
note F_, 2
note E_, 1
note F_, 1
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 5
note G_, 6
note G_, 6
--- a/music/blue/sfx_1f_5d.asm
+++ b/music/blue/sfx_1f_5d.asm
@@ -1,52 +1,20 @@
SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
duty 2
- note D_, 4
- octave 4
- note C_, 1
- note C_, 7
- note D_, 4
- octave 4
- note G#, 1
- note C_, 7
- note D_, 4
- octave 4
- rest 1
- note C_, 7
- note D_, 4
- octave 4
- note C_, 1
- note C_, 8
- note D_, 16
- unknownmusic0xf2
- octave 8
- note C_, 8
+ unknownsfx0x20 3, 228, 0, 6
+ unknownsfx0x20 3, 228, 128, 6
+ unknownsfx0x20 3, 228, 192, 6
+ unknownsfx0x20 3, 228, 0, 7
+ unknownsfx0x20 15, 242, 224, 7
endchannel
SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
duty 2
- note D_, 4
- note C_, 9
- note C_, 1
- note C_, 1
- note D_, 4
- rest 5
- note C_, 2
- note C_, 7
- note D_, 4
- rest 5
- note G#, 2
- note C_, 7
- note D_, 4
- rest 5
- rest 2
- note C_, 7
- note D_, 4
- rest 5
- note C_, 2
- note C_, 8
- note D_, 16
- notetype 2, 14, 1
- note C_, 8
+ unknownsfx0x20 3, 8, 0, 0
+ unknownsfx0x20 3, 196, 1, 6
+ unknownsfx0x20 3, 196, 129, 6
+ unknownsfx0x20 3, 196, 193, 6
+ unknownsfx0x20 3, 196, 1, 7
+ unknownsfx0x20 15, 210, 225, 7
endchannel
; 0x7c490
\ No newline at end of file
--- a/music/celadon.asm
+++ b/music/celadon.asm
@@ -2,7 +2,7 @@
tempo 0, 144
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
notetype 12, 2, 15
rest 8
octave 3
--- a/music/cinnabar.asm
+++ b/music/cinnabar.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 12, 3, 4
- unknownmusic0xe8
+ togglecall
Music_Cinnabar_branch_b878:
notetype 12, 11, 5
--- a/music/cinnabarmansion.asm
+++ b/music/cinnabarmansion.asm
@@ -40,7 +40,7 @@
Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40)
duty 2
- unknownmusic0xe8
+ togglecall
vibrato 10, 2, 4
notetype 12, 12, 2
--- a/music/cities1.asm
+++ b/music/cities1.asm
@@ -403,7 +403,7 @@
Music_Cities1_Ch3: ; ac32 (2:6c32)
notetype 12, 1, 1
- unknownmusic0xe8
+ togglecall
Music_Cities1_branch_ac35:
vibrato 0, 0, 0
--- a/music/cities2.asm
+++ b/music/cities2.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 8, 3, 2
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 6
rest 8
octave 3
--- a/music/credits.asm
+++ b/music/credits.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 8, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 5
octave 4
note E_, 6
--- a/music/defeatedgymleader.asm
+++ b/music/defeatedgymleader.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 18, 3, 1
- unknownmusic0xe8
+ togglecall
tempo 0, 112
notetype 12, 10, 6
octave 4
--- a/music/defeatedtrainer.asm
+++ b/music/defeatedtrainer.asm
@@ -2,7 +2,7 @@
tempo 0, 224
stereopanning 119
duty 2
- unknownmusic0xe8
+ togglecall
tempo 0, 224
notetype 4, 10, 2
octave 4
--- 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_Ch2: ; 23bc1 (8:7bc1)
- unknownmusic0xf8
+ executemusic
duty 2
notetype 12, 12, 3
octave 4
@@ -143,7 +143,7 @@
Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e)
- unknownmusic0xf8
+ executemusic
notetype 12, 2, 0
octave 5
note E_, 1
--- a/music/dungeon1.asm
+++ b/music/dungeon1.asm
@@ -2,7 +2,7 @@
tempo 0, 144
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
vibrato 10, 1, 4
notetype 12, 4, 13
rest 8
--- a/music/dungeon2.asm
+++ b/music/dungeon2.asm
@@ -2,7 +2,7 @@
tempo 0, 144
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
vibrato 10, 1, 4
Music_Dungeon2_branch_7e892:
--- a/music/dungeon3.asm
+++ b/music/dungeon3.asm
@@ -2,7 +2,7 @@
tempo 0, 160
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
vibrato 8, 1, 4
Music_Dungeon3_branch_7e9fc:
--- a/music/finalbattle.asm
+++ b/music/finalbattle.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 2
octave 3
note F#, 1
--- a/music/gamecorner.asm
+++ b/music/gamecorner.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 12, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 5
octave 3
note A_, 6
--- a/music/gym.asm
+++ b/music/gym.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 8, 2, 2
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 5
octave 3
note G_, 6
--- a/music/gymleaderbattle.asm
+++ b/music/gymleaderbattle.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 8, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 3
rest 6
octave 3
--- a/music/halloffame.asm
+++ b/music/halloffame.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 12, 2, 2
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 3
rest 16
rest 16
--- a/music/headers/musicheaders02.asm
+++ b/music/headers/musicheaders02.asm
@@ -172,7 +172,7 @@
db CH3
dw Music_Routes4_Ch4
-; Route 3, Indigo Plateau
+; Route 23, Indigo Plateau
Music_IndigoPlateau: ; 82f1 (2:42f1)
db ( $C0 | CH0 )
dw Music_IndigoPlateau_Ch1
--- a/music/indigoplateau.asm
+++ b/music/indigoplateau.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 2
octave 2
note A_, 8
--- a/music/introbattle.asm
+++ b/music/introbattle.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 1
rest 8
octave 2
--- a/music/jigglypuffsong.asm
+++ b/music/jigglypuffsong.asm
@@ -4,7 +4,7 @@
vibrato 8, 2, 4
duty 2
dutycycle 165
- unknownmusic0xe8
+ togglecall
notetype 13, 6, 7
octave 4
note E_, 8
--- a/music/lavender.asm
+++ b/music/lavender.asm
@@ -2,7 +2,7 @@
tempo 0, 152
stereopanning 119
duty 1
- unknownmusic0xe8
+ togglecall
vibrato 0, 8, 8
notetype 12, 8, 7
rest 16
--- a/music/meeteviltrainer.asm
+++ b/music/meeteviltrainer.asm
@@ -2,7 +2,7 @@
tempo 0, 124
stereopanning 119
duty 2
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 1
rest 4
octave 3
--- a/music/meetfemaletrainer.asm
+++ b/music/meetfemaletrainer.asm
@@ -2,7 +2,7 @@
tempo 0, 124
stereopanning 119
duty 1
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 2
octave 3
note G#, 6
--- a/music/meetmaletrainer.asm
+++ b/music/meetmaletrainer.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 20, 3, 3
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 4
octave 3
note C#, 1
--- a/music/meetprofoak.asm
+++ b/music/meetprofoak.asm
@@ -2,7 +2,7 @@
tempo 0, 112
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 4
octave 3
note F#, 1
--- a/music/meetrival.asm
+++ b/music/meetrival.asm
@@ -9,7 +9,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 3
octave 4
note D_, 1
@@ -130,7 +130,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 3
octave 3
note D_, 1
--- a/music/museumguy.asm
+++ b/music/museumguy.asm
@@ -2,7 +2,7 @@
tempo 0, 128
stereopanning 119
duty 2
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 1
octave 3
note B_, 2
--- a/music/oakslab.asm
+++ b/music/oakslab.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 16, 1, 2
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 3
octave 2
note B_, 1
--- a/music/pkmnhealed.asm
+++ b/music/pkmnhealed.asm
@@ -2,7 +2,7 @@
tempo 0, 144
stereopanning 119
duty 2
- unknownmusic0xe8
+ togglecall
notetype 12, 8, 1
rest 2
pitchbend 0, 75
--- a/music/pokecenter.asm
+++ b/music/pokecenter.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 10, 2, 2
- unknownmusic0xe8
+ togglecall
Music_Pokecenter_branch_be61:
notetype 12, 10, 3
--- a/music/pokemontower.asm
+++ b/music/pokemontower.asm
@@ -2,7 +2,7 @@
tempo 0, 152
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
vibrato 12, 2, 3
notetype 12, 8, 0
rest 4
--- a/music/routes1.asm
+++ b/music/routes1.asm
@@ -3,7 +3,7 @@
stereopanning 119
vibrato 4, 2, 3
duty 2
- unknownmusic0xe8
+ togglecall
Music_Routes1_branch_9be9:
notetype 12, 10, 1
--- a/music/routes3.asm
+++ b/music/routes3.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 5
octave 3
note E_, 1
--- a/music/routes4.asm
+++ b/music/routes4.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 10, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 10, 2
octave 2
note G#, 4
--- a/music/safarizone.asm
+++ b/music/safarizone.asm
@@ -2,7 +2,7 @@
tempo 0, 132
stereopanning 119
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
duty 2
notetype 12, 9, 2
octave 3
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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_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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- a/music/sfx/sfx_02_21.asm
+++ b/music/sfx/sfx_02_21.asm
@@ -1,27 +1,11 @@
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
@@ -28,79 +12,30 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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_Ch2: ; ad8e (2:6d8e)
- unknownmusic0xf8
+ executemusic
vibrato 8, 2, 7
duty 2
notetype 4, 12, 1
@@ -31,7 +31,7 @@
SFX_02_3a_Ch3: ; ad9e (2:6d9e)
- unknownmusic0xf8
+ executemusic
notetype 4, 1, 0
octave 4
note B_, 1
--- 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_Ch2: ; b335 (2:7335)
- unknownmusic0xf8
+ executemusic
vibrato 8, 2, 7
duty 2
notetype 5, 12, 5
@@ -47,7 +47,7 @@
SFX_02_3b_Ch3: ; b34d (2:734d)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 5
note F_, 4
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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_Ch2: ; b2e1 (2:72e1)
- unknownmusic0xf8
+ executemusic
duty 2
notetype 5, 12, 2
octave 5
@@ -45,7 +45,7 @@
SFX_02_41_Ch3: ; b2f7 (2:72f7)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 5
note C_, 1
--- 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_Ch2: ; b381 (2:7381)
- unknownmusic0xf8
+ executemusic
vibrato 4, 2, 3
duty 2
notetype 5, 13, 1
@@ -48,7 +48,7 @@
SFX_02_42_Ch3: ; b39d (2:739d)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 4
note D#, 4
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- /dev/null
+++ b/music/sfx/sfx_02_unused.asm
@@ -1,0 +1,32 @@
+SFX_02_unused_Ch1: ; 86e3 (2:46e3)
+ dutycycle 240
+ unknownsfx0x20 15, 224, 128, 7
+ unknownsfx0x20 15, 240, 132, 7
+ unknownsfx0x20 15, 195, 224, 5
+ unknownsfx0x20 15, 196, 0, 6
+ unknownsfx0x20 10, 108, 128, 7
+ unknownsfx0x20 8, 113, 132, 7
+ endchannel
+
+
+SFX_02_unused_Ch2: ; 86fe (2:46fe)
+ dutycycle 5
+ unknownsfx0x20 15, 160, 65, 7
+ unknownsfx0x20 15, 176, 67, 7
+ unknownsfx0x20 15, 147, 177, 5
+ unknownsfx0x20 15, 148, 193, 5
+ unknownsfx0x20 10, 76, 65, 7
+ unknownsfx0x20 8, 49, 70, 7
+ endchannel
+
+
+SFX_02_unused_Ch3: ; 8719 (2:4719)
+ unknownnoise0x20 2, 242, 76
+ unknownnoise0x20 6, 224, 58
+ unknownnoise0x20 15, 208, 58
+ unknownnoise0x20 8, 208, 44
+ unknownnoise0x20 6, 230, 76
+ unknownnoise0x20 12, 125, 76
+ unknownnoise0x20 15, 211, 76
+ endchannel
+; 0x872f
\ No newline at end of file
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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_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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- a/music/sfx/sfx_08_21.asm
+++ b/music/sfx/sfx_08_21.asm
@@ -1,27 +1,11 @@
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
@@ -28,79 +12,30 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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_Ch2: ; 23998 (8:7998)
- unknownmusic0xf8
+ executemusic
vibrato 4, 2, 2
duty 2
notetype 6, 12, 4
@@ -41,7 +41,7 @@
SFX_08_3a_Ch3: ; 239b0 (8:79b0)
- unknownmusic0xf8
+ executemusic
notetype 6, 1, 0
octave 5
note A_, 4
--- 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_Ch2: ; 239e6 (8:79e6)
- unknownmusic0xf8
+ executemusic
vibrato 8, 2, 7
duty 2
notetype 5, 12, 5
@@ -47,7 +47,7 @@
SFX_08_3b_Ch3: ; 239fe (8:79fe)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 5
note F_, 4
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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_Ch2: ; 23a2e (8:7a2e)
- unknownmusic0xf8
+ executemusic
duty 2
notetype 6, 12, 2
octave 4
@@ -45,7 +45,7 @@
SFX_08_46_Ch3: ; 23a44 (8:7a44)
- unknownmusic0xf8
+ executemusic
notetype 6, 1, 0
octave 4
note B_, 2
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/music/sfx/sfx_08_68.asm
+++ b/music/sfx/sfx_08_68.asm
@@ -1,13 +1,7 @@
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
@@ -14,23 +8,15 @@
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
--- 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
--- 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
--- 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
--- a/music/sfx/sfx_08_6c.asm
+++ b/music/sfx/sfx_08_6c.asm
@@ -1,17 +1,8 @@
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
@@ -18,35 +9,18 @@
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
--- 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
--- a/music/sfx/sfx_08_6e.asm
+++ b/music/sfx/sfx_08_6e.asm
@@ -1,20 +1,9 @@
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
@@ -21,35 +10,19 @@
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
--- a/music/sfx/sfx_08_6f.asm
+++ b/music/sfx/sfx_08_6f.asm
@@ -1,12 +1,7 @@
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
@@ -13,19 +8,15 @@
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
--- 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
--- 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
+ 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
- octave 8
- note C_, 8
- note D_, 16
- endchannel
- octave 8
- note C_, 8
- note D_, 16
- endchannel
- octave 8
- note C_, 8
- note D_, 16
- endchannel
- octave 8
- note C_, 8
- note D_, 16
- unknownmusic0xf2
- octave 8
- note C_, 8
- endchannel
SFX_08_71_Ch2: ; 2085e (8:485e)
duty 3
- note D_, 16
+ 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
--- 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
--- 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
--- 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
+ unknownsfx0x20 8, 255, 248, 3
+ unknownsfx0x20 15, 255, 0, 4
+ unknownsfx0x20 15, 243, 0, 4
endchannel
- unknownmusic0xf8
- note C_, 4
- note D_, 16
- endchannel
- note C_, 1
- note C_, 5
- note D_, 16
- unknownmusic0xf3
- note C_, 1
- note C_, 5
- endchannel
SFX_08_74_Ch2: ; 208c4 (8:48c4)
dutycycle 180
- note D_, 9
- unknownmusic0xef
- rest 1
- note C_, 4
- note D_, 16
- unknownmusic0xef
- rest 1
- note C_, 4
- note D_, 16
- octave 5
- rest 1
- note C_, 4
+ 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
--- 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_Ch2: ; 208f0 (8:48f0)
- unknownmusic0xf8
+ executemusic
vibrato 10, 2, 3
duty 2
notetype 11, 6, 7
--- 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
--- 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
--- /dev/null
+++ b/music/sfx/sfx_08_pokeflute.asm
@@ -1,0 +1,15 @@
+SFX_08_PokeFlute_Ch1: ; 22322 (8:6322)
+ tempo 1, 0
+
+
+SFX_08_PokeFlute_Ch2: ; 22325 (8:6325)
+ executemusic
+ notetype 8, 0, 0
+ rest 5
+ rest 7
+ rest 5
+ rest 5
+ rest 5
+ rest 5
+ endchannel
+; 0x2232f
\ No newline at end of file
--- /dev/null
+++ b/music/sfx/sfx_08_pokeflute_ch3.asm
@@ -1,0 +1,14 @@
+SFX_08_PokeFlute_Ch3: ; 2049b (8:449b)
+ executemusic
+ vibrato 16, 1, 4
+ notetype 8, 1, 0
+ octave 5
+ note E_, 3
+ note F_, 3
+ note G_, 7
+ note A_, 3
+ note G_, 3
+ octave 6
+ note C_, 13
+ endchannel
+; 0x204aa
\ No newline at end of file
--- /dev/null
+++ b/music/sfx/sfx_08_unused.asm
@@ -1,0 +1,32 @@
+SFX_08_unused_Ch1: ; 2098b (8:498b)
+ dutycycle 240
+ unknownsfx0x20 15, 224, 128, 7
+ unknownsfx0x20 15, 240, 132, 7
+ unknownsfx0x20 15, 195, 224, 5
+ unknownsfx0x20 15, 196, 0, 6
+ unknownsfx0x20 10, 108, 128, 7
+ unknownsfx0x20 8, 113, 132, 7
+ endchannel
+
+
+SFX_08_unused_Ch2: ; 209a6 (8:49a6)
+ dutycycle 5
+ unknownsfx0x20 15, 160, 65, 7
+ unknownsfx0x20 15, 176, 67, 7
+ unknownsfx0x20 15, 147, 177, 5
+ unknownsfx0x20 15, 148, 193, 5
+ unknownsfx0x20 10, 76, 65, 7
+ unknownsfx0x20 8, 49, 70, 7
+ endchannel
+
+
+SFX_08_unused_Ch3: ; 209c1 (8:49c1)
+ unknownnoise0x20 2, 242, 76
+ unknownnoise0x20 6, 224, 58
+ unknownnoise0x20 15, 208, 58
+ unknownnoise0x20 8, 208, 44
+ unknownnoise0x20 6, 230, 76
+ unknownnoise0x20 12, 125, 76
+ unknownnoise0x20 15, 211, 76
+ endchannel
+; 0x209d7
\ No newline at end of file
--- /dev/null
+++ b/music/sfx/sfx_08_unused2.asm
@@ -1,0 +1,57 @@
+SFX_08_unused2_Ch1: ; 2232f (8:632f)
+ executemusic
+ tempo 1, 0
+ stereopanning 119
+ vibrato 6, 2, 6
+ duty 2
+ togglecall
+ notetype 6, 11, 1
+ octave 3
+ note G#, 2
+ note G#, 2
+ notetype 6, 11, 3
+ note G#, 2
+ note B_, 2
+ octave 4
+ note E_, 8
+ endchannel
+
+
+SFX_08_unused2_Ch2: ; 22347 (8:6347)
+ executemusic
+ vibrato 8, 2, 7
+ duty 2
+ notetype 6, 12, 1
+ octave 4
+ note E_, 2
+ note E_, 1
+ note E_, 1
+ notetype 6, 12, 3
+ note E_, 2
+ note G#, 2
+ note B_, 8
+ endchannel
+
+
+SFX_08_unused2_Ch3: ; 22359 (8:6359)
+ executemusic
+ notetype 6, 1, 0
+ octave 4
+ note B_, 1
+ rest 1
+ notetype 3, 1, 0
+ note B_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ notetype 6, 1, 0
+ note B_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note B_, 4
+ rest 4
+ endchannel
+; 0x22370
\ No newline at end of file
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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)
--- 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_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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- a/music/sfx/sfx_1f_21.asm
+++ b/music/sfx/sfx_1f_21.asm
@@ -1,27 +1,11 @@
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
@@ -28,79 +12,30 @@
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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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_Ch2: ; 7e867 (1f:6867)
- unknownmusic0xf8
+ executemusic
vibrato 8, 2, 7
duty 2
notetype 4, 12, 1
@@ -31,7 +31,7 @@
SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
- unknownmusic0xf8
+ executemusic
notetype 4, 1, 0
octave 4
note B_, 1
--- 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_Ch2: ; 7ee47 (1f:6e47)
- unknownmusic0xf8
+ executemusic
vibrato 8, 2, 7
duty 2
notetype 5, 12, 5
@@ -47,7 +47,7 @@
SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 5
note F_, 4
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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_Ch2: ; 7edf3 (1f:6df3)
- unknownmusic0xf8
+ executemusic
duty 2
notetype 5, 12, 2
octave 5
@@ -45,7 +45,7 @@
SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 5
note C_, 1
--- 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_Ch2: ; 7ee93 (1f:6e93)
- unknownmusic0xf8
+ executemusic
vibrato 4, 2, 3
duty 2
notetype 5, 13, 1
@@ -48,7 +48,7 @@
SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
- unknownmusic0xf8
+ executemusic
notetype 5, 1, 0
octave 4
note D#, 4
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- /dev/null
+++ b/music/sfx/sfx_1f_unused.asm
@@ -1,0 +1,32 @@
+SFX_1f_unused_Ch1: ; 7c758 (1f:4758)
+ dutycycle 240
+ unknownsfx0x20 15, 224, 128, 7
+ unknownsfx0x20 15, 240, 132, 7
+ unknownsfx0x20 15, 195, 224, 5
+ unknownsfx0x20 15, 196, 0, 6
+ unknownsfx0x20 10, 108, 128, 7
+ unknownsfx0x20 8, 113, 132, 7
+ endchannel
+
+
+SFX_1f_unused_Ch2: ; 7c773 (1f:4773)
+ dutycycle 5
+ unknownsfx0x20 15, 160, 65, 7
+ unknownsfx0x20 15, 176, 67, 7
+ unknownsfx0x20 15, 147, 177, 5
+ unknownsfx0x20 15, 148, 193, 5
+ unknownsfx0x20 10, 76, 65, 7
+ unknownsfx0x20 8, 49, 70, 7
+ endchannel
+
+
+SFX_1f_unused_Ch3: ; 7c78e (1f:478e)
+ unknownnoise0x20 2, 242, 76
+ unknownnoise0x20 6, 224, 58
+ unknownnoise0x20 15, 208, 58
+ unknownnoise0x20 8, 208, 44
+ unknownnoise0x20 6, 230, 76
+ unknownnoise0x20 12, 125, 76
+ unknownnoise0x20 15, 211, 76
+ endchannel
+; 0x7c7a4
\ No newline at end of file
--- a/music/silphco.asm
+++ b/music/silphco.asm
@@ -2,7 +2,7 @@
tempo 0, 160
stereopanning 119
duty 3
- unknownmusic0xe8
+ togglecall
vibrato 8, 2, 2
notetype 6, 11, 3
octave 2
--- a/music/ssanne.asm
+++ b/music/ssanne.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 1
vibrato 8, 3, 4
- unknownmusic0xe8
+ togglecall
Music_SSAnne_branch_b3b2:
notetype 12, 10, 4
--- a/music/surfing.asm
+++ b/music/surfing.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 12, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 5
rest 6
octave 2
--- a/music/trainerbattle.asm
+++ b/music/trainerbattle.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 2
rest 8
octave 3
--- a/music/unusedsong.asm
+++ b/music/unusedsong.asm
@@ -185,7 +185,7 @@
Music_UnusedSong_Ch2: ; a9cf (2:69cf)
tempo 0, 144
stereopanning 119
- unknownmusic0xe8
+ togglecall
vibrato 6, 1, 5
Music_UnusedSong_branch_a9d8:
--- a/music/vermilion.asm
+++ b/music/vermilion.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 12, 3, 4
- unknownmusic0xe8
+ togglecall
Music_Vermilion_branch_b9f6:
notetype 12, 11, 5
--- a/music/wildbattle.asm
+++ b/music/wildbattle.asm
@@ -3,7 +3,7 @@
stereopanning 119
duty 3
vibrato 6, 3, 4
- unknownmusic0xe8
+ togglecall
notetype 12, 11, 3
octave 4
note C_, 1
--- a/music/yellow/intro.asm
+++ /dev/null
@@ -1,485 +1,0 @@
-Music_IntroBattle_Ch1: ; 7f65c (1f:765c)
- tempo 0, 116
- stereopanning 119
- duty 3
- vibrato 8, 1, 4
- notetype 12, 11, 2
- octave 3
- note G#, 2
- note B_, 4
- note B_, 4
- note B_, 4
- note B_, 4
- note B_, 4
- note B_, 3
- note A#, 1
- note B_, 2
- note B_, 10
- notetype 12, 11, 6
- octave 4
- note C#, 1
- note C_, 1
- note C#, 10
- octave 3
- note G#, 1
- note G_, 1
- note G#, 4
- note B_, 4
- octave 4
- note E_, 4
- note F#, 8
- note E_, 8
- octave 3
- note A_, 4
- note B_, 4
- octave 4
- note C#, 4
- octave 3
- note B_, 4
- note G#, 6
- notetype 12, 11, 2
- note B_, 2
- notetype 12, 11, 6
- note G#, 6
- notetype 12, 11, 2
- note B_, 2
- notetype 12, 11, 6
- octave 4
- note E_, 6
- notetype 12, 11, 2
- note G#, 2
- notetype 12, 11, 6
- note E_, 6
- notetype 12, 11, 2
- note G#, 2
- notetype 12, 11, 6
- octave 3
- note A_, 4
- note F#, 4
- note A_, 4
- note B_, 4
- note F#, 4
- note G#, 4
- note A_, 2
- note G#, 2
- note F#, 2
- note D#, 2
- notetype 12, 11, 3
- note B_, 2
- octave 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 2
- note C#, 2
- note F#, 4
- note F#, 3
- note D#, 1
- note F#, 2
- note F#, 8
- notetype 12, 11, 6
- note F#, 1
- note F_, 1
- note F#, 8
- octave 3
- note B_, 1
- note A#, 1
- note B_, 8
- octave 4
- note F#, 1
- note F_, 1
- note F#, 2
- notetype 12, 11, 3
- note F#, 1
- note E_, 1
- note D#, 1
- note C#, 1
- notetype 12, 11, 2
- octave 3
- note B_, 16
- endchannel
-
-
-Music_IntroBattle_Ch2: ; 7f6d3 (1f:76d3)
- duty 2
- vibrato 6, 1, 5
- notetype 12, 12, 2
- octave 3
- note B_, 2
- octave 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 4
- note E_, 3
- note D#, 1
- note E_, 2
- note E_, 4
- notetype 12, 12, 5
- note G#, 1
- note G_, 1
- note G#, 10
- octave 3
- note B_, 1
- note A#, 1
- note B_, 6
- notetype 12, 12, 7
- octave 4
- note E_, 4
- note G#, 4
- note B_, 4
- octave 5
- note C#, 16
- octave 4
- note A_, 4
- note G#, 4
- note F#, 4
- note E_, 4
- octave 3
- note B_, 6
- notetype 12, 12, 2
- octave 4
- note E_, 2
- notetype 12, 12, 7
- octave 3
- note B_, 6
- notetype 12, 12, 2
- octave 4
- note E_, 2
- notetype 12, 12, 7
- note G#, 6
- notetype 12, 12, 2
- note B_, 2
- notetype 12, 12, 7
- note G#, 6
- notetype 12, 12, 2
- note B_, 2
- notetype 12, 12, 7
- note C#, 4
- octave 3
- note A_, 4
- octave 4
- note C#, 4
- note D#, 4
- note E_, 2
- note D#, 2
- note C#, 2
- note D#, 4
- note D#, 2
- note C#, 2
- octave 3
- note B_, 2
- notetype 12, 12, 3
- octave 4
- note E_, 2
- note G#, 4
- note G#, 4
- note G#, 4
- note G#, 2
- note F#, 2
- note A_, 4
- note A_, 3
- note F#, 1
- note A_, 2
- note A_, 4
- notetype 12, 12, 7
- note B_, 1
- note A#, 1
- note B_, 8
- note B_, 1
- note A#, 1
- note B_, 8
- note B_, 1
- note A#, 1
- note B_, 6
- notetype 12, 12, 3
- note B_, 1
- note A_, 1
- note G#, 1
- note F#, 1
- notetype 12, 12, 2
- note E_, 16
- endchannel
-
-
-Music_IntroBattle_Ch3: ; 7f749 (1f:7749)
- notetype 12, 1, 0
- octave 4
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- octave 3
- note B_, 1
- rest 1
- octave 4
- note C#, 1
- rest 1
- note D#, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note F#, 1
- rest 1
- note A_, 1
- rest 1
- note C#, 1
- rest 1
- note A_, 1
- rest 1
- note F#, 1
- rest 1
- note A_, 1
- rest 1
- note C#, 1
- rest 1
- note A_, 1
- rest 1
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note B_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note B_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note E_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note C#, 1
- rest 1
- octave 4
- note B_, 1
- rest 1
- note A_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note G#, 1
- rest 1
- note B_, 1
- rest 1
- note E_, 1
- rest 1
- note B_, 1
- rest 1
- note A_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note E_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note E_, 1
- rest 1
- octave 5
- note E_, 1
- rest 1
- octave 4
- note A_, 1
- rest 1
- octave 5
- note F#, 1
- rest 1
- octave 4
- note F#, 1
- rest 1
- octave 5
- note C#, 1
- rest 3
- note F#, 1
- rest 1
- octave 4
- note F#, 1
- note G#, 1
- note A_, 1
- octave 5
- note C#, 1
- note E_, 1
- rest 15
- endchannel
-; 0x7f860
\ No newline at end of file
--- /dev/null
+++ b/music/yellow/yellowintro.asm
@@ -1,0 +1,485 @@
+Music_YellowIntro_Ch1: ; 7f65c (1f:765c)
+ tempo 0, 116
+ stereopanning 119
+ duty 3
+ vibrato 8, 1, 4
+ notetype 12, 11, 2
+ octave 3
+ note G#, 2
+ note B_, 4
+ note B_, 4
+ note B_, 4
+ note B_, 4
+ note B_, 4
+ note B_, 3
+ note A#, 1
+ note B_, 2
+ note B_, 10
+ notetype 12, 11, 6
+ octave 4
+ note C#, 1
+ note C_, 1
+ note C#, 10
+ octave 3
+ note G#, 1
+ note G_, 1
+ note G#, 4
+ note B_, 4
+ octave 4
+ note E_, 4
+ note F#, 8
+ note E_, 8
+ octave 3
+ note A_, 4
+ note B_, 4
+ octave 4
+ note C#, 4
+ octave 3
+ note B_, 4
+ note G#, 6
+ notetype 12, 11, 2
+ note B_, 2
+ notetype 12, 11, 6
+ note G#, 6
+ notetype 12, 11, 2
+ note B_, 2
+ notetype 12, 11, 6
+ octave 4
+ note E_, 6
+ notetype 12, 11, 2
+ note G#, 2
+ notetype 12, 11, 6
+ note E_, 6
+ notetype 12, 11, 2
+ note G#, 2
+ notetype 12, 11, 6
+ octave 3
+ note A_, 4
+ note F#, 4
+ note A_, 4
+ note B_, 4
+ note F#, 4
+ note G#, 4
+ note A_, 2
+ note G#, 2
+ note F#, 2
+ note D#, 2
+ notetype 12, 11, 3
+ note B_, 2
+ octave 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 2
+ note C#, 2
+ note F#, 4
+ note F#, 3
+ note D#, 1
+ note F#, 2
+ note F#, 8
+ notetype 12, 11, 6
+ note F#, 1
+ note F_, 1
+ note F#, 8
+ octave 3
+ note B_, 1
+ note A#, 1
+ note B_, 8
+ octave 4
+ note F#, 1
+ note F_, 1
+ note F#, 2
+ notetype 12, 11, 3
+ note F#, 1
+ note E_, 1
+ note D#, 1
+ note C#, 1
+ notetype 12, 11, 2
+ octave 3
+ note B_, 16
+ endchannel
+
+
+Music_YellowIntro_Ch2: ; 7f6d3 (1f:76d3)
+ duty 2
+ vibrato 6, 1, 5
+ notetype 12, 12, 2
+ octave 3
+ note B_, 2
+ octave 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 4
+ note E_, 3
+ note D#, 1
+ note E_, 2
+ note E_, 4
+ notetype 12, 12, 5
+ note G#, 1
+ note G_, 1
+ note G#, 10
+ octave 3
+ note B_, 1
+ note A#, 1
+ note B_, 6
+ notetype 12, 12, 7
+ octave 4
+ note E_, 4
+ note G#, 4
+ note B_, 4
+ octave 5
+ note C#, 16
+ octave 4
+ note A_, 4
+ note G#, 4
+ note F#, 4
+ note E_, 4
+ octave 3
+ note B_, 6
+ notetype 12, 12, 2
+ octave 4
+ note E_, 2
+ notetype 12, 12, 7
+ octave 3
+ note B_, 6
+ notetype 12, 12, 2
+ octave 4
+ note E_, 2
+ notetype 12, 12, 7
+ note G#, 6
+ notetype 12, 12, 2
+ note B_, 2
+ notetype 12, 12, 7
+ note G#, 6
+ notetype 12, 12, 2
+ note B_, 2
+ notetype 12, 12, 7
+ note C#, 4
+ octave 3
+ note A_, 4
+ octave 4
+ note C#, 4
+ note D#, 4
+ note E_, 2
+ note D#, 2
+ note C#, 2
+ note D#, 4
+ note D#, 2
+ note C#, 2
+ octave 3
+ note B_, 2
+ notetype 12, 12, 3
+ octave 4
+ note E_, 2
+ note G#, 4
+ note G#, 4
+ note G#, 4
+ note G#, 2
+ note F#, 2
+ note A_, 4
+ note A_, 3
+ note F#, 1
+ note A_, 2
+ note A_, 4
+ notetype 12, 12, 7
+ note B_, 1
+ note A#, 1
+ note B_, 8
+ note B_, 1
+ note A#, 1
+ note B_, 8
+ note B_, 1
+ note A#, 1
+ note B_, 6
+ notetype 12, 12, 3
+ note B_, 1
+ note A_, 1
+ note G#, 1
+ note F#, 1
+ notetype 12, 12, 2
+ note E_, 16
+ endchannel
+
+
+Music_YellowIntro_Ch3: ; 7f749 (1f:7749)
+ notetype 12, 1, 0
+ octave 4
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ octave 3
+ note B_, 1
+ rest 1
+ octave 4
+ note C#, 1
+ rest 1
+ note D#, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note C#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note F#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note C#, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note B_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note B_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 1
+ octave 4
+ note B_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note G#, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note E_, 1
+ rest 1
+ note B_, 1
+ rest 1
+ note A_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note E_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note E_, 1
+ rest 1
+ octave 5
+ note E_, 1
+ rest 1
+ octave 4
+ note A_, 1
+ rest 1
+ octave 5
+ note F#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ rest 1
+ octave 5
+ note C#, 1
+ rest 3
+ note F#, 1
+ rest 1
+ octave 4
+ note F#, 1
+ note G#, 1
+ note A_, 1
+ octave 5
+ note C#, 1
+ note E_, 1
+ rest 15
+ endchannel
+; 0x7f860
\ No newline at end of file