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.
2026-02-06 16:15:24 +13:00 · 2024-07-22 23:40:53 +01:00 · 2024-07-22 23:40:53 +01:00 · 4eb81eec25
commit 4eb81eec25
parent aa970c326e
47 changed files with 699 additions and 147 deletions
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@ -813,16 +813,24 @@ ENDM
 	
 	map_attributes Route66, ROUTE_66, $05, WEST | SOUTH
 	connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
-	connection west, SilentHills, SILENT_HILLS, 0
 	
-	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
-	map_attributes BlueLab, BLUE_LAB, $00, 0
+	connection west, SilentHills, SILENT_HILLS, 0
 	map_attributes QuietCave, QUIET_CAVE, $76, 0
+	map_attributes BlueLab, BLUE_LAB, $00, 0
 	map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
 	map_attributes SilversHouse, SILVERS_HOUSE, $00, 0
 	map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0
 	map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0
-	map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
-	map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0
+	
+	map_attributes OldCity, OLD_CITY, $00, 0 ; will have a west exit.
+	
 	map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0
 	map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0
+	map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, $00, 0
+	map_attributes OldMart, OLD_MART, $00, 0
+	map_attributes HoneyGrandmasHouse, HONEY_GRANDMAS_HOUSE, $00, 0
+	
+	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
+	
+	map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
+	map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@ -1039,8 +1039,13 @@ Route49_2_Blocks:

 ; All Nihon Pokecenter1Fs go here.
 SilentHillsPokecenter1F_Blocks:
+OldCityPokecenter1F_Blocks:
 	INCBIN "maps/NihonPokecenter1F.ablk"

+; All generic Nihon Pokemarts go here.
+OldMart_Blocks:
+	INCBIN "maps/NihonMart.ablk"
+
 NihonPokecenter2F_Blocks:
 	INCBIN "maps/NihonPokecenter2F.ablk"

@ -1219,3 +1224,9 @@ Route49OldCityGate2F_Blocks:

 ;InsertGateNameHere_Blocks:
 ;	INCBIN "maps/NihonGateWestEast.ablk"
+
+OldCity_Blocks:
+	INCBIN "maps/OldCity.ablk"
+
+HoneyGrandmasHouse_Blocks:
+	INCBIN "maps/HoneyGrandmasHouse.ablk"
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@ -29,4 +29,5 @@ Flypoints:
 	db LANDMARK_INDIGO_PLATEAU,   SPAWN_INDIGO
 ; Nihon
 	db LANDMARK_SILENT_HILLS,	  SPAWN_SILENT_HILLS
+	db LANDMARK_OLD_CITY,	 	  SPAWN_OLD_CITY
 	db -1 ; end
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@ -131,12 +131,13 @@ Landmarks:
 	landmark   0,   0, UnknownName ; Seven Island
 	assert_table_length NIHON_LANDMARK
 	landmark 108, 116, WinnersPathName
-	landmark 108, 108, Route66Name
 	landmark  92, 108, SilentHillsName
 	landmark 20,  28, UnknownName ; Debug Room 
 	landmark 84, 108, Route49Name
 	landmark 76, 108, QuietCaveName
+	landmark 76, 100, OldCityName
 	landmark 140, 60, BlueForestName
+	landmark 108, 108, Route66Name
 	assert_table_length NUM_LANDMARKS

 NewBarkTownName:     db "NEW BARK¯TOWN@"
@ -248,4 +249,5 @@ UnknownName:         db "?????@"
 Route66Name:         db "ROUTE 66@"
 Route49Name:         db "ROUTE 49@"
 QuietCaveName:       db "QUIET¯CAVE@"
+OldCityName:		 db "OLD CITY@" ; I've considered the name "Archaic City", whereas "High Tech" will be "Vogue City". Thoughts? Archaic is considered a little snarly in modern day, so I haven't put it in yet.
 BlueForestName:      db "BLUE¯FOREST@"
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -52,7 +52,8 @@ MapGroupPointers::
 	dw MapGroup_SixIsland	; 33
 	dw MapGroup_SevenIsland	; 34
 	dw MapGroup_SilentHills ; 35
-	dw MapGroup_BlueForest  ; 36
+	dw MapGroup_OldCity		; 36
+	dw MapGroup_BlueForest  ; 37
 	assert_table_length NUM_MAP_GROUPS

 MapGroup_Olivine:
@ -691,7 +692,15 @@ MapGroup_SilentHills:
 	map Route49OldCityGate2F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	assert_table_length NUM_SILENT_HILLS_MAPS
-	
+
+MapGroup_OldCity:
+	table_width MAP_LENGTH, MapGroup_OldCity
+	map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	assert_table_length NUM_OLD_CITY_MAPS
+
 MapGroup_BlueForest:
 	table_width MAP_LENGTH, MapGroup_BlueForest
 	map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@ -39,6 +39,7 @@ OutdoorSprites:
 	dw SixIslandGroupSprites
 	dw SevenIslandGroupSprites
 	dw SilentHillsGroupSprites
+	dw OldCityGroupSprites
 	dw BlueForestGroupSprites
 	assert_table_length NUM_MAP_GROUPS

@ -717,3 +718,31 @@ SilentHillsGroupSprites:
 	; 2 non-walking sprites
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
+
+OldCityGroupSprites:
+	; 12 non-walking filler sprites
+	db SPRITE_SUICUNE
+	db SPRITE_SILVER_TROPHY
+	db SPRITE_FAMICOM
+	db SPRITE_POKEDEX
+	db SPRITE_WILL
+	db SPRITE_ROCKER
+	db SPRITE_NURSE
+	db SPRITE_FISHER
+	db SPRITE_BIG_LAPRAS
+	db SPRITE_BIG_ONIX
+	db SPRITE_SUDOWOODO
+	db SPRITE_RIVAL
+	; 9 walking sprites
+	db SPRITE_GRAMPS
+	db SPRITE_TWIN
+	db SPRITE_BUG_CATCHER
+	db SPRITE_YOUNGSTER
+	db SPRITE_BEAUTY
+	db SPRITE_SUPER_NERD
+	db SPRITE_GRANNY
+	db SPRITE_MONSTER
+	; 2 non-walking sprites
+	db SPRITE_POKE_BALL
+	db SPRITE_FRUIT_TREE
+
--- a/data/maps/roofs.asm
+++ b/data/maps/roofs.asm
@ -47,7 +47,8 @@ MapGroupRoofs:
 	db ROOF_VIOLET	  ; 33 (Six Island)
 	db ROOF_VIOLET	  ; 34 (Seven Island)
 	db ROOF_NEW_BARK  ; 35 (Silent Hills)
-	db ROOF_NEW_BARK  ; 36 (Blue Forest)
+	db ROOF_VIOLET    ; 36 (Old City)
+	db ROOF_NEW_BARK  ; 37 (Blue Forest)
 	assert_table_length NUM_MAP_GROUPS + 1

 Roofs:
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@ -578,8 +578,12 @@ INCLUDE "maps/WinnersPath.asm"
 INCLUDE "maps/WinnersPathOutside.asm"
 INCLUDE "maps/Route66.asm"
 INCLUDE "maps/BlueLab.asm"
+INCLUDE "maps/OldCity.asm"
+INCLUDE "maps/OldCityPokecenter1F.asm"
+INCLUDE "maps/OldMart.asm"
+INCLUDE "maps/HoneyGrandmasHouse.asm"

-SECTION "Map Scripts 30", ROMX
+SECTION "Map Scripts 30", ROMX ; spillover
 INCLUDE "maps/TanobyRuins.asm"
 INCLUDE "maps/TanobyChambers.asm"
 INCLUDE "maps/NavalRockExterior.asm"
--- a/data/maps/sgb_roof_pal_inds.asm
+++ b/data/maps/sgb_roof_pal_inds.asm
@ -39,5 +39,6 @@ MapGroupRoofSGBPalInds:
 	db PREDEFPAL_SIX_ISLAND
 	db PREDEFPAL_SEVEN_ISLAND
 	db PREDEFPAL_SILENT_HILLS
+	db PREDEFPAL_ECRUTEAK
 	db PREDEFPAL_BLUE_FOREST
 	assert_table_length NUM_MAP_GROUPS + 1
--- a/data/maps/spawn_points.asm
+++ b/data/maps/spawn_points.asm
@ -40,6 +40,7 @@ SpawnPoints:
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
 	
 	spawn SILENT_HILLS,				  13,  5
+	spawn OLD_CITY,				  	  27, 29
 	
 	spawn N_A,                        -1, -1