From f98a639b52abfd84b88fe9a9fa76c0b4e580af20 Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Fri, 20 Dec 2024 23:52:18 -0500
Subject: [PATCH] WIP Sunglow City (missing some shit, remind me to get to it
 later)

---
 constants/map_constants.asm               |  11 +++--
 constants/scgb_constants.asm              |   2 +
 data/maps/attributes.asm                  |   6 +++
 data/maps/blocks.asm                      |   6 +++
 data/maps/maps.asm                        |  13 ++++--
 data/maps/outdoor_sprites.asm             |   2 +
 data/maps/roofs.asm                       |   9 ++--
 data/maps/scripts.asm                     |   2 +
 data/maps/sgb_roof_pal_inds.asm           |   2 +
 data/tilesets/gate_attributes.bin         | Bin 1024 -> 1024 bytes
 data/tilesets/gate_collision.asm          |   6 +--
 data/tilesets/gate_metatiles.bin          | Bin 1024 -> 1024 bytes
 data/tilesets/nihon01_attributes.bin      | Bin 2624 -> 2656 bytes
 data/tilesets/nihon01_collision.asm       |   4 +-
 data/tilesets/nihon01_metatiles.bin       | Bin 2624 -> 2656 bytes
 data/tilesets/nihon_birdon_attributes.bin | Bin 0 -> 848 bytes
 data/tilesets/nihon_birdon_collision.asm  |  53 ++++++++++++++++++++++
 data/tilesets/nihon_birdon_metatiles.bin  | Bin 0 -> 848 bytes
 data/tilesets/nihon_old_attributes.bin    | Bin 1216 -> 1376 bytes
 data/tilesets/nihon_old_collision.asm     |  10 ++++
 data/tilesets/nihon_old_metatiles.bin     | Bin 1216 -> 1376 bytes
 data/tilesets/nihon_snowy_attributes.bin  | Bin 752 -> 1024 bytes
 data/tilesets/nihon_snowy_collision.asm   |  17 +++++++
 data/tilesets/nihon_snowy_metatiles.bin   | Bin 752 -> 1024 bytes
 data/tilesets/nihon_south_attributes.bin  | Bin 1296 -> 1472 bytes
 data/tilesets/nihon_south_collision.asm   |  11 +++++
 data/tilesets/nihon_south_metatiles.bin   | Bin 1296 -> 1472 bytes
 engine/tilesets/tileset_palettes.asm      |  32 +++++++++++++
 gfx/sgb/predef.pal                        |   2 +
 gfx/tilesets/nihon01.png                  | Bin 1607 -> 4089 bytes
 gfx/tilesets/nihon_birdon.png             | Bin 1330 -> 3449 bytes
 gfx/tilesets/nihon_old.png                | Bin 1349 -> 3723 bytes
 gfx/tilesets/nihon_snowy.png              | Bin 3909 -> 4042 bytes
 gfx/tilesets/nihon_south.png              | Bin 1349 -> 1438 bytes
 gfx/tilesets/roofs.pal                    |  10 ++--
 maps/DebugRoom.asm                        |   2 +-
 36 files changed, 182 insertions(+), 18 deletions(-)

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 11be40b..a89a49f 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -690,16 +690,21 @@ ENDM
 	map_const ROUTE_53_RUDDY_TOWN_GATE,						5, 4 ; 5
 	map_const ROUTE_54_RUDDY_TOWN_GATE,						5, 4 ; 6
 	endgroup
+
+	newgroup SUNGLOW_CITY                                        ; 40
+	map_const ROUTE_57,                                   10, 27 ; 1
+	map_const SUNGLOW_CITY,                                10, 9 ; 2
+	endgroup
 	
-	newgroup BLUE_FOREST                                          ; 40
+	newgroup BLUE_FOREST                                          ; 41
 	map_const BLUE_FOREST,                                 20, 18 ; 1
 	endgroup
 	
-	newgroup AVENTURINE_CITY                                      ; 41
+	newgroup AVENTURINE_CITY                                      ; 42
 	map_const AVENTURINE_CITY,                             20, 18 ; 1
 	endgroup
 	
-	newgroup WHITE_CITY                                           ; 42
+	newgroup WHITE_CITY                                           ; 43
 	map_const WHITE_CITY,                           	   30, 27 ; 1
 	map_const ROUTE_66_WHITE_CITY_GATE,					    5,  4 ; 2
 	endgroup
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm
index 0a092ae..d48bf42 100644
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -187,6 +187,8 @@ DEF SCGB_DEFAULT EQU $ff
 	const PREDEFPAL_RUDDY_TOWN_MORN
 	const PREDEFPAL_AVENTURINE
 	const PREDEFPAL_AVENTURINE_MORN
+	const PREDEFPAL_SUNGLOW_CITY
+	const PREDEFPAL_SUNGLOW_CITY_MORN
 DEF NUM_PREDEF_PALS EQU const_value
 
 ; SGB system command codes
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index d60d453..5335929 100644
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@@ -915,6 +915,12 @@ ENDM
 	map_attributes Route53RuddyTownGate, ROUTE_53_RUDDY_TOWN_GATE, $00, 0
 	map_attributes Route54RuddyTownGate, ROUTE_54_RUDDY_TOWN_GATE, $00, 0
 
+	map_attributes Route57, ROUTE_57, $03, NORTH
+	connection north, SunglowCity, SUNGLOW_CITY, 0
+
+	map_attributes SunglowCity, SUNGLOW_CITY, $03, SOUTH ; this is missing a route connection
+	connection south, Route57, ROUTE_57, 0
+
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	
 	map_attributes AventurineCity, AVENTURINE_CITY, $05, 0 ; this is on its own for now. add connections later.
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index cce59f8..5d4c323 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1336,5 +1336,11 @@ Route52_Blocks:
 RuddyTown_Blocks:
 	INCBIN "maps/RuddyTown.ablk"
 	
+Route57_Blocks:
+	INCBIN "maps/Route57.ablk"
+	
+SunglowCity_Blocks:
+	INCBIN "maps/SunglowCity.ablk"
+	
 AventurineCity_Blocks:
 	INCBIN "maps/AventurineCity.ablk"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index b89a029..3a56963 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -56,9 +56,10 @@ MapGroupPointers::
 	dw MapGroup_SavoyCity	; 37
 	dw MapGroup_CoralCity	; 38
 	dw MapGroup_RuddyTown   ; 39
-	dw MapGroup_BlueForest  ; 40
-	dw MapGroup_Aventurine	; 41
-	dw MapGroup_WhiteCity   ; 42
+	dw MapGroup_SunglowCity ; 40
+	dw MapGroup_BlueForest  ; 41
+	dw MapGroup_Aventurine	; 42
+	dw MapGroup_WhiteCity   ; 43
 	assert_table_length NUM_MAP_GROUPS
 
 MapGroup_Olivine:
@@ -758,6 +759,12 @@ MapGroup_RuddyTown:
 	map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above
 	assert_table_length NUM_RUDDY_TOWN_MAPS
 
+MapGroup_SunglowCity:
+	table_width MAP_LENGTH, MapGroup_SunglowCity
+	map Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_BLUE_FOREST, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_BLUE_FOREST, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	assert_table_length NUM_SUNGLOW_CITY_MAPS
+
 MapGroup_BlueForest:
 	table_width MAP_LENGTH, MapGroup_BlueForest
 	map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index 468524d..2d68cde 100644
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@@ -43,6 +43,7 @@ OutdoorSprites:
 	dw SavoyCityGroupSprites
 	dw CoralCityGroupSprites
 	dw RuddyTownGroupSprites
+	dw SunglowCityGroupSprites
 	dw BlueForestGroupSprites
 	dw AventurineCityGroupSprites
 	dw WhiteCityGroupSprites
@@ -334,6 +335,7 @@ IndigoGroupSprites:
 	db SPRITE_BOULDER
 
 BlueForestGroupSprites: 	; Will have its own thing eventually
+SunglowCityGroupSprites:  	; Ditto
 AventurineCityGroupSprites:	; Ditto
 WhiteCityGroupSprites:  	; Ditto
 NewBarkGroupSprites:
diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm
index 085e35b..c0f44d4 100644
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@@ -50,10 +50,11 @@ MapGroupRoofs:
 	db ROOF_VIOLET    ; 36 (Old City)
 	db ROOF_NEW_BARK  ; 37 (Savoy City)
 	db ROOF_NEW_BARK  ; 38 (Coral City)
-	db ROOF_NEW_BARK  ; 38 (Ruddy Town)
-	db ROOF_NEW_BARK  ; 40 (Blue Forest)
-	db ROOF_NEW_BARK  ; 41 (Aventurine City)
-	db ROOF_NEW_BARK  ; 42 (White City)
+	db ROOF_NEW_BARK  ; 39 (Ruddy Town)
+	db ROOF_NEW_BARK  ; 40 (Sunglow City)
+	db ROOF_NEW_BARK  ; 41 (Blue Forest)
+	db ROOF_NEW_BARK  ; 42 (Aventurine City)
+	db ROOF_NEW_BARK  ; 43 (White City)
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index c069f48..c69a75e 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -647,4 +647,6 @@ INCLUDE "maps/CoralCity.asm"
 INCLUDE "maps/Route51.asm"
 INCLUDE "maps/Route52.asm"
 INCLUDE "maps/RuddyTown.asm"
+INCLUDE "maps/Route57.asm"
+INCLUDE "maps/SunglowCity.asm"
 INCLUDE "maps/AventurineCity.asm"
\ No newline at end of file
diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm
index 8e0e1d8..aa918d2 100644
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/data/maps/sgb_roof_pal_inds.asm
@@ -43,6 +43,7 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_SAVOY_CITY
 	db PREDEFPAL_CORAL_CITY
 	db PREDEFPAL_RUDDY_TOWN
+	db PREDEFPAL_SUNGLOW_CITY
 	db PREDEFPAL_BLUE_FOREST
 	db PREDEFPAL_AVENTURINE
 	db PREDEFPAL_WHITE_CITY
@@ -91,6 +92,7 @@ MapGroupRoofSGBPalIndsMorn:
 	db PREDEFPAL_SAVOY_CITY_MORN
 	db PREDEFPAL_CORAL_CITY_MORN
 	db PREDEFPAL_RUDDY_TOWN_MORN
+	db PREDEFPAL_SUNGLOW_CITY_MORN
 	db PREDEFPAL_BLUE_FOREST_MORN
 	db PREDEFPAL_AVENTURINE_MORN
 	db PREDEFPAL_WHITE_CITY_MORN
diff --git a/data/tilesets/gate_attributes.bin b/data/tilesets/gate_attributes.bin
index bbd18260b1746a3a69380b09ea45ac3809303522..2ece9fa1a6768b0c9d4a154e2c8aff920c01c2a4 100644
GIT binary patch
delta 63
scmZqRXyBM&F|mP#g%t=UUtpHdU;+XVhlz=S0fHfX1P{XB*wDZX01ui5!~g&Q

delta 27
jcmZqRXyBM&F;ReHqJqTa4~z<v4={60+$FbhK>{-Xe9#GO

diff --git a/data/tilesets/gate_collision.asm b/data/tilesets/gate_collision.asm
index 1a7501f..9755d73 100644
--- a/data/tilesets/gate_collision.asm
+++ b/data/tilesets/gate_collision.asm
@@ -1,11 +1,11 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
-	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 03
 	tilecoll DOOR, DOOR, FLOOR, FLOOR ; 04
 	tilecoll WALL, WALL, WALL, WALL ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	tilecoll WALL, FLOOR, WALL, WALL ; 06
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 07
 	tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 08
 	tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 09
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a
diff --git a/data/tilesets/gate_metatiles.bin b/data/tilesets/gate_metatiles.bin
index 74076ff58b462183e07b7aba82eec54a06e49c92..cab53bbca917399c14fdcd2ee47bf3066a817ab2 100644
GIT binary patch
delta 87
zcmZqRXyBM&Fu8z{!^6VT!ctUBRE&w4iCIWkNLUaE7=ZvJ&dLUXAbAT*Mn+aP5QeA+
PsetfU*+B9e8yc7a{#OdM

delta 91
mcmZqRXyBM&5TJwxn3$QEg@lEK1%ZGO2+*VnayK?KFarQSJPh#w

diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin
index 85444b295bc8a89e80cb4004d78463579f72366a..8377eeff50d1935b8bd1c6187be7e6028b2e7854 100644
GIT binary patch
delta 55
ncmX>g@<3!m0{g@n0+TN=DNGa)*t~#!0h0nJCleDgW<mo1he-(I

delta 24
gcmaDLazJE50{dhI7LLgeI9Mk8vKeol&%Tfe0Bw&5GXMYp

diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm
index a180e4c..750c21e 100644
--- a/data/tilesets/nihon01_collision.asm
+++ b/data/tilesets/nihon01_collision.asm
@@ -116,7 +116,7 @@
 	tilecoll WALL, WALL, WALL, WALL ; 73
 	tilecoll WALL, WALL, WALL, WALL ; 74
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 75
-	tilecoll WALL, WALL, WALL, WALL ; 76
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 76
 	tilecoll WALL, WALL, WALL, WALL ; 77
 	tilecoll WALL, WALL, WALL, WALL ; 78
 	tilecoll WALL, WALL, WALL, WALL ; 79
@@ -162,3 +162,5 @@
 	tilecoll WALL, WALL, WALL, WALL ; a1
 	tilecoll WALL, WALL, WALL, WALL ; a2
 	tilecoll WALL, WALL, DOOR, WALL ; a3
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; a4
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; a5
diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin
index e6ebd2bc285eb3129e18e0b8c043fb6c001eaf4b..688368a85dde9f0f2efac0be3808a24129662b10 100644
GIT binary patch
delta 62
vcmX>g@<3!m0=s|;6qvZEsJJMrsBA7^zrdtmV8F_XjFXa+l8cIqieWSW(<%?^

delta 29
XcmaDLazJE50=qyc8rWRGet`)9oYV?D

diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..216b460874e5b45fc190c1aacd9418ef5778bbca 100644
GIT binary patch
literal 848
zcmah`(GtTT2%9KgU;O{y9npp&=hoa=2#F~6x^}3c27pI=44I=Apq67Dk;T{x`Ek>q
zq9k}f+cVF)3v5B%Ww_Kv@_6ra!xE{p%*cKolVEg$x{-LTZC-j}Oyfx@QGL(5V|hti
z>m3zx)z)^t`{9Fye)8qQx7M}BP>t(xAp3QHk%Ccuy2V7|d8ZtY8&7!SxyMN8eLjP=
PT<;NkBj>wimH+7rc6kig

literal 0
HcmV?d00001

diff --git a/data/tilesets/nihon_birdon_collision.asm b/data/tilesets/nihon_birdon_collision.asm
index e69de29..a31c7bc 100644
--- a/data/tilesets/nihon_birdon_collision.asm
+++ b/data/tilesets/nihon_birdon_collision.asm
@@ -0,0 +1,53 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll WATER, WATER, WATER, WATER ; 01
+	tilecoll WALL, WALL, WALL, WALL ; 02
+	tilecoll WALL, WALL, WALL, WALL ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, WALL, WALL, WALL ; 05
+	tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 06
+	tilecoll WALL, FLOOR, WALL, WALL ; 07
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c
+	tilecoll WALL, WALL, WALL, FLOOR ; 0d
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, FLOOR, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 11
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 13
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 14
+	tilecoll WALL, FLOOR, WALL, WALL ; 15
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 16
+	tilecoll FLOOR, WALL, WALL, WALL ; 17
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 18
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, WALL, WALL ; 1a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1b
+	tilecoll FLOOR, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, WALL, WALL ; 1d
+	tilecoll WALL, WALL, WALL, DOOR ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, WALL, DOOR, WALL ; 21
+	tilecoll WALL, WALL, WALL, WALL ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 26
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 27
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 28
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 29
+	tilecoll WALL, WALL, WALL, WALL ; 2a
+	tilecoll WALL, WALL, WALL, WALL ; 2b
+	tilecoll WALL, WALL, WALL, WALL ; 2c
+	tilecoll WALL, WALL, DOOR, DOOR ; 2d
+	tilecoll WALL, WALL, WALL, WALL ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WALL, WALL, DOOR, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WALL, WALL, DOOR, DOOR ; 32
+	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 34
diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..aa9a29bafc494eb8426b41891258eaf8d003f6a3 100644
GIT binary patch
literal 848
zcmZ8fYfpnf5CrNG?NthuRON_rsC_DEtR`v;`lYo=ebgpCl2-r!zi^iJDl*C5-t6A8
zdviF>fAj!1hu7)!?dbUUgzU1{yD~LX>ks;a$<yR%zL+mGz@#NZwhOUs*!b+WWm&6)
zMqNOyEQug!4YbM%pqji<O#xN#wQUp-0u4a*QG7XvspWWfWJc3tF|lAfTi4Mg5IDau
zwfl#^Ji;L=8st&XV5~o2Y`#!_UB8-x`jRU7zEq#%S)R_3_M|Q8s$@BRIeq#5`TkLU
zb4&QUyGGqyLG@L2MSmSQ&Tz!}`$w~-8|{wc1UH;Nj-~wkG7O_`BVXp6dqPSb0px3-
zm1ax$?ane!?~$F6Qc#}sr!y$=qd1C_G)be_b(7R}qgV@*)DENAh7Y7CmVMQ{d;9<A
zSM`jQ=*p!i_C%8E#*#6H`R(Dz+8ze55ihI%i2e!8z_Yo!qU*u*Gvkb6;@}Wno2_=I
z-2ts2<&z;@ui^ex>v3GQf^h{p;2lb^9Wp89(ffzI^@I>gkGp3OKz)yN1N9+=Px>jH
H)O-B`s!>+R

literal 0
HcmV?d00001

diff --git a/data/tilesets/nihon_old_attributes.bin b/data/tilesets/nihon_old_attributes.bin
index 23de9cbe6e8882dd1ad66dbaf2e9effec4d2505f..b3fd7b955bb13b5e3767ea917a87b5b687bcb53f 100644
GIT binary patch
delta 132
zcmX@W`G9M~0hU|_AYcUp78VH2$;rx!jDezztc*YemgdC)AbMF@5z-(wM3fl@CN2<R
N2aEFZPVQro006Zv35oy!

delta 7
OcmaFBb%1lj0Tuua+XE;7

diff --git a/data/tilesets/nihon_old_collision.asm b/data/tilesets/nihon_old_collision.asm
index 7291a6c..7e4d267 100644
--- a/data/tilesets/nihon_old_collision.asm
+++ b/data/tilesets/nihon_old_collision.asm
@@ -74,3 +74,13 @@
 	tilecoll WALL, WALL, WALL, WALL ; 49
 	tilecoll WALL, WALL, WALL, WALL ; 4a
 	tilecoll WALL, WALL, WALL, WALL ; 4b
+	tilecoll WALL, WALL, WALL, WALL ; 4c
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 4d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4e
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 4f
+	tilecoll WALL, WALL, WALL, WALL ; 50
+	tilecoll WALL, WALL, DOOR, WALL ; 51
+	tilecoll WATER, WATER, WATER, WATER ; 52
+	tilecoll WATER, WATER, WATER, WATER ; 53
+	tilecoll WALL, WALL, WALL, WALL ; 54
+	tilecoll WALL, WALL, WALL, WALL ; 55
diff --git a/data/tilesets/nihon_old_metatiles.bin b/data/tilesets/nihon_old_metatiles.bin
index 6863ae7e18618a9621697a6659c02bddfc7b75b5..76968f084f246a207b1c3b6372d0e11d13ba30ef 100644
GIT binary patch
delta 169
zcmX@W`G9M~0hW3$Zf<TVZE0yKZAC>!b0#KMRs{uA%*x8j%*qTzKn5!-BNHQ&ppc*t
tj23_b6DWZ3nORIsghe2NB1j+}$W}#QMG<9X0Rb>JHZcJr6F46#4ggas5=H<3

delta 7
OcmaFBb%1lj0Tuua+XE;7

diff --git a/data/tilesets/nihon_snowy_attributes.bin b/data/tilesets/nihon_snowy_attributes.bin
index 0a07be2fa3e6da5707bad6eba78eee49ae8e1006..83f9f35c00cd8310dcc0de6768aa975eb63c3eef 100644
GIT binary patch
delta 174
zcmeys+Q6~l1JgvsfQbTJG7Jn%OdyO3Afl5WGD_DoGcz+GVI(G47^Dv<h7&Nr0VgK|
Q0|-L^jK_fnK(fd}0KWPN`Tzg`

delta 7
OcmZqR_`tg10}}uYZ37?x

diff --git a/data/tilesets/nihon_snowy_collision.asm b/data/tilesets/nihon_snowy_collision.asm
index 32b1b77..b5a4901 100644
--- a/data/tilesets/nihon_snowy_collision.asm
+++ b/data/tilesets/nihon_snowy_collision.asm
@@ -45,3 +45,20 @@
 	tilecoll WATER, WATER, WATER, WATER ; 2c
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2d
 	tilecoll PIT, FLOOR, PIT, FLOOR ; 2e
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 2f
+	tilecoll WALL, WALL, WALL, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 31
+	tilecoll WALL, WALL, WALL, WALL ; 32
+	tilecoll WALL, WALL, WALL, WALL ; 33
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 34
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 35
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 36
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 37
+	tilecoll WATER, WATER, WATER, WATER ; 38
+	tilecoll WATER, WATER, WATER, WATER ; 39
+	tilecoll WATER, WATER, WATER, WATER ; 3a
+	tilecoll WATER, WATER, WATER, WATER ; 3b
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 3c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3d
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3e
+	tilecoll WALL, WALL, WALL, WALL ; 3f
diff --git a/data/tilesets/nihon_snowy_metatiles.bin b/data/tilesets/nihon_snowy_metatiles.bin
index 76996fbcd901e466c8fb00c6b8a317249bab4d6b..f03362b791f54576fe34a76eeda7f03614254e8a 100644
GIT binary patch
delta 282
zcmZ{eK?;K~5Jf}je7Y{Vfpo8STIf!VG;|je?_-bDqj`i*lo2WPlgH;xCXkulr_X$t
zjz773@1MpPMf4&1Qgp7Zb8Qev4w%O=qYiRRxVR8O*IT|{GO;dj59$k9vDWSpE%xMR
h;(voJbq!?JsCBM$F~zj@IVSnJDXX$-+NKRd7{1LjA&vk5

delta 7
OcmZqR_`tg10}}uYZ37?x

diff --git a/data/tilesets/nihon_south_attributes.bin b/data/tilesets/nihon_south_attributes.bin
index 4c5fe7a5bfb81b8c424996054e80b050467a4f0b..33e12226f8c8bf26e60ad6a43028163eb9cf1418 100644
GIT binary patch
delta 114
zcmbQhb%1+=0IL8K8kk(bBw~Xs#>&jh%nBq}fdmkPxaa_^1SklmCpOAYoFD)~@~k`{
I4J=Rq0REB)`~Uy|

delta 7
OcmX@WJ%MY304o3rwgM{v

diff --git a/data/tilesets/nihon_south_collision.asm b/data/tilesets/nihon_south_collision.asm
index 4401308..7a5c247 100644
--- a/data/tilesets/nihon_south_collision.asm
+++ b/data/tilesets/nihon_south_collision.asm
@@ -79,3 +79,14 @@
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 4e
 	tilecoll WALL, WALL, WALL, WALL ; 4f
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 50
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 51
+	tilecoll WALL, WALL, WALL, WALL ; 52
+	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 53
+	tilecoll WALL, WATER, WALL, WALL ; 54
+	tilecoll WATER, WATER, WATER, WATER ; 55
+	tilecoll WATER, WATER, WATER, WATER ; 56
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 57
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 58
+	tilecoll TALL_GRASS, TALL_GRASS, HEADBUTT_TREE, HEADBUTT_TREE ; 59
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 5a
+	tilecoll WALL, WALL, DOOR, DOOR ; 5b
diff --git a/data/tilesets/nihon_south_metatiles.bin b/data/tilesets/nihon_south_metatiles.bin
index 86e34ac99b5896f733914fc6beef37b7f573ba5c..63a12fc24399c4915ed425bdebbd352146b0eb7a 100644
GIT binary patch
delta 185
zcmbQhb%1+=0Bb!98gMo-F;N8)sz5>&NF*dCBo-7F6vAi)5fKqpAfXB*fbt+NIw%4P
wD8n!-6zJ*e>D$@c*|W0h>9exJX+wLM{V)XxX@~}HAdm(Ebq#e5O)X6=0QVIeumAu6

delta 7
OcmX@WJ%MY304o3rwgM{v

diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm
index af80f58..eec03da 100644
--- a/engine/tilesets/tileset_palettes.asm
+++ b/engine/tilesets/tileset_palettes.asm
@@ -16,6 +16,8 @@ LoadSpecialMapPalette:
 	jr z, .snowy
 	cp TILESET_LAVENDER_CRYPT
 	jr z, .crypt
+	cp TILESET_NIHON_BIRDON
+	jr z, .desert
 	jr .do_nothing
 
 .pokecom_2f
@@ -62,6 +64,15 @@ LoadSpecialMapPalette:
 	scf
 	ret
 	
+.desert
+	ld a, [wTimeOfDay]
+	and $7
+	cp NITE_F
+	jr z, .do_nothing
+	call LoadDesertPalette
+	scf
+	ret
+	
 .do_nothing
 	and a
 	ret
@@ -191,3 +202,24 @@ LoadCryptPalette:
 
 CryptPalette:
 INCLUDE "gfx/tilesets/lavendercrypt.pal"
+
+LoadDesertPalette:
+	cp DAY_F
+	jr z, .day
+	scf
+;morn
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
+	ld hl, DesertMornPalette
+	ld bc, 8 palettes
+	jp FarCopyWRAM
+	ret
+.day
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
+	ld hl, DesertDayPalette
+	ld bc, 8 palettes
+	jp FarCopyWRAM
+	ret
+	
+INCLUDE "gfx/tilesets/desert.pal"
\ No newline at end of file
diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
index 9bc3454..63b0007 100644
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -138,4 +138,6 @@
 	RGB 31,31,31, 23,09,04, 12,15,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN_MORN #
 	RGB 31,31,31, 03,29,11, 15,20,20, 00,00,00 ; PREDEFPAL_AVENTURINE
 	RGB 31,31,31, 08,25,12, 12,15,20, 00,00,00 ; PREDEFPAL_AVENTURINE_MORN
+	RGB 31,31,31, 29,26,03, 15,20,20, 00,00,00 ; PREDEFPAL_SUNGLOW_CITY
+	RGB 31,31,31, 27,23,01, 12,15,20, 00,00,00 ; PREDEFPAL_SUNGLOW_CITY_MORN #
 	
\ No newline at end of file
diff --git a/gfx/tilesets/nihon01.png b/gfx/tilesets/nihon01.png
index 60069a115911c2c9db3fcb7098cb27f0b3f09064..e80922ae31a3a00b9cb09cf4456949acf7e7e10f 100644
GIT binary patch
literal 4089
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

delta 1602
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
A=Kufz

diff --git a/gfx/tilesets/nihon_birdon.png b/gfx/tilesets/nihon_birdon.png
index 023bc198903fa44892591c904f95a02e9513224c..4074ac87fcab4971c649252de151b81e478b1bb6 100644
GIT binary patch
literal 3449
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
MOHLQ-t^9BQ2i2<IvH$=8

delta 1323
zcmV+`1=RZa8nOzI7=Ho)0002FcR#NH00j9-L_t(|+U=CzZ&PI$$DhMi3Uzwc&<-;$
zz>(D-jdaPm5VPTFw~je6bzS>f(9G_lU<9Lyk#I50Sb&&lq7Zh`)<}ti4Ns$}i$FXV
z?b0opZKS0L!Uc3>LKtCPu_Fw7*2m|x1C$H;2e{{L-sJTC<bV4--{<`Sh&S%avivrp
z96<_+;;DX$1H~Cs0CBoMmAamu$xC6NcoaB=cyi0GU2+#jq;OP3d=%)HqzhZ#8_3V7
zDKr&)^ikj#V_OF<g=8usELFZP@XHxR+XG;#mVkFIc+=N0AC~II1s>pGB?R2G0tCB`
z?Lb*g!B_Bnt$(Vp`5{2YuBE3=<Y#8^W;og)M*pKw_$rfS<{8wa%*8&aok^Kp1x4W1
zd1Cqs+c|wUWj^mw`5Slhm@+%knQSz+Aav*@#=aW7V#Y$KtxK6dm*eBv_yREOU@Scu
zGy{kYnP^eri!=fE6^t$qlO1oFT_Y8OAQWr3Dv$q5!GB5$t2Xa&jR<vhSxS*lnU8)j
z9(@3C(7|LI7cPs61qHPR+o{aM6vO4D@VgW~qFVq+p(<UlY2^Siyv`c_rKa-srl2JC
z|K@C75lSM4l0WLp9blPz;dnf&sX9FMs$F+r55SV)A}||D#!()Gx(cIvY%=PSrN+w9
zL;D$PUw;5bLrF_MeTx8#qG=O!-%Hk>(L?(HY8C(!0TKChLE-kM_}KP<Q=j~l@~<8K
z<}(#|F_c`F&nr}eMOjv7NlV-8wmVD(Mi_I2k_lA-BMKPZ0I`_moD{HCvI0Q+TNX-g
zU&SXZGczi{Sj8H%J1CXgQ3Y1$B<TprH(NQ29Dm7x+Kd{T@z%zHnl<Wa7_7&Ih&Ndf
z6+kP8t+4de#OiT7B4g!_`#_zt7BK^}lC;_ix(nA<|5T~|t#=`2V=YaHf5gnf;CdKE
z?Ar&9K<{h59u=^YPBt#k^@)q7H@ErVL&SS$q4nLZ)tB_B(B`ZVNkI@2-3|CW+v0}}
z9e?vm0uBZaF5jlX7-M$FUQ#F%x?>Gm6JtKuaQX7?SvYF6b8e#|0`zE)i<y|v6ji)R
zGh<GmWJ=!lt#wH+=ZWPc$-geRw_t)lUDgJmfeq(9yRCNogo`jH=8SHmJ9ymWGx;z(
zS>PZ}MT7nxOsoQ^&lx=g_|LSQX~AqCU4I!KAwx586DzN3IV%BO0Rm3$S@Jbz6Ip@p
zLqMRPKGE9S*uK9$w=x$bzz1N$bI1##58+PxelKWkRh@d*NPRAs3kHM!ivYE_RzZRP
zS%mYh5f5mGTfdAJfZ1vSI;nb$O`;$&5$?E+Uhp>S#SCKv3^fu!_CR&f!gq*;?SHO9
z=v~*_;jPcj84T4yKdmn#7qmhOjJY+86&#bzp(c{>uK_5>(Mhar-bsK{JF8)-A~0tV
z6+^Y34xJXq`tVmL<AHIJoRwj>`f$__HDP|J(f<R$lc<}(5$DG)aF3?bcB6Wh0M;8`
z!Tb%w)8u05+(+M8ZadvBaE)~Z+JBARg%n&Pz1nh*H9<C~4)^a+xJnl^P1B9&!Fd%h
zm@todzoApF*W7&h{qTIbm4`R}k^+s-6l)-W!f)7Yw|D-%@!*Mh+e(Bd{tQaX_7!V@
zXH|uZoKCNQj&1;An->8~#3Jzj0-|M)AM}_%en5%!Iw+ALS{f*sqGXXJZ6q%CVX+U3
heOT<nVjmtm{sFJ<vH7lx4N(99002ovPDHLkV1fwNc31!a

diff --git a/gfx/tilesets/nihon_old.png b/gfx/tilesets/nihon_old.png
index 08991e064f04ea2a9a2ef58dca0dcc69e278e56a..ad64d3725e65b6cb90f32a6fb3eb300bae21fee7 100644
GIT binary patch
literal 3723
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
G<-Y(ld7{$*

delta 1342
zcmV-E1;P4@9mNWe7=Ho)0002FcR#NH00j(5L_t(|+U?YTOj}hH2k`S~D=iWq4RllY
z$CL~=?J}D551R?TmUYA}2FhNqur0a;H>{gkSd5Z5q=V=(XCh+~Gcd9HV=#K_Tq1EK
zzCU<Mw>ZYqiQAI>2nBT;EK-_Q!_<!By)6Ts3GZJMxi4t~{eR?p&OP_O0^<0zq9|Jt
zm40N4vh_$eTZc2Bzyac9cQkq{HZ?;-z}ADH5ApQoh6ZIH_S29mAwCGYDZR4!^%FBw
zyo4cFR38LggzP+VHK4F2LNxD1yJ#Y8dFH@G5d*JW*%rHnGa+glvWo!ooiK363DCK(
zYd0#qgqSOeMSnb@W*)GO-Hc6~nwgryJ0Z11QvZ>V{!6DQq`KD-wPxnPClj^G=|m9u
z=jh}Jd290fsP%F+_v6zu7`0Z!;z@O2Ht6GL3Hh{l#ER*~M;Enzs6>X6ky#L~ASCuv
zrxiddiL04}k75kmPq4_<M5)+fmCxkb?e<I$W6IFq5`Ua5VOh;?`HbCWOR^F(QS0$N
zL+Tt5;ANt?gpf{^(h0l=S6_U-L|D%fF454joLRsUmc-KAbPB+RmE**c!n_<$C#But
zwh!_H!+yWN-V_W5q4@4oN7)%J!O|Dp8>{vMWQA+jXMn-Ofh~9Cjg+LymXb1-aFEi%
za9ak{1AnjxSo`_P8_9@0N0OY)gYrRu!f;gv7}$}|CW!IK`Ddgm^Px?=ei(p*dOma$
z?_uSQb>9@n0Nk!mUJBQi=Z7ifz>vN*L9loMjCsXBV38}YYYR_c=c@}0*JsY$!~h|K
zvek>AcTeo*2|1J=3k;_NSOj27LI+xYDL+y81b;wa7%??=tskfP|8X_01{@e*;Gw?J
z<wI^l0>k&V-5bA#3?y4KAXVBZIWXtS&E;R_@r3Eyxb`AI_8b_vv~<9M6&>vxcQhjg
zhOhVGJC_Nm#z7e=2c>1rjSk%K+Rn$XnmHJ`jS=2M%IJ{@2L;yg0tdErw3+G*yu|eY
z#(#Ma$rawpG|2jDWWNKCTik-zLWp?rw>^lwhq&3zULXb{h)D+qomuSyyV3iz_#NOq
zB$|avN*TED_UTt0i0=yhXTk56R9z|<6v_e4^$@v9&GNy8hK4sC_&ba)vy}S%t&wCh
z7;I$IRlA6;>D&?DY>CmOW7*O?NC6}cn13sq&er<)tEY3&iyPX@c!Dg(2N~!g<U4&q
zev|324=~Y+4&qv}-3$zPB1t0y>=>VR3i`&nx>ayfKC{(9!W&xEG6pt95^e_85n|k-
zckVrGItZ7&7Ph_hW+}dcfr?0CF9VMPeA`u}D|cpXhs;kOw6AG@pMmEii8nF{tABR6
z-H!nrg%ZTlM(lkKk;rE~O_3jchVpYgE|<YVJcJDw8q+{u!GLZ|<RD(IcD1zdyG^PL
z40t&(%K+v|)z866UE)AXOWY-hL~s&Fr8sc2+f<M*ra>@n)Fa+CdWyY+ZVRM(IDmXa
zft^KD>zFTiQgE`LwnMcc`TQme8-GbUf%Tvl{h5Sdd<6qmUufN=yBTWIO*Ur(IPpF>
z#oqWoj;udbnJ9abzxxavUBfQR9H4PRu!rKqKO5fz)L4t){{_4TRkzRs*}vLy7kZ%o
z&jr7?K`gdl1r_#nXaHKLQG#}8G}%ctwi)_b1AI22Q9_{_O@2W&wz=y+FgJ&Vzh+?J
z0<46__cqX|plSon5}HkFZgX)Ci*s0<!@r)t06K)E9@S^PkN^Mx07*qoM6N<$f<_~R
AF8}}l

diff --git a/gfx/tilesets/nihon_snowy.png b/gfx/tilesets/nihon_snowy.png
index 062982eaf74721eea957cdfe37eb3125b172b2f2..7511b481c6e64ee899873fc22b1de06f7e0fcde4 100644
GIT binary patch
delta 3699
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
Dc$Sbl

delta 3579
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

diff --git a/gfx/tilesets/nihon_south.png b/gfx/tilesets/nihon_south.png
index 7c5dc14300cc93bf22404b36150616ed9296e00f..6ddb7f4275a615915e18859eb6707ca92c2054a3 100644
GIT binary patch
delta 1420
zcmV;71#|kv3Z4s)B!6W|L_t(Y$L*9~OjCCh$4`M;scfaA7Z-SdLFl$N5t2Ua4`#Q8
zGGy5RZGZA-QAh;*L$W<A3t7k_4EMBTn}N8t%T^K)>#xaNX4GW&fs(?M0x8zX^u=OC
zW6daqLeRDL>~~wIn-8}yd*u9*o3!_HzvrCq@BDs%cz;t6gnthag>hs-S-d#L;@i{{
zL;!JlEEv2OUP(|luy`K0gm|%~r$^|;aq9N)h|dFKlrFR!J(E}wQ^<2vp67wngmj*{
z=@eKIZkqePL6uEdG(H7FWehmD&=$Uj2{)~nHK+idRl<M=MgT|e>24In6sjDRs!UX9
zeg?3{?uJ9>5`QZz_`vPi&3pc%ko=V?2&Cz}Jg86kAUYG&Tat>P5}%99x5%f<SA+WN
zO(K7PGl4;UeK->Jc%KLjzCp<M=WppT8KQMT{a1p2HtK%@Ox6<;zT?mX@Vg_Pl)~3x
z2K=MIS(=DY->SDv<roZxR1LR<*?%b*nL=T6w`IyuQGXF-DH1{b=tr}jr+^F&5WysK
zXL|Ugf>?v;Qsh~R$t<SuJ9Q5$p8!lDKb&ln5CHeDN+V)PuFvA2bnFTtdCq|UvNM3H
z2!fpGTt9~7`Eh=a*=Okk$e0{Q5twrZA|pN(7zt+;sK*lZS22YX0544@6{c#Pf!}P}
zK`?XW@qeGFLFtbg`x!uKNlIb*17|?%(%E1i$61fr{WJdPUbWA{@|R8mFkp@;=rTPn
zF!z_oX;*o8=9<~GT6<+2OH(OkYn*}H!RaihdIf;m%dhz?rrZr8DzN>{bOt7CRP)oL
z+eTpf2|^rHZ}nNS%t)9*o|4jG2FQ&v9o4x&G=HPS#Qpj1nUZ308qQa;KO)H?z=9!e
zR2&$-4z^udESfbV5|ULfj&>tP__#_ptaJf827V(b7w#7Qk}H0twjjpaHu$*#@1g18
zj6(o@#fB45Zy$QEqhAEfOlQ@L4a_80B%@CSzGDu<Rj51MS#VR0ake>mJgy=(=xkj>
zIDh>Kf*&z&9!}a%W_QWaONhCC03&Srb*^KhSbG&=j{IR*hf&TfvvP4BpkLwQ*UBF@
zaI8f%nUV^Igz2m?V@THIjZtdb<rr9Nls8O#p&Y<@1yk7UF&NGGxon&eKE_!&tHY)3
z(00Uk1HaZCYJj<(CIhG+!D1mmWsGZLfPZbScCOaz&<;epL#kv7kS*@Kt&kZR&}(PF
z#lDOm-lDBX)(V$uAp#Hu^?cn>)xIw)V>@FG26O;u-=?juwf5|4wiodcP?+-D)t0Hs
zSS;pnIBYin%6w;aBdi7ySYHLjWZgHOB(Pq<fOY`6mN~iJ9a5x#wi-1bA%p=FReua<
zWCwV9ID7E%j>RGdY{>HwhIS1dXse7p)MyGEHuiq|>&1JHpizdRf&ww0-H~FO6V*(@
zRt%7JWum$iZysjAs$yM*1(*aLYWTROz{X}o5nXNYW8o45WaBX-rY@bziE2ztRM~z8
zcmbn+d|cLi9OAxk*vxZ8Jc4g(-haWwea*|Pi*2~kh8u-TZ4jO5weKrR)gY^4x3<u4
zoM&y~<!iW6v$qYr%e2cpkg7qW#RMj7ns&8Xj?;(mv6VXx{xxc^DoxeE02Ve)v)SB^
zGj|ZLHzDj;a!~PXh&8~gqQVWCQmuYXOp&}FFirdqz~*KwC<!b-iuFnYkAFT3eJlz5
z)pGQlByg~$^MWL>VDJ2n5DDPIsr?7ZUa2llb@dXN1Q6=9cUyf@UF`2XXPJ=z9-MA<
zS1(Hd2};Ks*3xX&jwK1elPSHRB1d{bn)eluCW9wEkTylyBGb0H<-?W_TRv?0u;qi~
a`Ww$GmWgquWtRW|002ovP6b4+LSTZa$fYm<

delta 1330
zcmV-21<m@N3&jeMB!3J^L_t(Y$L*BgPg7?Y$DabVQrQk2J-EOH3_`cHiIDVSKQKFO
zISg4gK-)J(7grJyog}+i7B0vl40p9;o1qu&S+<gZSWlB}8Hpx47nHP2TWE@PGP$uB
z(TEwPP>3$AefFN#>E?y~1IF_vCuz^;e4pp}zR&vt;=KowB!7K~C`}^`k;aRYG``J0
zK?V@lCgbtDiS?}L0~*f)mk=)=9vF}Yaa#2GImBmyNl{!p{PFqhx|~8;#`vEF&Jl9_
z{E|naMfk+>_l-;`q0#jOSZ$!dM~jZcUCjE#rg<X+@U#*N+&2LTgXj8Dl2b5c4AUSh
zbUy`XV|Nm(KYwM{*YUp3zn}B}M<MsCSdxf+N*OogeUP1r8>~4+VC3iW+D-D=+SRz>
zx?Se)J;-9*(2+={{DH?pqi+!M-PBD3=0dhEZum-y&ZnY}fnWzAiQ9q!fZLz+=M}zA
zP~aa0)@mnG#}R{dw#;ZW=4-em&HqcmL=~#L`>nIarhldsO_7ZoCO(<>KLHeQlt^ZU
zuh`G!6yzGrmy%CY1WTyG@1k!^{TQGMm5E%NgaG({Rhtm&%EMMc6eq6`QsIe3FMDFh
zBoUNE@BLv_S()Ju@L}r^Kv8fSWgy~-CC9@Im<Vf=M87o^wNQmK051h|3bSpV*l#Y~
zDDZ4!=6^@gsE(#g!xRw3y1YW@15Zrn)w|#j%i2!4qjS;JK~307^VbIfC=j6v`eMHq
z_~FKk*w>htyT+S0+OAAveLlr}t0z`I8Y%(HD*&Rq@mknwF5f1y0^Q$YPb}EVEQBU@
zjl=FUgb1R+7Pgk~NT@=ES`^19pfoA;qTUO#8Gm(V_Rn|E*VW3?Fx5=|NaltBtDNkF
zJTP24?7FmEGtVOuQqm!hb{8hO45J@Ydx0K<s0q}IcWQnqm%q|j5i^c$E;15078)x$
z1~61>JOdqW=X<@wGQd-vjR1C1lf22IAqK*y1mjg`KXJTjNrM@>ITajkAa?3qeNGI0
zihmGAtXP1v?z5$RN(>OfcZ^_?PQTuJY69D?B1Fg^#x0m&d4-M5Z~((9FSptFu#=@N
zqS>5NFlNmcOhrzGJ&+bf*FIrnvrE}I^M!f@7gSW?!GO`k<L8QLLbx<*V{L+0*Q@Kz
z><4bMf3*`L19l^5{(|LdfaWx7r+_Qc7Jq3A2)dDE|0<J90gC0lw^Rxf1qR&|xHwew
z{afOZlbh8mZIA>=fo7rIX*u*|b9!%Dpg=Ex?rrgiceAIoh3-XW98~7Y9*uRjIh{@m
zg5bIV&=9_$AE!0Qz}5z+g6-e<bHG*=1$qFKI_l(B|EekvI9fGak`M~aSSZj%4}WlI
ztaS9zp5+<}Y%41foco+d9nI;7T5Xl!qVIRVUVGpqniME2s1PgZ9Vxdt(?TU&wE!ho
zW?JfT=>!EfR9g&IVGekx<uckT7o8DRYNIoX)hiTGOs7qlzjT^sS};3fas3SN0;Zz)
zsG<8bWWtFA&#^>4f^TZy!R$Tl%YU?sUAXPQ?dlZ=q~-?QhidXQC@l2WmWE9Wv`xHx
z4YyklIv}tn_VFY68nimhV%DYY(P)$yI);yI>}iN@if&7Nz6J`=aA~`Fz6a-SBVM;7
z>{$^+`E1BFz^k&t4TV~xc}-4{yC1MX>;V5Sz+e3Q1x;noUr^wE6BNkcFDncbOi{4N
of^F{ju;asy4?8~W`0(8IH<gI5v>`j^?f?J)07*qoM6N<$g12^oq5uE@

diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal
index d870a11..c3f63b2 100644
--- a/gfx/tilesets/roofs.pal
+++ b/gfx/tilesets/roofs.pal
@@ -151,14 +151,18 @@
 	RGB 28,08,05, 20,09,02 ; morn/day
 	RGB 14,07,08, 12,02,04 ; nite
 
-; group 32 (Blue Forest)
+; group 32 (Sunglow City)
+	RGB 30,27,03, 27,18,02 ; morn/day
+	RGB 14,13,09, 08,04,05 ; nite
+
+; group 33 (Blue Forest)
 	RGB 24,22,31, 18,14,31 ; morn/day
 	RGB 12,10,24, 08,03,23 ; nite
 	
-; group 33 (Aventurine City)
+; group 34 (Aventurine City)
 	RGB 03,28,14, 06,20,11 ; morn/day
 	RGB 01,14,14, 00,03,10 ; nite
 
-; group 34 (White City)
+; group 35 (White City)
 	RGB 27,28,31, 24,24,26 ; morn/day
 	RGB 13,12,24, 11,09,22 ; nite
diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm
index 9fac19b..fb3a5a0 100644
--- a/maps/DebugRoom.asm
+++ b/maps/DebugRoom.asm
@@ -413,7 +413,7 @@ DebugRoom_MapEvents:
 	warp_event 15,  2, GOLDENROD_CITY, 1 ; city warp
 	warp_event  4,  9, SUMMER_BEACH_HOUSE, 1 ; left lab/league warp
 	warp_event  5,  9, BLUE_FOREST, 1 ; right lab/league warp
-	warp_event 35, 17, AVENTURINE_CITY, 1 ; east warp
+	warp_event 35, 17, SUNGLOW_CITY, 1 ; east warp
 	warp_event  5, 35, LAVENDER_TOWN, 1 ; southwest warp
 	warp_event 19, 34, KANTO_SAFARI_ZONE_CENTER, 1 ; southern warp
 	warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp