ref: f22a89b46d43f65ace938e9e59c63cb213fc0a0d
parent: c62f47cc5ef837d92967dcab4716a8ebaa5916b6
parent: 74360178fb77e80991cfacbc57178df3c9c3ee9e
author: Bryan Bishop <kanzure@gmail.com>
date: Sat Jan 14 19:44:19 EST 2012
Merge. hg-commit-id: 59809815188e
--- a/common.asm
+++ b/common.asm
@@ -35784,10 +35784,18 @@
RGB 20,26,31
RGB 17,23,10
RGB 3,2,2
- RGB 31,29,31 ; PAL_LOGO1
- RGB 30,30,17
- RGB 17,23,10
- RGB 21,0,4
+ IF _RED
+ RGB 31,29,31 ; PAL_LOGO1
+ RGB 30,30,17
+ RGB 17,23,10
+ RGB 21,0,4
+ ENDC
+ IF _BLUE
+ RGB 31,29,31 ; PAL_LOGO1
+ RGB 30,30,17
+ RGB 21,0,4
+ RGB 14,19,29
+ ENDC
RGB 31,29,31 ; XXX
RGB 30,30,17
RGB 18,18,24
@@ -35842,15 +35850,31 @@
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS2
RGB 31,31,17
- RGB 25,17,21
+ IF _RED
+ RGB 25,17,21
+ ENDC
+ IF _BLUE
+ RGB 16,19,29
+ ENDC
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS3
RGB 22,31,16
- RGB 25,17,21
+ IF _RED
+ RGB 25,17,21
+ ENDC
+ IF _BLUE
+ RGB 16,19,29
+ ENDC
RGB 3,2,2
RGB 31,29,31 ; PAL_SLOTS4
- RGB 16,19,29
- RGB 25,17,21
+ IF _RED
+ RGB 16,19,29
+ RGB 25,17,21
+ ENDC
+ IF _BLUE
+ RGB 25,17,21
+ RGB 16,19,29
+ ENDC
RGB 3,2,2
RGB 31,29,31 ; PAL_BLACK
RGB 7,7,7
@@ -35889,7 +35913,51 @@
INCBIN "gfx/blue/sgbborder.map"
ENDC
-INCBIN "baserom.gbc",$72E88,$2FE8 - $2E88
+INCBIN "baserom.gbc",$72E88,$2F88 - $2E88 ; All $00s
+IF _RED
+ RGB 30,29,29 ; PAL_SGB1
+ RGB 25,22,25
+ RGB 25,17,21
+ RGB 24,14,12
+ENDC
+IF _BLUE
+ RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O)
+ RGB 10,17,26
+ RGB 5,9,20
+ RGB 16,20,27
+ENDC
+
+INCBIN "baserom.gbc",$72F90,$2FA8 - $2F90 ; All $00s
+
+IF _RED
+ RGB 30,29,29 ; PAL_SGB2
+ RGB 22,31,16
+ RGB 27,20,6
+ RGB 15,15,15
+ENDC
+IF _BLUE
+ RGB 30,29,29 ; PAL_SGB2
+ RGB 27,11,6
+ RGB 5,9,20
+ RGB 28,25,15
+ENDC
+
+INCBIN "baserom.gbc",$72FB0,$2FC8 - $2FB0 ; All $00s
+
+IF _RED
+ RGB 30,29,29 ; PAL_SGB3
+ RGB 31,31,17
+ RGB 18,21,29
+ RGB 15,15,15
+ENDC
+IF _BLUE
+ RGB 30,29,29 ; PAL_SGB3
+ RGB 12,15,11
+ RGB 5,9,20
+ RGB 14,22,17
+ENDC
+
+INCBIN "baserom.gbc",$72FD0,$2FE8 - $2FD0 ; All $00s
IF _RED
INCBIN "gfx/red/sgbborder.2bpp"
--- a/pokeblue.asm
+++ b/pokeblue.asm
@@ -1,3 +1,3 @@
-_RED EQU 0
-_BLUE EQU 1
+_RED EQU 0
+_BLUE EQU 1
INCLUDE "common.tx"
\ No newline at end of file
--- a/pokered.asm
+++ b/pokered.asm
@@ -1,3 +1,3 @@
-_RED EQU 1
-_BLUE EQU 0
+_RED EQU 1
+_BLUE EQU 0
INCLUDE "common.tx"
\ No newline at end of file