WIP Sunglow City (missing some shit, remind me to get to it later)

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

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

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.

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"

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_SunglowCity ; 40
-	dw MapGroup_Aventurine	; 41
+	dw MapGroup_BlueForest  ; 41
-	dw MapGroup_WhiteCity   ; 42
+	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

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:

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  ; 39 (Ruddy Town)
-	db ROOF_NEW_BARK  ; 40 (Blue Forest)
+	db ROOF_NEW_BARK  ; 40 (Sunglow City)
-	db ROOF_NEW_BARK  ; 41 (Aventurine City)
+	db ROOF_NEW_BARK  ; 41 (Blue Forest)
-	db ROOF_NEW_BARK  ; 42 (White City)
+	db ROOF_NEW_BARK  ; 42 (Aventurine City)
+	db ROOF_NEW_BARK  ; 43 (White City)
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:

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"

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

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, FLOOR, WALL, WALL ; 06
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 07
+	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

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

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

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

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

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

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"

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 #
 	

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

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