pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

No more unknownmusic

Browse Source
This commit is contained in:
pikalaxalt
2016-05-10 16:38:40 -04:00
parent f8c14d97e5
commit ebf6ed8a14
5 changed files with 148 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
audio/cries.asm
View File

File diff suppressed because it is too large Load Diff

23
audio/engine.asm
View File

@@ -142,7 +142,7 @@ _UpdateSound:: ; e805c
ld [wCurTrackFrequency], a ld [wCurTrackFrequency], a
ld a, [hl] ld a, [hl]
ld [wCurTrackFrequency + 1], a ld [wCurTrackFrequency + 1], a
; ; vibrato, noise
call HandleTrackVibrato ; handle vibrato and other things call HandleTrackVibrato ; handle vibrato and other things
call HandleNoise call HandleNoise
; turn off music when playing sfx? ; turn off music when playing sfx?
@@ -840,13 +840,12 @@ LoadNote: ; e83d1
; e8466 ; e8466
HandleTrackVibrato: ; e8466 HandleTrackVibrato: ; e8466
; handle vibrato and other things ; handle duty, cry pitch, and vibrato
; unknowns: wCurTrackDuty, wCurTrackFrequency
ld hl, Channel1Flags2 - Channel1 ld hl, Channel1Flags2 - Channel1
add hl, bc add hl, bc
bit SOUND_DUTY, [hl] ; duty bit SOUND_DUTY, [hl] ; duty
jr z, .next jr z, .next
ld hl, Channel1Field0x1c - Channel1 ld hl, Channel1SFXDutyLoop - Channel1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
rlca rlca
@@ -1416,9 +1415,9 @@ MusicCommands: ; e8720
dw Music_DutyCycle ; duty cycle dw Music_DutyCycle ; duty cycle
dw Music_Intensity ; intensity dw Music_Intensity ; intensity
dw Music_SoundStatus ; update sound status dw Music_SoundStatus ; update sound status
dw MusicDE ; ???? + duty cycle dw Music_SoundDuty ; sfx duty
dw Music_ToggleSFX ; dw Music_ToggleSFX ; sound on/off
dw Music_SlidePitchTo ; dw Music_SlidePitchTo ; pitch wheel
dw Music_Vibrato ; vibrato dw Music_Vibrato ; vibrato
dw MusicE2 ; unused dw MusicE2 ; unused
dw Music_ToggleNoise ; music noise sampling dw Music_ToggleNoise ; music noise sampling
@@ -1444,8 +1443,8 @@ MusicCommands: ; e8720
dw MusicF7 ; nothing dw MusicF7 ; nothing
dw MusicF8 ; nothing dw MusicF8 ; nothing
dw MusicF9 ; unused dw MusicF9 ; unused
dw Music_SetCondition ; dw Music_SetCondition ; setcondition
dw Music_JumpIf ; dw Music_JumpIf ; jumpif
dw Music_JumpChannel ; jump dw Music_JumpChannel ; jump
dw Music_LoopChannel ; loop dw Music_LoopChannel ; loop
dw Music_CallChannel ; call dw Music_CallChannel ; call
@@ -1859,18 +1858,18 @@ MusicE7: ; e88f7
; e8906 ; e8906
MusicDE: ; e8906 Music_SoundDuty: ; e8906
; ???? + duty cycle ; ???? + duty cycle
; params: 1 ; params: 1
; ;
ld hl, Channel1Flags2 - Channel1 ld hl, Channel1Flags2 - Channel1
add hl, bc add hl, bc
set SOUND_DUTY, [hl] ; duty cycle set SOUND_DUTY, [hl] ; duty cycle
; ; sound duty sequence
call GetMusicByte call GetMusicByte
rrca rrca
rrca rrca
ld hl, Channel1Field0x1c - Channel1 ld hl, Channel1SFXDutyLoop - Channel1
add hl, bc add hl, bc
ld [hl], a ld [hl], a
; update duty cycle ; update duty cycle

34
audio/sfx.asm
View File

@@ -2322,7 +2322,7 @@ Sfx_Aeroblast: ; f1334
; f133a ; f133a
Sfx_Aeroblast_Ch5: ; f133a Sfx_Aeroblast_Ch5: ; f133a
unknownmusic0xde $f2 sound_duty $f2 ; SFXDutyLoop = $bc, DutyCycle = $80
soundinput $f5 soundinput $f5
sound C_, 13, $f8, $0580 sound C_, 13, $f8, $0580
soundinput $8 soundinput $8
@@ -4762,7 +4762,7 @@ Sfx_Supersonic_branch_f21ef: ; f21ef
; f21fc ; f21fc
Sfx_Supersonic_Ch6: ; f21fc Sfx_Supersonic_Ch6: ; f21fc
unknownmusic0xde $b3 sound_duty $b3 ; SFXDutyLoop = $ec, DutyCycle = $c0
sound __, 16, $2f, $07c8 sound __, 16, $2f, $07c8
Sfx_Supersonic_branch_f2202: ; f2202 Sfx_Supersonic_branch_f2202: ; f2202
sound __, 16, $cf, $07c7 sound __, 16, $cf, $07c7
@@ -4790,7 +4790,7 @@ Sfx_Leer_branch_f221a: ; f221a
Sfx_Leer_Ch6: ; f2229 Sfx_Leer_Ch6: ; f2229
Sfx_Leer_branch_f2229: ; f2229 Sfx_Leer_branch_f2229: ; f2229
unknownmusic0xde $b3 sound_duty $b3 ; SFXDutyLoop = $ec, DutyCycle = $c0
sound __, 1, $e1, $07c1 sound __, 1, $e1, $07c1
sound __, 1, $e1, $0701 sound __, 1, $e1, $0701
loopchannel 12, Sfx_Leer_branch_f2229 loopchannel 12, Sfx_Leer_branch_f2229
@@ -4807,7 +4807,7 @@ Sfx_Leer_branch_f2238: ; f2238
Sfx_Ember_Ch5: ; f2243 Sfx_Ember_Ch5: ; f2243
Sfx_Ember_branch_f2243: ; f2243 Sfx_Ember_branch_f2243: ; f2243
unknownmusic0xde $c9 sound_duty $c9 ; SFXDutyLoop = $72, DutyCycle = $40
sound __, 12, $f3, $0120 sound __, 12, $f3, $0120
sound __, 10, $d3, $0150 sound __, 10, $d3, $0150
loopchannel 5, Sfx_Ember_branch_f2243 loopchannel 5, Sfx_Ember_branch_f2243
@@ -4829,7 +4829,7 @@ Sfx_Ember_branch_f225a: ; f225a
Sfx_Bubblebeam_Ch5: ; f226e Sfx_Bubblebeam_Ch5: ; f226e
Sfx_Bubblebeam_branch_f226e: ; f226e Sfx_Bubblebeam_branch_f226e: ; f226e
unknownmusic0xde $39 sound_duty $39 ; SFXDutyLoop = $4e, DutyCycle = $40
sound __, 5, $f4, $0600 sound __, 5, $f4, $0600
sound __, 4, $c4, $0500 sound __, 4, $c4, $0500
sound __, 6, $b5, $0600 sound __, 6, $b5, $0600
@@ -4841,7 +4841,7 @@ Sfx_Bubblebeam_branch_f226e: ; f226e
Sfx_Bubblebeam_Ch6: ; f2289 Sfx_Bubblebeam_Ch6: ; f2289
Sfx_Bubblebeam_branch_f2289: ; f2289 Sfx_Bubblebeam_branch_f2289: ; f2289
unknownmusic0xde $8d sound_duty $8d ; SFXDutyLoop = $63, DutyCycle = $40
sound __, 6, $e4, $05e0 sound __, 6, $e4, $05e0
sound __, 5, $b4, $04e0 sound __, 5, $b4, $04e0
sound __, 7, $a5, $05e8 sound __, 7, $a5, $05e8
@@ -4862,7 +4862,7 @@ Sfx_Bubblebeam_branch_f22a0: ; f22a0
Sfx_HydroPump_Ch5: ; f22b1 Sfx_HydroPump_Ch5: ; f22b1
Sfx_HydroPump_branch_f22b1: ; f22b1 Sfx_HydroPump_branch_f22b1: ; f22b1
unknownmusic0xde $d2 sound_duty $d2 ; SFXDutyLoop = $b4, DutyCycle = $80
sound __, 4, $81, $0300 sound __, 4, $81, $0300
sound __, 4, $c1, $0400 sound __, 4, $c1, $0400
sound __, 4, $f1, $0500 sound __, 4, $f1, $0500
@@ -4887,7 +4887,7 @@ Sfx_HydroPump_branch_f22d0: ; f22d0
Sfx_Surf_Ch5: ; f22e7 Sfx_Surf_Ch5: ; f22e7
Sfx_Surf_branch_f22e7: ; f22e7 Sfx_Surf_branch_f22e7: ; f22e7
unknownmusic0xde $39 sound_duty $39 ; SFXDutyLoop = $4e, DutyCycle = $40
sound __, 16, $f4, $0500 sound __, 16, $f4, $0500
sound __, 16, $c4, $0400 sound __, 16, $c4, $0400
sound __, 16, $e2, $05c0 sound __, 16, $e2, $05c0
@@ -4897,7 +4897,7 @@ Sfx_Surf_branch_f22e7: ; f22e7
Sfx_Surf_Ch6: ; f22fa Sfx_Surf_Ch6: ; f22fa
Sfx_Surf_branch_f22fa: ; f22fa Sfx_Surf_branch_f22fa: ; f22fa
unknownmusic0xde $8d sound_duty $8d ; SFXDutyLoop = $63, DutyCycle = $40
sound __, 8, $e4, $0430 sound __, 8, $e4, $0430
sound __, 16, $b4, $0330 sound __, 16, $b4, $0330
sound __, 16, $a2, $0438 sound __, 16, $a2, $0438
@@ -4917,7 +4917,7 @@ Sfx_Surf_branch_f230d: ; f230d
Sfx_Psybeam_Ch5: ; f231e Sfx_Psybeam_Ch5: ; f231e
Sfx_Psybeam_branch_f231e: ; f231e Sfx_Psybeam_branch_f231e: ; f231e
unknownmusic0xde $a1 sound_duty $a1 ; SFXDutyLoop = $68, DutyCycle = $40
sound __, 11, $f1, $0640 sound __, 11, $f1, $0640
sound __, 11, $f3, $0680 sound __, 11, $f3, $0680
sound __, 11, $f2, $0620 sound __, 11, $f2, $0620
@@ -4928,7 +4928,7 @@ Sfx_Psybeam_branch_f231e: ; f231e
Sfx_Psybeam_Ch6: ; f2335 Sfx_Psybeam_Ch6: ; f2335
Sfx_Psybeam_branch_f2335: ; f2335 Sfx_Psybeam_branch_f2335: ; f2335
unknownmusic0xde $b3 sound_duty $b3 ; SFXDutyLoop = $ec, DutyCycle = $c0
sound __, 11, $f3, $0571 sound __, 11, $f3, $0571
sound __, 8, $e3, $0531 sound __, 8, $e3, $0531
sound __, 11, $f1, $0551 sound __, 11, $f1, $0551
@@ -4958,7 +4958,7 @@ Sfx_Charge_branch_f2357: ; f2357
Sfx_Charge_Ch6: ; f236e Sfx_Charge_Ch6: ; f236e
Sfx_Charge_branch_f236e: ; f236e Sfx_Charge_branch_f236e: ; f236e
unknownmusic0xde $b3 sound_duty $b3 ; SFXDutyLoop = $ec, DutyCycle = $c0
sound __, 3, $e1, $0302 sound __, 3, $e1, $0302
sound __, 4, $e1, $07f2 sound __, 4, $e1, $07f2
sound __, 5, $e1, $0602 sound __, 5, $e1, $0602
@@ -4979,7 +4979,7 @@ Sfx_Charge_branch_f2385: ; f2385
Sfx_Thundershock_Ch5: ; f2396 Sfx_Thundershock_Ch5: ; f2396
Sfx_Thundershock_branch_f2396: ; f2396 Sfx_Thundershock_branch_f2396: ; f2396
unknownmusic0xde $2b sound_duty $2b ; SFXDutyLoop = $ca, DutyCycle = $c0
sound __, 4, $f1, $07f0 sound __, 4, $f1, $07f0
sound __, 5, $f2, $0200 sound __, 5, $f2, $0200
loopchannel 8, Sfx_Thundershock_branch_f2396 loopchannel 8, Sfx_Thundershock_branch_f2396
@@ -4988,7 +4988,7 @@ Sfx_Thundershock_branch_f2396: ; f2396
Sfx_Thundershock_Ch6: ; f23a5 Sfx_Thundershock_Ch6: ; f23a5
Sfx_Thundershock_branch_f23a5: ; f23a5 Sfx_Thundershock_branch_f23a5: ; f23a5
unknownmusic0xde $b3 sound_duty $b3 ; SFXDutyLoop = $ec, DutyCycle = $c0
sound __, 5, $e2, $0202 sound __, 5, $e2, $0202
sound __, 5, $e1, $07e2 sound __, 5, $e1, $07e2
loopchannel 9, Sfx_Thundershock_branch_f23a5 loopchannel 9, Sfx_Thundershock_branch_f23a5
@@ -5092,7 +5092,7 @@ Sfx_Sharpen_Ch6: ; f2463
; f247a ; f247a
Sfx_EggBomb_Ch5: ; f247a Sfx_EggBomb_Ch5: ; f247a
unknownmusic0xde $ed sound_duty $ed ; SFXDutyLoop = $7b, DutyCycle = $40
sound __, 9, $ff, $03f8 sound __, 9, $ff, $03f8
sound __, 16, $ff, $0400 sound __, 16, $ff, $0400
sound __, 16, $f3, $0400 sound __, 16, $f3, $0400
@@ -5100,7 +5100,7 @@ Sfx_EggBomb_Ch5: ; f247a
; f2489 ; f2489
Sfx_EggBomb_Ch6: ; f2489 Sfx_EggBomb_Ch6: ; f2489
unknownmusic0xde $b4 sound_duty $b4 ; SFXDutyLoop = $2d, DutyCycle = $00
sound __, 9, $ef, $03c0 sound __, 9, $ef, $03c0
sound __, 16, $ef, $03c0 sound __, 16, $ef, $03c0
sound __, 16, $e3, $03c0 sound __, 16, $e3, $03c0
@@ -5168,7 +5168,7 @@ Sfx_HyperBeam_branch_f24f8: ; f24f8
; f2509 ; f2509
Sfx_HyperBeam_Ch6: ; f2509 Sfx_HyperBeam_Ch6: ; f2509
unknownmusic0xde $b3 sound_duty $b3 ; SFXDutyLoop = $ec, DutyCycle = $c0
sound __, 3, $f1, $0781 sound __, 3, $f1, $0781
sound __, 3, $f1, $0701 sound __, 3, $f1, $0701
sound __, 3, $f1, $0791 sound __, 3, $f1, $0791

6
macros/sound.asm
View File

@@ -67,9 +67,9 @@ soundinput: macro
db \1 ; input db \1 ; input
endm endm
enum unknownmusic0xde_cmd enum sound_duty_cmd
unknownmusic0xde: macro sound_duty: macro
db unknownmusic0xde_cmd db sound_duty_cmd
db \1 ; unknown db \1 ; unknown
endm endm

2
macros/wram.asm
View File

@@ -141,7 +141,7 @@ channel_struct: MACRO
\1LoopCount:: db \1LoopCount:: db
\1Tempo:: dw \1Tempo:: dw
\1Tracks:: db ; hi:left lo:right \1Tracks:: db ; hi:left lo:right
\1Field0x1c:: ds 1 ; c11d \1SFXDutyLoop:: ds 1 ; c11d
\1VibratoDelayCount:: db ; initialized by \1VibratoDelay \1VibratoDelayCount:: db ; initialized by \1VibratoDelay
\1VibratoDelay:: db ; number of frames a note plays until vibrato starts \1VibratoDelay:: db ; number of frames a note plays until vibrato starts
\1VibratoExtent:: db \1VibratoExtent:: db