Stalls + map tweaks

gfx/sgb/predef.pal

@@ -140,4 +140,6 @@
 	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 #
+	RGB 31,31,31, 31,20,00, 15,20,20, 00,00,00 ; PREDEFPAL_OCHRE_TOWN
+	RGB 31,31,31, 28,17,00, 12,15,20, 00,00,00 ; PREDEFPAL_OCHRE_TOWN_MORN #
 	

gfx/tilesets.asm

@@ -459,14 +459,7 @@ INCBIN "data/tilesets/nihon_birdon_metatiles.bin"
 TilesetNihonBirdonColl::
 INCLUDE "data/tilesets/nihon_birdon_collision.asm"
 
-TilesetNihonFontGFX::
-INCBIN "gfx/tilesets/nihon_font.2bpp.lz"
 
-TilesetNihonFontMeta::
-INCBIN "data/tilesets/nihon_font_metatiles.bin"
-
-TilesetNihonFontColl::
-INCLUDE "data/tilesets/nihon_font_collision.asm"
 
 TilesetNihonHighTechGFX::
 INCBIN "gfx/tilesets/nihon_hightech.2bpp.lz"
@@ -679,4 +672,13 @@ TilesetUnderwaterColl::
 INCLUDE "data/tilesets/underwater_collision.asm"
 
 TilesetUnderwaterAttr::
-INCBIN "data/tilesets/underwater_attributes.bin"
+INCBIN "data/tilesets/underwater_attributes.bin"
+
+TilesetNihonFontGFX::
+INCBIN "gfx/tilesets/nihon_font.2bpp.lz"
+
+TilesetNihonFontMeta::
+INCBIN "data/tilesets/nihon_font_metatiles.bin"
+
+TilesetNihonFontColl::
+INCLUDE "data/tilesets/nihon_font_collision.asm"

gfx/tilesets/roofs.pal

@@ -150,19 +150,23 @@
 ; group 31 (Ruddy Town)
 	RGB 28,08,05, 20,09,02 ; morn/day
 	RGB 14,07,08, 12,02,04 ; nite
+	
+; group 32 (Ochre Town)
+	RGB 31,20,00, 26,11,04 ; morn/day
+	RGB 14,09,08, 12,06,04 ; nite
 
-; group 32 (Sunglow City)
+; group 33 (Sunglow City)
 	RGB 30,27,03, 27,18,02 ; morn/day
 	RGB 14,13,09, 08,04,05 ; nite
 
-; group 33 (Blue Forest)
+; group 34 (Blue Forest)
 	RGB 24,22,31, 18,14,31 ; morn/day
 	RGB 12,10,24, 08,03,23 ; nite
 	
-; group 34 (Aventurine City)
+; group 35 (Aventurine City)
 	RGB 03,28,14, 06,20,11 ; morn/day
 	RGB 01,14,14, 00,03,10 ; nite
 
-; group 35 (White City)
+; group 36 (White City)
 	RGB 27,28,31, 24,24,26 ; morn/day
 	RGB 13,12,24, 11,09,22 ; nite