foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

consolidate red/blue diffs in sfx

Browse source
This commit is contained in:
yenatch 2014-01-09 14:17:58 -05:00
parent 10bb09c4e2
commit 4cdc06b2c3
3 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
audio.asm
View file

@ -623,12 +623,7 @@ INCLUDE "music/sfx/sfx_1f_5a.asm"
INCLUDE "music/sfx/sfx_1f_5b.asm"
INCLUDE "music/sfx/sfx_1f_5c.asm"
INCLUDE "music/sfx/sfx_1f_40.asm"
IF _RED
INCLUDE "music/sfx/sfx_1f_5d.asm"
ENDC
IF _BLUE
INCLUDE "music/blue/sfx_1f_5d.asm"
ENDC
INCLUDE "music/sfx/sfx_1f_5d.asm"
INCLUDE "music/sfx/sfx_1f_3d.asm"
INCLUDE "music/sfx/sfx_1f_43.asm"
INCLUDE "music/sfx/sfx_1f_3e.asm"

20
music/blue/sfx_1f_5d.asm
View file

@ -1,20 +0,0 @@
SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
duty 2
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
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

19
music/sfx/sfx_1f_5d.asm
View file

@ -1,20 +1,37 @@
SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
duty 2
IF _RED
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
ELSE
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
ENDC
endchannel
SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
duty 2
IF _RED
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
ELSE
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
ENDC
endchannel
; 0x7c490
; 0x7c490