Coral City (High-Tech)

constants/landmark_constants.asm

@@ -138,6 +138,7 @@ DEF NIHON_LANDMARK EQU const_value
 	const LANDMARK_POKEMON_PAGODA
 	const LANDMARK_ROUTE_50
 	const LANDMARK_SAVOY_CITY
+	const LANDMARK_CORAL_CITY
 	const LANDMARK_BLUE_FOREST
 	const LANDMARK_ROUTE_66
 	const LANDMARK_WHITE_CITY

constants/map_constants.asm

@@ -673,13 +673,17 @@ ENDM
 	map_const ROUTE_50_SAVOY_CITY_GATE,					    5,  4 ; 2
 	endgroup
 	
-	newgroup BLUE_FOREST                                          ; 38
+	newgroup CORAL_CITY										      ; 38
+	map_const CORAL_CITY,								   20, 18 ; 1
+	endgroup
+	
+	newgroup BLUE_FOREST                                          ; 39
 	map_const BLUE_FOREST,                                 20, 18 ; 1
 	endgroup
 	
-	newgroup WHITE_CITY                                           ; 39
+	newgroup WHITE_CITY                                           ; 40
 	map_const WHITE_CITY,                           	   30, 27 ; 1
 	map_const ROUTE_66_WHITE_CITY_GATE,					    5,  4 ; 2
 	endgroup
 	
-DEF NUM_MAP_GROUPS EQU const_value ; 39
+DEF NUM_MAP_GROUPS EQU const_value ; 40

constants/scgb_constants.asm

@@ -82,6 +82,7 @@ DEF SCGB_DEFAULT EQU $ff
 	const PREDEFPAL_SILENT_HILLS
 	const PREDEFPAL_OLD_CITY
 	const PREDEFPAL_SAVOY_CITY
+	const PREDEFPAL_CORAL_CITY
 	const PREDEFPAL_BLUE_FOREST
 	const PREDEFPAL_WHITE_CITY
 	const PREDEFPAL_NITE

data/maps/attributes.asm

@@ -894,6 +894,8 @@ ENDM
 	map_attributes SavoyCity, SAVOY_CITY, $15, 0
 	map_attributes Route50SavoyCityGate, ROUTE_50_SAVOY_CITY_GATE, $00, 0	
 	
+	map_attributes CoralCity, CORAL_CITY, $04, 0
+	
 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	
 	map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.

data/maps/blocks.asm

@@ -1313,3 +1313,6 @@ KantoSafariZoneArea3_Blocks:
 
 SavoyCity_Blocks:
 	INCBIN "maps/SavoyCity.ablk"
+
+CoralCity_Blocks:
+	INCBIN "maps/CoralCity.ablk"

data/maps/landmarks.asm

@@ -142,6 +142,7 @@ Landmarks:
 	landmark 76, 100, PokemonPagodaName
 	landmark 68, 100, Route50Name
 	landmark 60, 100, SavoyCityName
+	landmark  36, 92, CoralCityName
 	landmark 140, 60, BlueForestName
 	landmark 108, 108, Route66Name
 	landmark 124, 108, WhiteCityName
@@ -270,6 +271,6 @@ QuietCaveName:       db "QUIET¯CAVE@"
 OldCityName:		 db "SEPIA¯CITY@"
 PokemonPagodaName:	 db "#MON¯PAGODA@"
 SavoyCityName:		 db "SAVOY¯CITY@"
-; High Tech will be called "Vogue City"
+CoralCityName:		 db "CORAL¯CITY@"
 BlueForestName:      db "BLUE¯FOREST@"
 WhiteCityName:       db "WHITE¯CITY@"

data/maps/maps.asm

@@ -54,8 +54,9 @@ MapGroupPointers::
 	dw MapGroup_SilentHills ; 35
 	dw MapGroup_OldCity		; 36
 	dw MapGroup_SavoyCity	; 37
-	dw MapGroup_BlueForest  ; 38
+	dw MapGroup_CoralCity	; 38
-	dw MapGroup_WhiteCity   ; 39
+	dw MapGroup_BlueForest  ; 39
+	dw MapGroup_WhiteCity   ; 40
 	assert_table_length NUM_MAP_GROUPS
 
 MapGroup_Olivine:
@@ -735,6 +736,11 @@ MapGroup_SavoyCity:
 	map Route50SavoyCityGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SAVOY_CITY_MAPS
 	
+MapGroup_CoralCity:
+	table_width MAP_LENGTH, MapGroup_CoralCity
+	map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	assert_table_length NUM_CORAL_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

@@ -41,6 +41,7 @@ OutdoorSprites:
 	dw SilentHillsGroupSprites
 	dw OldCityGroupSprites
 	dw SavoyCityGroupSprites
+	dw CoralCityGroupSprites
 	dw BlueForestGroupSprites
 	dw WhiteCityGroupSprites
 	assert_table_length NUM_MAP_GROUPS
@@ -330,8 +331,9 @@ IndigoGroupSprites:
 	db SPRITE_POKE_BALL
 	db SPRITE_BOULDER
 
-SavoyCityGroupSprites:	; Ditto
+SavoyCityGroupSprites:	; Will have its own thing eventually
-BlueForestGroupSprites: ; Will have its own thing eventually
+CoralCityGroupSprites:	; Ditto
+BlueForestGroupSprites: ; Ditto
 WhiteCityGroupSprites:  ; Ditto
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE

data/maps/roofs.asm

@@ -49,8 +49,9 @@ MapGroupRoofs:
 	db ROOF_NEW_BARK  ; 35 (Silent Hills)
 	db ROOF_VIOLET    ; 36 (Old City)
 	db ROOF_NEW_BARK  ; 37 (Savoy City)
-	db ROOF_NEW_BARK  ; 38 (Blue Forest)
+	db ROOF_NEW_BARK  ; 38 (Coral City)
-	db ROOF_NEW_BARK  ; 39 (White City)
+	db ROOF_NEW_BARK  ; 39 (Blue Forest)
+	db ROOF_NEW_BARK  ; 40 (White City)
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:

data/maps/scripts.asm

@@ -635,3 +635,4 @@ INCLUDE "maps/KantoSafariZoneArea2West.asm"
 INCLUDE "maps/KantoSafariZoneArea3.asm"
 INCLUDE "maps/SavoyCity.asm"
 INCLUDE "maps/Route50SavoyCityGate.asm"
+INCLUDE "maps/CoralCity.asm"

data/maps/sgb_roof_pal_inds.asm

@@ -41,6 +41,7 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_SILENT_HILLS
 	db PREDEFPAL_OLD_CITY
 	db PREDEFPAL_SAVOY_CITY
+	db PREDEFPAL_CORAL_CITY
 	db PREDEFPAL_BLUE_FOREST
 	db PREDEFPAL_WHITE_CITY
 	assert_table_length NUM_MAP_GROUPS + 1

data/tilesets/nihon_hightech_collision.asm

@@ -0,0 +1,76 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll WATER, WATER, WATER, WATER ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06
+	tilecoll WATER, WATER, WATER, WATER ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
+	tilecoll WALL, WALL, DOOR, DOOR ; 0d
+	tilecoll WALL, WALL, WALL, WALL ; 0e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
+	tilecoll WALL, WALL, WALL, DOOR ; 10
+	tilecoll WALL, WALL, WALL, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 15
+	tilecoll WALL, WALL, FLOOR, WALL ; 16
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 17
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 18
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 19
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 1a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1b
+	tilecoll WALL, FLOOR, WALL, WALL ; 1c
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
+	tilecoll FLOOR, WALL, WALL, WALL ; 1e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 21
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 22
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 23
+	tilecoll WALL, WALL, WALL, WALL ; 24
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 25
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 26
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 27
+	tilecoll WATER, WATER, WATER, WATER ; 28
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 29
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 2a
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 2b
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c
+	tilecoll WALL, WALL, WALL, WALL ; 2d
+	tilecoll WALL, WALL, DOOR, DOOR ; 2e
+	tilecoll WALL, WALL, WALL, WALL ; 2f
+	tilecoll WATER, WATER, WATER, WATER ; 30
+	tilecoll WATER, WATER, WATER, WATER ; 31
+	tilecoll WATER, WATER, WATER, WATER ; 32
+	tilecoll WATER, WATER, WATER, WATER ; 33
+	tilecoll WATER, WATER, WATER, WATER ; 34
+	tilecoll WATER, WATER, WATER, WATER ; 35
+	tilecoll WATER, WATER, WATER, WATER ; 36
+	tilecoll WATER, WATER, WATER, WATER ; 37
+	tilecoll WALL, WALL, WALL, WATER ; 38
+	tilecoll WALL, WALL, WATER, WATER ; 39
+	tilecoll WALL, WALL, WATER, WALL ; 3a
+	tilecoll WALL, WATER, WALL, WATER ; 3b
+	tilecoll WALL, WATER, WALL, WALL ; 3c
+	tilecoll WATER, WATER, WALL, WALL ; 3d
+	tilecoll WATER, WALL, WALL, WALL ; 3e
+	tilecoll WATER, WALL, WATER, WALL ; 3f
+	tilecoll WALL, WATER, WALL, WATER ; 40
+	tilecoll WATER, WATER, WATER, WATER ; 41
+	tilecoll WATER, WATER, WATER, WATER ; 42
+	tilecoll WATER, WALL, WATER, WALL ; 43
+	tilecoll WATER, WALL, WATER, WALL ; 44
+	tilecoll WATER, WATER, WALL, WALL ; 45
+	tilecoll WATER, WATER, WALL, WALL ; 46
+	tilecoll WATER, WATER, WALL, WALL ; 47
+	tilecoll WATER, WATER, WALL, WALL ; 48
+	tilecoll WALL, WATER, WALL, WALL ; 49
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 4a
+	tilecoll WALL, WALL, WALL, WALL ; 4b

gfx/sgb/predef.pal

@@ -34,6 +34,7 @@
 	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, 19,20,25, 15,20,20, 00,00,00 ; PREDEFPAL_SAVOY_CITY
+	RGB 31,31,31, 31,17,21, 15,20,20, 00,00,00 ; PREDEFPAL_CORAL_CITY
 	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

gfx/tilesets/roofs.pal

@@ -143,10 +143,14 @@
 	RGB 21,22,25, 13,12,31 ; morn/day
 	RGB 11,09,19, 04,03,18 ; nite
 	
-; group 30 (Blue Forest)
+; group 30 (Coral City)
+	RGB 31,14,20, 27,05,16 ; morn/day
+	RGB 14,03,17, 09,03,12 ; nite
+
+; group 31 (Blue Forest)
 	RGB 24,22,31, 18,14,31 ; morn/day
 	RGB 12,10,24, 08,03,23 ; nite
 	
-; group 31 (White City)
+; group 32 (White City)
 	RGB 27,28,31, 24,24,26 ; morn/day
 	RGB 13,12,24, 11,09,22 ; nite

maps/CoralCity.ablk

@@ -0,0 +1,6 @@
+01
+0?999;05J0;47(((ACB6;0?;	
+0
&4!"#&4$   &26(3)*+47((301
+4	
+



41-./,2652@(((D((((67(((((6;?1
+0;?5J0?7((((AIHEFG>

maps/CoralCity.asm

@@ -0,0 +1,20 @@
+	object_const_def
+
+CoralCity_MapScripts:
+	def_scene_scripts
+
+	def_callbacks
+
+CoralCity_MapEvents:
+	db 0, 0 ; filler
+
+	def_warp_events
+	warp_event 14, 32, SAVOY_CITY, 4					;south port, north
+	warp_event 14, 33, SAVOY_CITY, 5					;south port, south
+	
+	def_coord_events
+
+	def_bg_events
+
+	def_object_events
+

maps/SavoyCity.asm

@@ -12,6 +12,8 @@ SavoyCity_MapEvents:
 	warp_event 33, 15, ROUTE_50_SAVOY_CITY_GATE, 1		;east gate
 	warp_event 22,  5, DEBUG_ROOM, 1					;north gate, left
 	warp_event 23,  5, DEBUG_ROOM, 1					;north gate, right
+	warp_event 4,   8, CORAL_CITY, 1					;port north
+	warp_event 4,   9, CORAL_CITY, 2					;port south
 	
 	def_coord_events