Sunglow Flypoint Setup

constants/engine_flags.asm

@@ -110,6 +110,7 @@
 	const ENGINE_FLYPOINT_SAVOY
 	const ENGINE_FLYPOINT_CORAL
 	const ENGINE_FLYPOINT_RUDDY
+	const ENGINE_FLYPOINT_SUNGLOW_CITY
 	const ENGINE_FLYPOINT_BLUE_FOREST
 	const ENGINE_FLYPOINT_AVENTURINE
 	const ENGINE_FLYPOINT_UNUSED

constants/landmark_constants.asm

@@ -142,6 +142,8 @@ DEF NIHON_LANDMARK EQU const_value
 	const LANDMARK_ROUTE_51
 	const LANDMARK_ROUTE_52
 	const LANDMARK_RUDDY_TOWN
+	const LANDMARK_ROUTE_57
+	const LANDMARK_SUNGLOW_CITY
 	const LANDMARK_BLUE_FOREST
 	const LANDMARK_AVENTURINE_CITY
 	const LANDMARK_ROUTE_66

constants/map_data_constants.asm

@@ -118,6 +118,7 @@ DEF NUM_FISHGROUPS EQU const_value - 1
 	const SPAWN_SAVOY_CITY
 	const SPAWN_CORAL_CITY
 	const SPAWN_RUDDY_TOWN
+	const SPAWN_SUNGLOW_CITY
 	const SPAWN_BLUE_FOREST
 	const SPAWN_AVENTURINE_CITY
 DEF NUM_SPAWNS EQU const_value
@@ -169,6 +170,8 @@ DEF NIHON_FLYPOINT EQU const_value
 	const FLY_SAVOY_CITY
 	const FLY_CORAL_CITY
 	const FLY_RUDDY_TOWN
+	const FLY_SUNGLOW_CITY
+	const FLY_BLUE_FOREST
 	const FLY_AVENTURINE_CITY
 DEF NUM_FLYPOINTS EQU const_value
 

data/events/engine_flags.asm

@@ -120,6 +120,7 @@ EngineFlags:
 	engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY
 	engine_flag wVisitedSpawns, SPAWN_CORAL_CITY
 	engine_flag wVisitedSpawns, SPAWN_RUDDY_TOWN
+	engine_flag wVisitedSpawns, SPAWN_SUNGLOW_CITY
 	engine_flag wVisitedSpawns, SPAWN_BLUE_FOREST
 	engine_flag wVisitedSpawns, SPAWN_AVENTURINE_CITY
 	engine_flag wVisitedSpawns, NUM_SPAWNS ; unused

data/maps/flypoints.asm

@@ -42,6 +42,7 @@ Flypoints:
 	db LANDMARK_SAVOY_CITY,		  SPAWN_SAVOY_CITY
 	db LANDMARK_CORAL_CITY,		  SPAWN_CORAL_CITY
 	db LANDMARK_RUDDY_TOWN,		  SPAWN_RUDDY_TOWN
-	db LANDMARK_BLUE_FOREST,		SPAWN_BLUE_FOREST
+	db LANDMARK_SUNGLOW_CITY,	  SPAWN_SUNGLOW_CITY
-	db LANDMARK_AVENTURINE_CITY,		  SPAWN_AVENTURINE_CITY
+	db LANDMARK_BLUE_FOREST,	  SPAWN_BLUE_FOREST
+	db LANDMARK_AVENTURINE_CITY,  SPAWN_AVENTURINE_CITY
 	db -1 ; end

data/maps/landmarks.asm

@@ -143,9 +143,11 @@ Landmarks:
 	landmark 68, 100, Route50Name
 	landmark 60, 100, SavoyCityName
 	landmark  36, 92, CoralCityName
-	landmark  24, 92, Route52Name
+	landmark  24, 92, Route51Name
-	landmark  12, 84, Route53Name
+	landmark  12, 84, Route52Name
 	landmark  12, 68, RuddyTownName
+	landmark  60, 88, Route57Name
+	landmark  60, 76, SunglowCityName
 	landmark 140, 60, BlueForestName
 	landmark 140, 84, AventurineCityName
 	landmark 108, 108, Route66Name
@@ -271,14 +273,16 @@ UnknownName:         db "?????@"
 Route66Name:         db "ROUTE 66@"
 Route49Name:         db "ROUTE 49@"
 Route50Name:		 db "ROUTE 50@"
-Route52Name:		 db "ROUTE 51@"
+Route51Name:		 db "ROUTE 51@"
-Route53Name:		 db "ROUTE 52@"
+Route52Name:		 db "ROUTE 52@"
+Route57Name:		 db "ROUTE 57@"
 QuietCaveName:       db "QUIET¯CAVE@"
 OldCityName:		 db "SEPIA¯CITY@"
 PokemonPagodaName:	 db "#MON¯PAGODA@"
 SavoyCityName:		 db "SAVOY¯CITY@"
 CoralCityName:		 db "CORAL¯CITY@"
 RuddyTownName:		 db "RUDDY¯TOWN@"
+SunglowCityName:     db "SUNGLOW¯CITY@"
 BlueForestName:      db "BLUE¯FOREST@"
 AventurineCityName:  db "AVENTURINE¯CITY@"
 WhiteCityName:       db "WHITE¯CITY@"

data/maps/maps.asm

@@ -761,8 +761,8 @@ MapGroup_RuddyTown:
 
 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 Route57, TILESET_NIHON_BIRDON, ROUTE, LANDMARK_ROUTE_57, 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
+	map SunglowCity, TILESET_NIHON_BIRDON, TOWN, LANDMARK_SUNGLOW_CITY, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_SUNGLOW_CITY_MAPS
 
 MapGroup_BlueForest:

data/maps/spawn_points.asm

@@ -52,6 +52,7 @@ SpawnPoints:
 	spawn SAVOY_CITY,				  25, 15
 	spawn CORAL_CITY,				  31, 11
 	spawn RUDDY_TOWN,				  31, 15
+	spawn SUNGLOW_CITY,				  15, 15
 	spawn BLUE_FOREST,				  13, 19
 	spawn AVENTURINE_CITY,			  33, 21
 	

maps/SunglowCity.asm

@@ -4,6 +4,11 @@ SunglowCity_MapScripts:
 	def_scene_scripts
 
 	def_callbacks
+	callback MAPCALLBACK_NEWMAP, .Flypoint
+
+.Flypoint:
+	setflag ENGINE_FLYPOINT_SUNGLOW_CITY
+	return
 
 SunglowCity_MapEvents:
 	db 0, 0 ; filler