summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
authorstag019 <stag019@gmail.com>2012-01-15 01:15:58 -0500
committerstag019 <stag019@gmail.com>2012-01-15 01:15:58 -0500
commit74360178fb77e80991cfacbc57178df3c9c3ee9e (patch)
treebf4e879db83221f7f767516bf3f6efe4d6863f8b /common.asm
parente2e478c199f78cebcb9b160b536bf7f5d043978c (diff)
Palette differences between Red and Blue version.
hg-commit-id: 3bebb464b5f7
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm86
1 files changed, 77 insertions, 9 deletions
diff --git a/common.asm b/common.asm
index dee02ea1..3928c6f7 100644
--- a/common.asm
+++ b/common.asm
@@ -35777,10 +35777,18 @@ SuperPalettes: ; 6660
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
@@ -35835,15 +35843,31 @@ SuperPalettes: ; 6660
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
@@ -35882,7 +35906,51 @@ IF _BLUE
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"