shithub: pokered

Download patch

ref: 4cdc06b2c34d9699bb64de40dcd27062d66dbf99
parent: 10bb09c4e210ab8d922081a221ce4833b5d50def
author: yenatch <yenatch@gmail.com>
date: Thu Jan 9 09:17:58 EST 2014 

consolidate red/blue diffs in sfx

diff: cannot open a/music/blue//null: file does not exist: 'a/music/blue//null' 
--- a/audio.asm
+++ b/audio.asm
@@ -623,12 +623,7 @@
 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"
--- a/music/blue/sfx_1f_5d.asm
+++ /dev/null
@@ -1,20 +1,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
\ No newline at end of file
--- a/music/sfx/sfx_1f_5d.asm
+++ b/music/sfx/sfx_1f_5d.asm
@@ -1,15 +1,24 @@
 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
@@ -16,5 +25,13 @@
 	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
\ No newline at end of file
+; 0x7c490