From 56554e2558f3448161b02e9a24048edfd108dd7c Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Wed, 24 Jul 2024 23:35:23 -0400
Subject: [PATCH] Spaceworld SGB palettes for Nihon!

---
 constants/scgb_constants.asm                |   2 ++
 data/tilesets/nihon_whitecity_metatiles.bin | Bin 1792 -> 1792 bytes
 engine/gfx/sgb_layouts.asm                  |  22 ++++++++++++++++++++
 gfx/sgb/predef.pal                          |  10 +++++----
 maps/WhiteCity.ablk                         |   6 +++---
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm
index 6ffdad3..28fc4f3 100644
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -137,6 +137,8 @@ DEF SCGB_DEFAULT EQU $ff
 	const PREDEFPAL_UNOWN_PUZZLE
 	const PREDEFPAL_GAMEFREAK_LOGO_OB
 	const PREDEFPAL_GAMEFREAK_LOGO_BG
+	const PREDEFPAL_ROUTES_NIHON
+	const PREDEFPAL_GATES_NIHON
 DEF NUM_PREDEF_PALS EQU const_value
 
 ; SGB system command codes
diff --git a/data/tilesets/nihon_whitecity_metatiles.bin b/data/tilesets/nihon_whitecity_metatiles.bin
index ab222f8b78484179dbc6a5fb7d3a42e61f992c4c..af00589b7b4f14b5f94988a4f8aa0dbf70bde559 100644
GIT binary patch
delta 26
ecmZqRYv9{(nVDC>&6bZBjNQ4pHa}oiU<LqOf(BOr

delta 26
ecmZqRYv9{(nVDC}&6bZJjNQ3;Ha}oiU<LqO;s##;

diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 4855c27..5a39216 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -548,7 +548,18 @@ endr
 	ret
 
 .route
+	ld a, [wMapGroup]
+	ld b, a
+	ld a, [wMapNumber]
+	ld c, a
+	call GetWorldMapLocation
+	cp NIHON_LANDMARK
 	ld a, PREDEFPAL_ROUTES
+    jr nc, .routenihon
+	ret
+	
+.routenihon 
+	ld a, PREDEFPAL_ROUTES_NIHON
 	ret
 
 .cave
@@ -560,7 +571,18 @@ endr
 	ret
 
 .gate
+	ld a, [wMapGroup]
+	ld b, a
+	ld a, [wMapNumber]
+	ld c, a
+	call GetWorldMapLocation
+	cp NIHON_LANDMARK
 	ld a, PREDEFPAL_PEWTER
+    jr nc, .gatenihon
+	ret
+	
+.gatenihon 
+	ld a, PREDEFPAL_GATES_NIHON
 	ret
 
 INCLUDE "data/maps/sgb_roof_pal_inds.asm"
diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
index 47d028c..921cdc0 100644
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -31,10 +31,10 @@
 	RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp)
 	RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp)
 	RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp)
-	RGB 31,31,31, 12,28,22, 15,20,31, 00,00,00 ; PREDEFPAL_SILENT_HILLS
-	RGB 31,31,31, 25,20,16, 15,20,31, 00,00,00 ; PREDEFPAL_OLD_CITY (31,31,31, 21,14,09, 15,20,20, 00,00,00 for SW colors)
-	RGB 31,31,31, 22,19,31, 15,20,31, 00,00,00 ; PREDEFPAL_BLUE_FOREST (31,31,31, 18,14,31, 15,20,20, 00,00,00 for SW colors)
-	RGB 31,31,31, 27,28,31, 17,20,31, 00,00,00 ; PREDEFPAL_WHITE_CITY
+	RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS
+	RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_OLD_CITY (31,31,31, 25,20,16, 15,20,31, 00,00,00 for Final-style colors)
+	RGB 31,31,31, 18,14,31, 15,20,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST (31,31,31, 22,19,31, 15,20,31, 00,00,00 for Final-style colors)
+	RGB 31,31,31, 27,27,29, 15,20,20, 00,00,00 ; PREDEFPAL_WHITE_CITY
 	RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE
 	RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT
 	RGB 31,31,31, 30,22,17, 16,14,19, 00,00,00 ; PREDEFPAL_DIPLOMA
@@ -89,3 +89,5 @@
 	RGB 31,31,31, 24,20,11, 18,13,11, 00,00,00 ; PREDEFPAL_UNOWN_PUZZLE
 	RGB 31,31,31, 31,31,31, 25,30,00, 25,30,00 ; PREDEFPAL_GAMEFREAK_LOGO_OB
 	RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO_BG
+	RGB 31,31,31, 23,21,16, 15,20,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON
+	RGB 31,31,31, 18,18,18, 15,20,20, 00,00,00 ; PREDEFPAL_GATES_NIHON
diff --git a/maps/WhiteCity.ablk b/maps/WhiteCity.ablk
index 7a483af..3496b6c 100644
--- a/maps/WhiteCity.ablk
+++ b/maps/WhiteCity.ablk
@@ -1,10 +1,10 @@
 
 8>9






 UYAN@W8>9B+h



-UPR/'DVAN@
e89+


-T[\\\]V
+UPR/'DVAN@
e89+

bT[\\\]V
 
/'D
`_89/3B
-
bPOXZZSQbCa
+

+POXZZSQbCa
 A@EEI+

 
PORQ

 /3+HEE+