From 7a6d9b3b466d815a87ac569e081134bff107137c Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Thu, 24 Oct 2024 18:12:34 -0400
Subject: [PATCH] Coral City (High-Tech)

---
 constants/landmark_constants.asm            |   1 +
 constants/map_constants.asm                 |  10 ++-
 constants/scgb_constants.asm                |   1 +
 data/maps/attributes.asm                    |   2 +
 data/maps/blocks.asm                        |   3 +
 data/maps/landmarks.asm                     |   3 +-
 data/maps/maps.asm                          |  10 ++-
 data/maps/outdoor_sprites.asm               |   6 +-
 data/maps/roofs.asm                         |   5 +-
 data/maps/scripts.asm                       |   3 +-
 data/maps/sgb_roof_pal_inds.asm             |   1 +
 data/tilesets/nihon_hightech_attributes.bin | Bin 0 -> 1216 bytes
 data/tilesets/nihon_hightech_collision.asm  |  76 ++++++++++++++++++++
 data/tilesets/nihon_hightech_metatiles.bin  | Bin 0 -> 1216 bytes
 gfx/sgb/predef.pal                          |   1 +
 gfx/tilesets/nihon_hightech.png             | Bin 3271 -> 3273 bytes
 gfx/tilesets/roofs.pal                      |   8 ++-
 maps/CoralCity.ablk                         |   6 ++
 maps/CoralCity.asm                          |  20 ++++++
 maps/SavoyCity.asm                          |   2 +
 20 files changed, 145 insertions(+), 13 deletions(-)
 create mode 100644 maps/CoralCity.ablk
 create mode 100644 maps/CoralCity.asm

diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm
index c8ccbc1..182728b 100644
--- a/constants/landmark_constants.asm
+++ b/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
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index 8de1fc3..d03c919 100644
--- a/constants/map_constants.asm
+++ b/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
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm
index 9a2b0f3..f8a1bab 100644
--- a/constants/scgb_constants.asm
+++ b/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
diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm
index f931034..6fdb53d 100644
--- a/data/maps/attributes.asm
+++ b/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.
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index a97be60..b7e9693 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -1313,3 +1313,6 @@ KantoSafariZoneArea3_Blocks:
 
 SavoyCity_Blocks:
 	INCBIN "maps/SavoyCity.ablk"
+
+CoralCity_Blocks:
+	INCBIN "maps/CoralCity.ablk"
diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index 52a994b..d3a36d1 100644
--- a/data/maps/landmarks.asm
+++ b/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@"
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index 7eb83c1..ba369c5 100644
--- a/data/maps/maps.asm
+++ b/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_WhiteCity   ; 39
+	dw MapGroup_CoralCity	; 38
+	dw MapGroup_BlueForest  ; 39
+	dw MapGroup_WhiteCity   ; 40
 	assert_table_length NUM_MAP_GROUPS
 
 MapGroup_Olivine:
@@ -734,6 +735,11 @@ MapGroup_SavoyCity:
 	map SavoyCity, TILESET_NIHON_WEST, TOWN, LANDMARK_SAVOY_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	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
diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm
index 5762c8a..9305994 100644
--- a/data/maps/outdoor_sprites.asm
+++ b/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
-BlueForestGroupSprites: ; Will have its own thing eventually
+SavoyCityGroupSprites:	; Will have its own thing eventually
+CoralCityGroupSprites:	; Ditto
+BlueForestGroupSprites: ; Ditto
 WhiteCityGroupSprites:  ; Ditto
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE
diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm
index f452b7c..6b1a144 100644
--- a/data/maps/roofs.asm
+++ b/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  ; 39 (White City)
+	db ROOF_NEW_BARK  ; 38 (Coral City)
+	db ROOF_NEW_BARK  ; 39 (Blue Forest)
+	db ROOF_NEW_BARK  ; 40 (White City)
 	assert_table_length NUM_MAP_GROUPS + 1
 
 Roofs:
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index 775132c..d3d7aaa 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -634,4 +634,5 @@ INCLUDE "maps/KantoSafariZoneArea2East.asm"
 INCLUDE "maps/KantoSafariZoneArea2West.asm"
 INCLUDE "maps/KantoSafariZoneArea3.asm"
 INCLUDE "maps/SavoyCity.asm"
-INCLUDE "maps/Route50SavoyCityGate.asm"
\ No newline at end of file
+INCLUDE "maps/Route50SavoyCityGate.asm"
+INCLUDE "maps/CoralCity.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 fce47f9..2afdaa4 100644
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/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
diff --git a/data/tilesets/nihon_hightech_attributes.bin b/data/tilesets/nihon_hightech_attributes.bin
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a54a935b1b9c632d28f80ebd6e3ed4896e54ddac 100644
GIT binary patch
literal 1216
zcmcgs?GD2r2$U5U`~ELHPI^U%OS3;?Q9O>XqS+W(UPanQ<PuOvkrMuDB5hs8{doT<
z(N6EJbrV(Wp^5YoV%OZ6hvhAe<xySmbR~vHsfwA;yYY@-V}9~rqF>eE$+)IHbYzBy
zh-V}pY_$`!uHzby`x5*4R&Vba+f-~OHaSn<pChsd!qzvD*=NK#aEjguhU6X1r)p!n
zUjxiR&*Er+YdKC6`Xfif>XSJCkYoZVvN08pKf>$t?uwh{Hm2MCsPV=m|H>ya(tJJP
Oe$P_`3+McAHO2>DNDoB-

literal 0
HcmV?d00001

diff --git a/data/tilesets/nihon_hightech_collision.asm b/data/tilesets/nihon_hightech_collision.asm
index e69de29..bb199c7 100644
--- a/data/tilesets/nihon_hightech_collision.asm
+++ b/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
diff --git a/data/tilesets/nihon_hightech_metatiles.bin b/data/tilesets/nihon_hightech_metatiles.bin
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0b472c6ced2a7160be27381b53ebc2ca01fdd8e4 100644
GIT binary patch
literal 1216
zcma)6ZBN255H2(8)FC>u3|;r7HI|nKg(xvmP>2RK(XXHh?En7^?^ZAENQ~aNU7tR8
zz2kOUS=J@o5zaV+A18YY68#9S(;b=4rnC1Cdu_Ixt%)Mz>kEh<a*`y;QLEKLJ&fZR
zU;@iZ03vP!I7S87q&h}prREE*b0cMLgh1OE2EpC^<&_W*kKJCk*B|r;Qkp^tQ=kok
zVJ3tC8)S42=EuCb?DiT#e}MTgkC3wRqx!6m6jTrSC=d;z6lYp9PMFSjSSiM#USab%
zp5m+>jX9eyT)#Q9ab))oMA7NE`v04k>Nq{C$K&JPgUjB+5T74Dx9KblH(Q5kEQm)2
zJ(9LkaZ_tqC>3N{ySRG%ZXCtmfcW#^;%yzj<)!nekJKNS1CyHwR2rCvVKu6+ZxPJ{
zY!^TmXo1eYAo+!-u>1r)Cw+qYd>-I4acF%G*SP2Fq}r<8u6?vjm+5M~S}$R9wN3$9
zOg;`<59dezWdDjIzJ3Ds-{!UFOm^N+fVFz<`|Bbwo+>~~{#3W+-T$I~5O2?OJYv5O
Q_>EyKicoP~|5}yhH`m9cDgXcg

literal 0
HcmV?d00001

diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal
index bab2395..d73f5d8 100644
--- a/gfx/sgb/predef.pal
+++ b/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
diff --git a/gfx/tilesets/nihon_hightech.png b/gfx/tilesets/nihon_hightech.png
index 5dc4ddc116f98b2eea8505d3c18dc837d0d92265..ed252070cec2689158d2a1a027a69f2b25e09764 100644
GIT binary patch
delta 3244
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
NEKKj;A>MM1{x6P<sj2_~

literal 3271
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
F_a7v`bT|M2

diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal
index f1285c9..b43d7d5 100644
--- a/gfx/tilesets/roofs.pal
+++ b/gfx/tilesets/roofs.pal
@@ -142,11 +142,15 @@
 ; group 29 (Savoy City)
 	RGB 21,22,25, 13,12,31 ; morn/day
 	RGB 11,09,19, 04,03,18 ; nite
+	
+; group 30 (Coral City)
+	RGB 31,14,20, 27,05,16 ; morn/day
+	RGB 14,03,17, 09,03,12 ; nite
 
-; group 30 (Blue Forest)
+; 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
diff --git a/maps/CoralCity.ablk b/maps/CoralCity.ablk
new file mode 100644
index 0000000..0189bee
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/maps/CoralCity.asm b/maps/CoralCity.asm
new file mode 100644
index 0000000..bf12419
--- /dev/null
+++ b/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
+
diff --git a/maps/SavoyCity.asm b/maps/SavoyCity.asm
index 8961956..82aa3a4 100644
--- a/maps/SavoyCity.asm
+++ b/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