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
This commit is contained in:
Martha Schilling 2023-07-12 14:16:41 +01:00
parent 85e1701879
commit 0852d5f725
15 changed files with 106 additions and 86 deletions

View file

@ -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