Gates, Marts, and Pokecenters!

Ruddy Town is now populated, and Gates, Marts, and Pokecenters now populate the areas. Nihon is more mapped out!
2026-02-07 08:35:23 +13:00 · 2024-12-19 21:47:03 +00:00 · 2024-12-19 21:47:03 +00:00 · 1f1f59874e
commit 1f1f59874e
parent 0287e5cae6
29 changed files with 677 additions and 11 deletions
--- a/data/events/engine_flags.asm
+++ b/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_BLUE_FOREST
 	engine_flag wVisitedSpawns, SPAWN_AVENTURINE_CITY
 	engine_flag wVisitedSpawns, NUM_SPAWNS ; unused

--- a/data/items/marts.asm
+++ b/data/items/marts.asm
@ -37,6 +37,8 @@ Marts:
 	dw MartUnderground
 	dw MartLakeOfRage
 	dw MartOldCity
+	dw MartCoralCity
+	dw MartRuddyTown
 	assert_table_length NUM_MARTS

 MartCherrygrove:
@ -435,3 +437,29 @@ MartOldCity:
 	db MAX_REPEL
 	db PORTRAITMAIL
 	db -1 ; end
+
+MartCoralCity:
+	db 9 ; # items
+	db ULTRA_BALL
+	db HYPER_POTION
+	db FULL_HEAL
+	db REVIVE
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db ICE_HEAL
+	db MYSTIC_WATER
+	db SURF_MAIL
+	db -1 ; end
+	
+MartRuddyTown:
+	db 9 ; # items
+	db GREAT_BALL
+	db SUPER_POTION
+	db REVIVE
+	db ANTIDOTE
+	db PARLYZ_HEAL
+	db AWAKENING
+	db BURN_HEAL
+	db SUPER_REPEL
+	db MUSIC_MAIL
+	db -1 ; end
--- a/data/maps/attributes.asm
+++ b/data/maps/attributes.asm
@ -897,6 +897,12 @@ ENDM
 	map_attributes CoralCity, CORAL_CITY, $04, WEST
 	connection west, Route51, ROUTE_51, 0
 	
+	map_attributes SavoyCityPokecenter1F, SAVOY_CITY_POKECENTER_1F, $00, 0
+	map_attributes CoralCityPokecenter1F, CORAL_CITY_POKECENTER_1F, $00, 0
+	map_attributes RuddyTownPokecenter1F, RUDDY_TOWN_POKECENTER_1F, $00, 0
+	map_attributes CoralMart, CORAL_MART, $00, 0
+	map_attributes RuddyMart, RUDDY_MART, $00, 0
+	
 	map_attributes Route51, ROUTE_51, $05, WEST | EAST
 	connection west, Route52, ROUTE_52, -18
 	connection east, CoralCity, CORAL_CITY, 0
@ -905,6 +911,9 @@ ENDM
 	connection east, Route51, ROUTE_51, 18
 	
 	map_attributes RuddyTown, RUDDY_TOWN, $04, 0
+	map_attributes Route52RuddyTownGate, ROUTE_52_RUDDY_TOWN_GATE, $00, 0
+	map_attributes Route53RuddyTownGate, ROUTE_53_RUDDY_TOWN_GATE, $00, 0
+	map_attributes Route54RuddyTownGate, ROUTE_54_RUDDY_TOWN_GATE, $00, 0

 	map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
 	
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@ -1048,10 +1048,15 @@ Route49_2_Blocks:
 ; All Nihon Pokecenter1Fs go here.
 SilentHillsPokecenter1F_Blocks:
 OldCityPokecenter1F_Blocks:
+SavoyCityPokecenter1F_Blocks:
+CoralCityPokecenter1F_Blocks:
+RuddyTownPokecenter1F_Blocks:
 	INCBIN "maps/NihonPokecenter1F.ablk"

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

 NihonPokecenter2F_Blocks:
@ -1227,6 +1232,10 @@ BlueLab_Blocks:
 	INCBIN "maps/BlueLab.ablk"

 Route49OldCityGate1F_Blocks:
+	INCBIN "maps/NihonGateNorthSouthStairs.ablk" ; 5, 4
+
+Route52RuddyTownGate_Blocks:
+Route54RuddyTownGate_Blocks:
 	INCBIN "maps/NihonGateNorthSouth.ablk" ; 5, 4

 Route49OldCityGate2F_Blocks:
@ -1246,8 +1255,9 @@ WhiteCity_Blocks:
 	
 Route66WhiteCityGate_Blocks:
 Route50SavoyCityGate_Blocks:
-	INCBIN "maps/NihonGateEastWest.ablk"
-	
+Route53RuddyTownGate_Blocks:
+	INCBIN "maps/NihonGateEastWest.ablk" ; 5, 4
+
 OldCityGym_Blocks:
 	INCBIN "maps/OldCityGym.ablk"
 	
--- a/data/maps/flypoints.asm
+++ b/data/maps/flypoints.asm
@ -42,5 +42,6 @@ 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_AVENTURINE_CITY,		  SPAWN_AVENTURINE_CITY
 	db -1 ; end
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@ -736,11 +736,14 @@ MapGroup_SavoyCity:
 	table_width MAP_LENGTH, 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
+	map SavoyCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SAVOY_CITY, MUSIC_POKEMON_CENTER, 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
+	map CoralCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CORAL_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map CoralMart, TILESET_NIHON_MART, INDOOR, LANDMARK_CORAL_CITY, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
 	map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_CORAL_CITY_MAPS
@ -748,6 +751,11 @@ MapGroup_CoralCity:
 MapGroup_RuddyTown:
 	table_width MAP_LENGTH, MapGroup_RuddyTown
 	map RuddyTown, TILESET_NIHON_SOUTH, TOWN, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
+	map RuddyTownPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map RuddyMart, TILESET_NIHON_MART, INDOOR, LANDMARK_RUDDY_TOWN, MUSIC_MART, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map Route52RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_52, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
+	map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made
+	map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above
 	assert_table_length NUM_RUDDY_TOWN_MAPS

 MapGroup_BlueForest:
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@ -336,7 +336,6 @@ IndigoGroupSprites:
 BlueForestGroupSprites: 	; Will have its own thing eventually
 AventurineCityGroupSprites:	; Ditto
 WhiteCityGroupSprites:  	; Ditto
-RuddyTownGroupSprites:  	; Ditto
 NewBarkGroupSprites:
 	db SPRITE_SUICUNE
 	db SPRITE_SILVER_TROPHY
@ -808,3 +807,30 @@ CoralCityGroupSprites:
 	; 2 non-walking sprites
 	db SPRITE_POKE_BALL
 	db SPRITE_FRUIT_TREE
+
+RuddyTownGroupSprites:
+	; 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_TEACHER
+	db SPRITE_TWIN
+	db SPRITE_ROCKER
+	db SPRITE_FISHING_GURU
+	db SPRITE_SWIMMER_GUY
+	db SPRITE_SWIMMER_GIRL
+	db SPRITE_RIVAL
+	db SPRITE_YOUNGSTER
+	; 2 non-walking sprites
+	db SPRITE_POKE_BALL
+	db SPRITE_FRUIT_TREE
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@ -606,6 +606,14 @@ INCLUDE "maps/SummerBeachHouse.asm"
 INCLUDE "maps/HauntedHouseFoyer.asm"
 INCLUDE "maps/HauntedHouse1F.asm"
 INCLUDE "maps/HauntedHouse2F.asm"
+INCLUDE "maps/Route52RuddyTownGate.asm"
+INCLUDE "maps/Route53RuddyTownGate.asm"
+INCLUDE "maps/Route54RuddyTownGate.asm"
+INCLUDE "maps/SavoyCityPokecenter1F.asm"
+INCLUDE "maps/CoralCityPokecenter1F.asm"
+INCLUDE "maps/RuddyTownPokecenter1F.asm"
+INCLUDE "maps/CoralMart.asm"
+INCLUDE "maps/RuddyMart.asm"

 SECTION "Map Scripts 31", ROMX ; spillover
 INCLUDE "maps/TanobyRuins.asm"
--- a/data/maps/spawn_points.asm
+++ b/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 BLUE_FOREST,				  13, 19
 	spawn AVENTURINE_CITY,			  33, 21
 	
 	spawn N_A,                        -1, -1