A few bug fixes

- Fixed a bug where attempting to Fly on Celeste Hill caused a huge memory corruption effect. Oops. - Fixed text issues on Route 1 and Museum 2F - Tidied up trainer parties a little more
2026-04-08 11:31:55 +12:00 · 2023-07-12 14:16:41 +01:00 · 2023-07-12 14:16:41 +01:00 · 0852d5f725
commit 0852d5f725
parent 85e1701879
15 changed files with 106 additions and 86 deletions
--- a/data/maps/dungeon_maps.asm
+++ b/data/maps/dungeon_maps.asm
@ -13,6 +13,9 @@ DungeonMaps1:
 	db DIGLETTS_CAVE
 	db UNDERWATER_TUNNEL
 	db CINNABAR_VOLCANO_FLOORS
+	db CELESTE_HILL
+	db CELESTE_HILL_OUTSIDE
+	db CELESTE_HILL_CAVE
 	db -1 ; end

 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap
--- a/data/maps/names.asm
+++ b/data/maps/names.asm
@ -54,7 +54,9 @@ PokemonMansionName:  db "<PKMN> MANSION@"
 SafariZoneName:      db "SAFARI ZONE@"
 CeruleanCaveName:    db "CERULEAN CAVE@"
 PowerPlantName:      db "POWER PLANT@"
-FarawayIslandName:	 db "FARAWAY ISLAND@"
+FarawayIslandName:   db "FARAWAY ISLAND@"
 UnderwaterTunnelName: db "UNDERWATER TUNNEL@"
-BrunswickTrailName: db "BRUNSWICK TRAIL@"
-CelesteHillName: db "CELESTE HILL@"
+BrunswickTrailName:  db "BRUNSWICK TRAIL@"
+BrunswickGrottoName: db "BRUNSWICK GROTTO@"
+GarnetCavernName:    db "GARNET CAVERN@"
+CelesteHillName:     db "CELESTE HILL@"
--- a/data/maps/objects/BrunswickGrotto.asm
+++ b/data/maps/objects/BrunswickGrotto.asm
@ -1,5 +1,5 @@
 BrunswickGrotto_Object:
-	db $0 ; border block
+	db $3 ; border block

 	def_warp_events
 	warp_event 24, 23, BRUNSWICK_TRAIL, 2
--- a/data/maps/objects/CelesteHillCave.asm
+++ b/data/maps/objects/CelesteHillCave.asm
@ -4,7 +4,7 @@ CelesteHillCave_Object:
 	def_warp_events
 	warp_event 18, 35, CELESTE_HILL_OUTSIDE, 3
 	warp_event 19, 35, CELESTE_HILL_OUTSIDE, 3
-	warp_event 19, 25, CELESTE_HILL_CAVE, 4
+	warp_event 19, 23, CELESTE_HILL_CAVE, 4
 	warp_event 2, 16, CELESTE_HILL_CAVE, 3
 	warp_event 37, 13, CELESTE_HILL_OUTSIDE, 4
 	warp_event  5,  3, CELESTE_HILL_OUTSIDE, 5
--- a/data/maps/objects/Museum2F.asm
+++ b/data/maps/objects/Museum2F.asm
@ -5,8 +5,8 @@ Museum2F_Object:
 	warp_event  7,  7, MUSEUM_1F, 5

 	def_bg_events
-	bg_event 11,  2, 6 ; Museum2FText6
-	bg_event  2,  5, 7 ; Museum2FText7
+	bg_event 11,  2, 7 ; Museum2FText6
+	bg_event  2,  5, 8 ; Museum2FText7

 	def_object_events
 	object_event  1,  7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
@ -14,6 +14,6 @@ Museum2F_Object:
 	object_event  7,  5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
 	object_event 11,  5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
 	object_event 12,  5, SPRITE_HIKER, STAY, DOWN, 5 ; person
-	object_event 12,  3, SPRITE_SCIENTIST, STAY, UP, 8 ; person
+	object_event 12,  3, SPRITE_SCIENTIST, STAY, UP, 6 ; person

 	def_warps_to MUSEUM_2F
--- a/data/maps/objects/Route1.asm
+++ b/data/maps/objects/Route1.asm
@ -4,12 +4,12 @@ Route1_Object:
 	def_warp_events

 	def_bg_events
-	bg_event  9, 27, 3 ; Route1Text3
+	bg_event  9, 27, 4 ; Route1Text3

 	def_object_events
 	object_event  5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
 	object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
-	object_event 10, 25, SPRITE_OAK, STAY, RIGHT, 4 ; oak
+	object_event 10, 25, SPRITE_OAK, STAY, RIGHT, 3 ; oak

 	def_warps_to ROUTE_1

--- a/data/maps/town_map_entries.asm
+++ b/data/maps/town_map_entries.asm
@ -19,7 +19,7 @@ ExternalMapEntries:
 	external_map 10,  5, SaffronCityName
 	external_map  2, 15, CinnabarIslandName
 	external_map  0,  2, IndigoPlateauName
-	external_map  7,  9, CitrineCityName
+	external_map  7, 10, CitrineCityName
 	external_map  2, 10, Route1Name
 	external_map  2,  6, Route2Name
 	external_map  4,  3, Route3Name
@ -45,7 +45,7 @@ ExternalMapEntries:
 	external_map  0,  6, Route23Name
 	external_map 10,  1, Route24Name
 	external_map 11,  0, Route25Name
-	external_map  7, 10, BrunswickTrailName
+	external_map  6, 11, BrunswickTrailName
 	external_map 12,  0, SeaCottageName
 	assert_table_length FIRST_INDOOR_MAP

@ -70,7 +70,9 @@ InternalMapEntries:
 	internal_map VIRIDIAN_PRE_GYM,              10,  2, ViridianCityName
 	internal_map DAYCARE,                       10,  4, Route5Name
 	internal_map UNDERGROUND_PATH_ROUTE_6,      10,  8, Route6Name
-	internal_map CELESTE_HILL,                   6, 10, CelesteHillName
+	internal_map CELESTE_HILL,                   7,  9, CelesteHillName
+	internal_map UNDERGROUND_PATH_ROUTE_7,       8,  5, Route7Name
+	internal_map CITRINE_ROCKET_HOUSE,           7, 10, CitrineCityName
 	internal_map UNDERGROUND_PATH_ROUTE_8,      11,  5, Route8Name
 	internal_map ROCK_TUNNEL_1F,                14,  3, RockTunnelName
 	internal_map POWER_PLANT,                   15,  4, PowerPlantName
@ -92,12 +94,15 @@ InternalMapEntries:
 	internal_map UNDERGROUND_PATH_WEST_EAST,    10,  5, UndergroundPathName
 	internal_map CELADON_HOTEL,                  7,  5, CeladonCityName
 	internal_map LAVENDER_POKECENTER,           14,  5, LavenderTownName
+	internal_map POKEMON_TOWER_2F,              15,  5, PokemonTowerName
+	internal_map BRUNSWICK_GROTTO,               6, 10, BrunswickGrottoName
 	internal_map POKEMON_TOWER_7F,              15,  5, PokemonTowerName
 	internal_map LAVENDER_CUBONE_HOUSE,         14,  5, LavenderTownName
 	internal_map WARDENS_HOUSE,                  8, 13, FuchsiaCityName
 	internal_map SAFARI_ZONE_GATE,               8, 12, SafariZoneName
 	internal_map FUCHSIA_MEETING_ROOM,           8, 13, FuchsiaCityName
 	internal_map SEAFOAM_ISLANDS_B4F,            5, 15, SeafoamIslandsName
+	internal_map CITRINE_POKECENTER,             7, 10, CitrineCityName
 	internal_map POKEMON_MANSION_1F,             2, 15, PokemonMansionName
 	internal_map CINNABAR_MART,                  2, 15, CinnabarIslandName
 	internal_map INDIGO_PLATEAU_LOBBY,           0,  2, IndigoPlateauName
@ -113,7 +118,9 @@ InternalMapEntries:
 	internal_map VERMILION_TRADE_HOUSE,         10,  9, VermilionCityName
 	internal_map DIGLETTS_CAVE,                  3,  4, DiglettsCaveName
 	internal_map VICTORY_ROAD_3F,                0,  4, VictoryRoadName
-	internal_map ROCKET_HIDEOUT_B1F,             7,  5, RocketHQName
+	internal_map ROCKET_HIDEOUT_ELEVATOR,        7,  5, RocketHQName
+	internal_map CITRINE_MART,                   7, 10, CitrineCityName
+	internal_map GARNET_CAVERN_B1F,              6, 10, GarnetCavernName
 	internal_map SILPH_CO_8F,                   10,  5, SilphCoName
 	internal_map POKEMON_MANSION_B1F,            2, 15, PokemonMansionName
 	internal_map SAFARI_ZONE_NORTH_REST_HOUSE,   8, 12, SafariZoneName
@ -122,6 +129,7 @@ InternalMapEntries:
 	internal_map CERULEAN_BADGE_HOUSE,          10,  2, CeruleanCityName
 	internal_map CINNABAR_VOLCANO_FLOORS,        3, 14, CinnabarVolcanoName
 	internal_map SILPH_CO_ELEVATOR,             10,  5, SilphCoName
+	internal_map GARNET_CAVERN_2F,               6, 10, GarnetCavernName
 	internal_map UNDERWATER_TUNNEL,             14,  1, UnderwaterTunnelName
 	internal_map CELADON_UNIVERSITY_POKECENTER,  7,  4, CeladonUniversityName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
@ -129,4 +137,5 @@ InternalMapEntries:
 	internal_map GIOVANNIS_ROOM,                 2,  8, ViridianCityName
 	internal_map BATTLE_TENT,                    7,  9, CitrineCityName
 	internal_map MT_MOON_SQUARE_HOUSE,           6,  1, MountMoonName
+	internal_map CELESTE_HILL_OUTSIDE,           7,  9, CelesteHillName
 	db -1 ; end
--- a/data/maps/town_map_order.asm
+++ b/data/maps/town_map_order.asm
@ -51,7 +51,7 @@ TownMapOrder:
 	db INDIGO_PLATEAU
 	db CITRINE_CITY
 	db BRUNSWICK_TRAIL
+	db GARNET_CAVERN_1F
 	db CELESTE_HILL
 	db FARAWAY_ISLAND_OUTSIDE
-	db BATTLE_TENT
 TownMapOrderEnd: