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

Merge branch 'master' into audio-macros

Browse Source
This commit is contained in:
dannye
2020-01-06 22:07:33 -06:00
parent 99d16d616d 94ebdab6d3
commit e7be25948d
451 changed files with 10496 additions and 10448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
audio/engine.asm
View File

@@ -6,7 +6,7 @@
; FadeMusic
; PlayStereoSFX
_MapSetup_Sound_Off::
_InitSound::
; restart sound operation
; clear all relevant hardware registers & wram
push hl
@@ -62,7 +62,7 @@ MusicFadeRestart:
push af
ld a, [wMusicFadeID]
push af
call _MapSetup_Sound_Off
call _InitSound
pop af
ld [wMusicFadeID], a
pop af
@@ -1364,7 +1364,7 @@ ParseMusicCommand:
jp hl
MusicCommands:
; entries correspond to macros/sound.asm enumeration
; entries correspond to macros/scripts/audio.asm enumeration
dw Music_Octave8 ; octave 8
dw Music_Octave7 ; octave 7
dw Music_Octave6 ; octave 6
@@ -2798,7 +2798,7 @@ ChannelPointers:
ClearChannels::
; runs ClearChannel for all 4 channels
; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off
; doesn't seem to be used, but functionally identical to InitSound
ld hl, rNR50
xor a
ld [hli], a

23
audio/sfx.asm
View File

@@ -1174,16 +1174,14 @@ Sfx_3rdPlace_Ch7:
toggle_sfx
Sfx_GetEggFromDayCareMan:
Sfx_GetEggFromDayCareLady:
Sfx_GetEgg:
channel_count 4
channel 5, Sfx_GetEggFromDayCareLady_Ch5
channel 6, Sfx_GetEggFromDayCareLady_Ch6
channel 7, Sfx_GetEggFromDayCareLady_Ch7
channel 8, Sfx_GetEggFromDayCareLady_Ch8
channel 5, Sfx_GetEgg_Ch5
channel 6, Sfx_GetEgg_Ch6
channel 7, Sfx_GetEgg_Ch7
channel 8, Sfx_GetEgg_Ch8
Sfx_GetEggFromDayCareMan_Ch5:
Sfx_GetEggFromDayCareLady_Ch5:
Sfx_GetEgg_Ch5:
toggle_sfx
tempo 120
volume 7, 7
@@ -1215,8 +1213,7 @@ Sfx_GetEggFromDayCareLady_Ch5:
toggle_sfx
Sfx_GetEggFromDayCareMan_Ch6:
Sfx_GetEggFromDayCareLady_Ch6:
Sfx_GetEgg_Ch6:
toggle_sfx
vibrato 18, 3, 4
duty_cycle 3
@@ -1245,8 +1242,7 @@ Sfx_GetEggFromDayCareLady_Ch6:
toggle_sfx
Sfx_GetEggFromDayCareMan_Ch7:
Sfx_GetEggFromDayCareLady_Ch7:
Sfx_GetEgg_Ch7:
toggle_sfx
note_type 8, 2, 5
rest 2
@@ -1265,8 +1261,7 @@ Sfx_GetEggFromDayCareLady_Ch7:
toggle_sfx
Sfx_GetEggFromDayCareMan_Ch8:
Sfx_GetEggFromDayCareLady_Ch8:
Sfx_GetEgg_Ch8:
toggle_sfx
sfx_toggle_noise 4
drum_speed 8

4
audio/sfx_pointers.asm
View File

@@ -149,8 +149,8 @@ SFX:
dba Sfx_Fanfare2
dba Sfx_RegisterPhoneNumber
dba Sfx_3rdPlace
dba Sfx_GetEggFromDayCareMan
dba Sfx_GetEggFromDayCareLady
dba Sfx_GetEgg
dba Sfx_GetEgg
dba Sfx_MoveDeleted
dba Sfx_2ndPlace
dba Sfx_1stPlace