OId City

This implements Old City, the Honey Grandma's House, and its Pokecenter+Mart. Bunch of other bits and pieces not added yet, need to figure out the lore for them.

Honey Grandma is designed to make it easier to get important Pokemon, rather than give access to anything new. Thus, she's Nihon-locked by being an Old City resident. Martha's Perfect Rod will follow this trend.

Gold Berry tree exists to make them renewable in-game, I think this is very important.

The flypoint seems bugged.

constants/engine_flags.asm

@@ -90,6 +90,7 @@
 	const ENGINE_FLYPOINT_BLACKTHORN
 	const ENGINE_FLYPOINT_SILVER_CAVE
 	const ENGINE_FLYPOINT_SILENT_HILLS
+	const ENGINE_FLYPOINT_OLD
 	const ENGINE_FLYPOINT_UNUSED
 ; wLuckyNumberShowFlag
 	const ENGINE_LUCKY_NUMBER_SHOW

constants/landmark_constants.asm

@@ -127,12 +127,13 @@ DEF KANTO_LANDMARK EQU const_value
 	const LANDMARK_SEVEN_ISLAND
 DEF NIHON_LANDMARK EQU const_value
 	const LANDMARK_WINNERS_PATH
-	const LANDMARK_ROUTE_66
 	const LANDMARK_SILENT_HILLS
 	const LANDMARK_DEBUG_ROOM
 	const LANDMARK_ROUTE_49
 	const LANDMARK_QUIET_CAVE
+	const LANDMARK_OLD_CITY
 	const LANDMARK_BLUE_FOREST
+	const LANDMARK_ROUTE_66
 DEF NUM_LANDMARKS EQU const_value
 
 ; used in CaughtData

constants/map_constants.asm

@@ -166,7 +166,7 @@ ENDM
 	map_const ECRUTEAK_GYM,                                 5,  9 ;  7
 	map_const ECRUTEAK_ITEMFINDER_HOUSE,                    4,  4 ;  8
 	map_const ECRUTEAK_CITY,                               20, 18 ;  9
-    map_const BELLCHIME_TRAIL,                             12,  7
+    map_const BELLCHIME_TRAIL,                             12,  7 ; 10
 	endgroup
 
 	newgroup BLACKTHORN                                           ;  5
@@ -635,6 +635,13 @@ ENDM
 	map_const BLUE_LAB,									   12, 10 ; 17
 	endgroup
 	
+	newgroup OLD_CITY
+	map_const OLD_CITY,										20, 18 ; 1
+	map_const OLD_CITY_POKECENTER_1F,						10,  4 ; 2
+	map_const OLD_MART,								 		 8,  4 ; 3
+	map_const HONEY_GRANDMAS_HOUSE,							 5,  5 ; 4
+	endgroup
+	
 	newgroup BLUE_FOREST                                          ; 36
 	map_const BLUE_FOREST,                                 20, 18 ; 1
 	endgroup

constants/map_data_constants.asm

@@ -104,6 +104,7 @@ DEF NUM_FISHGROUPS EQU const_value - 1
 	const SPAWN_FAST_SHIP
 ; nihon
 	const SPAWN_SILENT_HILLS
+	const SPAWN_OLD_CITY
 DEF NUM_SPAWNS EQU const_value
 
 DEF SPAWN_N_A EQU -1

constants/mart_constants.asm

@@ -43,4 +43,5 @@
 	const MART_INDIGO_PLATEAU
 	const MART_UNDERGROUND
 	const MART_LAKEOFRAGE
+	const MART_OLDCITY
 DEF NUM_MARTS EQU const_value

constants/scgb_constants.asm

@@ -80,6 +80,7 @@ DEF SCGB_DEFAULT EQU $ff
 	const PREDEFPAL_SIX_ISLAND
 	const PREDEFPAL_SEVEN_ISLAND
 	const PREDEFPAL_SILENT_HILLS
+	const PREDEFPAL_OLD_CITY
 	const PREDEFPAL_BLUE_FOREST
 	const PREDEFPAL_NITE
 	const PREDEFPAL_BLACKOUT

constants/script_constants.asm

@@ -239,6 +239,7 @@ DEF EMOTE_LENGTH EQU 6
 	const FRUITTREE_PEWTER_CITY_1 ; 1c
 	const FRUITTREE_PEWTER_CITY_2 ; 1d
 	const FRUITTREE_FUCHSIA_CITY  ; 1e
+	const FRUITTREE_OLD_CITY	  ; 1F
 DEF NUM_FRUIT_TREES EQU const_value - 1
 
 ; describedecoration arguments

constants/tileset_constants.asm

@@ -49,6 +49,7 @@
 	const TILESET_LAVENDER_CRYPT	   ; 2F
 	const TILESET_BLUE_LAB			   ; 30
 	const TILESET_NIHON_GATE		   ; 31
+	const TILESET_NIHON_MART		   ; 32
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size