Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-05-20 11:38:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
83979375d3
pokeemerald/data/maps
History
Martin Griffin bb781f21a1
Arbitrary trainer scripts + map script/trigger softlock prevention (#5033) 
Script_RunImmediatelyUntilEffect runs a script until either a specified
effect may occur or it reaches an end.

All existing script commands and natives, and some specials, call
Script_RequestEffects which allows us to analyze them.

Any downstream script commands/natives/specials will be statically known
not to call Script_RequestEffects and treated as if they have all
effects. Manually tagging them with requests_effects=1 and calling
Script_RequestEffects will make them analyzable.

Using these, we're able to execute scripts until they either exit with
no effect, or would possibly have an effect. This allows us to:
1. Not run on frame map scripts or triggers if they would have no
   effect.
2. Immediately run triggers if they only affect flags/vars. This removes
   the lag frames when biking into the Cycling Road, for example.
3. Migrate on load/on transition/on resume/on return to field/on dive
   warp scripts onto the global script context if they would block
   (approximated via SCREFF_HARDWARE).
4. Support arbitrary control flow in trainer scripts. The trainer does
   not see the player if the script has no effect, and the trainer will
   use whichever trainerbattle command is branched to.
5. Support arbitrary scripts in trainer scripts. cant_see and
   cant_see_if_* commands have been introduced so that scripts are able
   to do something when the player interacts with the trainer even if
   that trainer wouldn't see them.
2025-01-08 10:27:00 +00:00
..
AbandonedShip_CaptainsOffice Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Corridors_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AbandonedShip_Corridors_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AbandonedShip_Deck Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AbandonedShip_HiddenFloorCorridors Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 2022-10-30 12:30:38 -03:00
AbandonedShip_HiddenFloorRooms Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Room_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Rooms_1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Rooms_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Rooms2_1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Rooms2_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AbandonedShip_Underwater1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AbandonedShip_Underwater2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AlteringCave Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AncientTomb Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05:00
AquaHideout_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
AquaHideout_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AquaHideout_B2F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
AquaHideout_UnusedRubyMap1 Remove address comments 2021-07-20 15:18:31 -04:00
AquaHideout_UnusedRubyMap2 Remove address comments 2021-07-20 15:18:31 -04:00
AquaHideout_UnusedRubyMap3 Remove address comments 2021-07-20 15:18:31 -04:00
ArtisanCave_1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
ArtisanCave_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
BattleColosseum_2P Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleColosseum_4P Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_BattleArenaBattleRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattleArenaCorridor Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
BattleFrontier_BattleArenaLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattleDomeBattleRoom Undo map.json changes. 2024-02-15 22:23:59 -05:00
BattleFrontier_BattleDomeCorridor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_BattleDomeLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattleDomePreBattleRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_BattleFactoryBattleRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattleFactoryLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattleFactoryPreBattleRoom Added missing uses of Fairy type for Union Room and Battle Factory 2022-09-11 12:41:56 -04:00
BattleFrontier_BattlePalaceBattleRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_BattlePalaceCorridor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_BattlePalaceLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattlePikeCorridor Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
BattleFrontier_BattlePikeLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattlePikeRoomFinal Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
BattleFrontier_BattlePikeRoomNormal Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
BattleFrontier_BattlePikeRoomWildMons Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePikeThreePathRoom Add temp var aliases 2023-08-04 14:17:28 -04:00
BattleFrontier_BattlePyramidFloor Add temp var aliases 2023-08-04 14:17:28 -04:00
BattleFrontier_BattlePyramidLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattlePyramidTop Add temp var aliases 2023-08-04 14:17:28 -04:00
BattleFrontier_BattleTowerBattleRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_BattleTowerCorridor Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerElevator Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerLobby Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
BattleFrontier_BattleTowerMultiBattleRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerMultiCorridor Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerMultiPartnerRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
BattleFrontier_ExchangeServiceCorner Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge6 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge7 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
BattleFrontier_Lounge8 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Lounge9 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_Mart Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
BattleFrontier_OutsideEast Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
BattleFrontier_OutsideWest Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
BattleFrontier_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_RankingHall Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_ReceptionGate Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattleFrontier_ScottsHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
BattlePyramidSquare01 Remove address comments 2021-07-20 15:18:31 -04:00
BattlePyramidSquare02 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare03 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare04 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare05 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare06 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare07 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare08 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare09 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare10 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare11 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare12 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare13 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare14 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare15 Use trainer type constants 2020-04-28 19:59:08 -05:00
BattlePyramidSquare16 Use trainer type constants 2020-04-28 19:59:08 -05:00
BirthIsland_Exterior Add species defines for base forms with names (#3248) 2023-10-23 12:59:15 +01:00
BirthIsland_Harbor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
CaveOfOrigin_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
CaveOfOrigin_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
CaveOfOrigin_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
CaveOfOrigin_UnusedRubySapphireMap1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
CaveOfOrigin_UnusedRubySapphireMap2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
CaveOfOrigin_UnusedRubySapphireMap3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
ContestHall Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
ContestHallBeauty Give songs meaningful english names 2020-08-20 19:06:14 -04:00
ContestHallCool Give songs meaningful english names 2020-08-20 19:06:14 -04:00
ContestHallCute Give songs meaningful english names 2020-08-20 19:06:14 -04:00
ContestHallSmart Give songs meaningful english names 2020-08-20 19:06:14 -04:00
ContestHallTough Give songs meaningful english names 2020-08-20 19:06:14 -04:00
DesertRuins Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05:00
DesertUnderpass fixed oversight causing chosen fossil to be lost if bag is full (#3978) 2024-01-18 00:03:55 +01:00
DewfordTown Add extra key item bag space checks (#4066) 2024-01-26 21:11:04 +01:00
DewfordTown_Gym Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
DewfordTown_Hall Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
DewfordTown_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
DewfordTown_House2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
DewfordTown_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
DewfordTown_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
EverGrandeCity_ChampionsRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_DrakesRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_GlaciasRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_Hall1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_Hall2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_Hall3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_Hall4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_Hall5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_HallOfFame Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_PhoebesRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_PokemonLeague_1F Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
EverGrandeCity_PokemonLeague_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
EverGrandeCity_SidneysRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FallarborTown Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
FallarborTown_BattleTentBattleRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
FallarborTown_BattleTentCorridor Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
FallarborTown_BattleTentLobby Add temp var aliases 2023-08-04 14:17:28 -04:00
FallarborTown_CozmosHouse Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
FallarborTown_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
FallarborTown_MoveRelearnersHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FallarborTown_PokemonCenter_1F Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
FallarborTown_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FarawayIsland_Entrance Merge pull request #1807 from pret/porymap-5 2022-10-30 11:01:37 -04:00
FarawayIsland_Interior Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FieryPath Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
FortreeCity Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
FortreeCity_DecorationShop Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
FortreeCity_Gym Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
FortreeCity_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FortreeCity_House2 Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
FortreeCity_House3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FortreeCity_House4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FortreeCity_House5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FortreeCity_Mart Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
FortreeCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
FortreeCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
GraniteCave_1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
GraniteCave_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
GraniteCave_B2F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
GraniteCave_StevensRoom Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
InsideOfTruck Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
IslandCave Merge branch 'followers' into followers-expanded-id 2024-02-17 17:19:01 -05:00
JaggedPass Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
LavaridgeTown Merge pull request #1807 from pret/porymap-5 2022-10-30 11:01:37 -04:00
LavaridgeTown_Gym_1F Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
LavaridgeTown_Gym_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LavaridgeTown_HerbShop Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
LavaridgeTown_House Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LavaridgeTown_Mart Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
LavaridgeTown_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LavaridgeTown_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
LilycoveCity_ContestHall Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_ContestLobby Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_CoveLilyMotel_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_CoveLilyMotel_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_DepartmentStore_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_DepartmentStore_2F Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
LilycoveCity_DepartmentStore_3F Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
LilycoveCity_DepartmentStore_4F Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
LilycoveCity_DepartmentStore_5F Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
LilycoveCity_DepartmentStoreElevator Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_DepartmentStoreRooftop Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_Harbor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_House2 Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
LilycoveCity_House3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_House4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_LilycoveMuseum_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_LilycoveMuseum_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_MoveDeletersHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_PokemonTrainerFanClub Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LilycoveCity_UnusedMart Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LittlerootTown Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
LittlerootTown_BrendansHouse_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LittlerootTown_BrendansHouse_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LittlerootTown_MaysHouse_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LittlerootTown_MaysHouse_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
LittlerootTown_ProfessorBirchsLab Add temp var aliases 2023-08-04 14:17:28 -04:00
MagmaHideout_1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MagmaHideout_2F_1R Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MagmaHideout_2F_2R Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MagmaHideout_2F_3R Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MagmaHideout_3F_1R Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MagmaHideout_3F_2R Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MagmaHideout_3F_3R Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MagmaHideout_4F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MarineCave_End Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MarineCave_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MauvilleCity Merge branch '_RHH/master' into _RHH/upcoming 2024-01-28 18:11:44 -03:00
MauvilleCity_BikeShop Add extra key item bag space checks (#4066) 2024-01-26 21:11:04 +01:00
MauvilleCity_GameCorner Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
MauvilleCity_Gym Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
MauvilleCity_House1 Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
MauvilleCity_House2 Add extra key item bag space checks (#4066) 2024-01-26 21:11:04 +01:00
MauvilleCity_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
MauvilleCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MauvilleCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MeteorFalls_1F_1R Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MeteorFalls_1F_2R Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MeteorFalls_B1F_1R Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MeteorFalls_B1F_2R Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MeteorFalls_StevensCave Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MirageTower_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MirageTower_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MirageTower_3F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MirageTower_4F fixed oversight causing chosen fossil to be lost if bag is full (#3978) 2024-01-18 00:03:55 +01:00
MossdeepCity Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MossdeepCity_GameCorner_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_GameCorner_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_Gym Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
MossdeepCity_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_House2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_House3 Add extra key item bag space checks (#4066) 2024-01-26 21:11:04 +01:00
MossdeepCity_House4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
MossdeepCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MossdeepCity_SpaceCenter_1F Use BUGFIX in assembly files 2023-10-20 09:10:49 -04:00
MossdeepCity_SpaceCenter_2F Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge18jun 2024-06-18 11:04:40 +02:00
MossdeepCity_StevensHouse Merge pull request #1904 from GriffinRichards/temp-alias 2023-08-11 15:45:00 -04:00
MtChimney (Default Off) Item Description Headers (#4767) 2024-09-03 20:22:01 +02:00
MtChimney_CableCarStation Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MtPyre_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
MtPyre_2F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MtPyre_3F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MtPyre_4F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MtPyre_5F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MtPyre_6F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MtPyre_Exterior Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
MtPyre_Summit Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Bottom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down01 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down02 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down03 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down04 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down05 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down06 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down07 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down08 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down09 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down10 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Down11 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Exterior Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Fork Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Harbor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Top Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Up1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Up2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Up3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NavelRock_Up4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NewMauville_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
NewMauville_Inside Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
OldaleTown Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
OldaleTown_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
OldaleTown_House2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
OldaleTown_Mart Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
OldaleTown_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
OldaleTown_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PacifidlogTown Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
PacifidlogTown_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PacifidlogTown_House2 Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
PacifidlogTown_House3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PacifidlogTown_House4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PacifidlogTown_House5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PacifidlogTown_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PacifidlogTown_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PetalburgCity Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
PetalburgCity_Gym Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829 2023-08-31 14:28:01 -04:00
PetalburgCity_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PetalburgCity_House2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PetalburgCity_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
PetalburgCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PetalburgCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
PetalburgCity_WallysHouse Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
PetalburgWoods Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
RecordCorner Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route101 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Route102 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route103 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route104 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route104_MrBrineysHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route104_PrettyPetalFlowerShop Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
Route104_Prototype Remove address comments 2021-07-20 15:18:31 -04:00
Route104_PrototypePrettyPetalFlowerShop Remove address comments 2021-07-20 15:18:31 -04:00
Route105 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route106 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route107 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Route108 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route109 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route109_SeashoreHouse (Default Off) Item Description Headers (#4767) 2024-09-03 20:22:01 +02:00
Route110 Arbitrary trainer scripts + map script/trigger softlock prevention (#5033) 2025-01-08 10:27:00 +00:00
Route110_SeasideCyclingRoadNorthEntrance Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
Route110_SeasideCyclingRoadSouthEntrance Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00
Route110_TrickHouseCorridor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route110_TrickHouseEnd Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Route110_TrickHouseEntrance Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Route110_TrickHousePuzzle1 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route110_TrickHousePuzzle2 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route110_TrickHousePuzzle3 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route110_TrickHousePuzzle4 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route110_TrickHousePuzzle5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle6 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route110_TrickHousePuzzle7 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route110_TrickHousePuzzle8 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route111 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route111_OldLadysRestStop Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route111_WinstrateFamilysHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route112 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route112_CableCarStation Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route113 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route113_GlassWorkshop Add extra key item bag space checks (#4066) 2024-01-26 21:11:04 +01:00
Route114 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route114_FossilManiacsHouse Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
Route114_FossilManiacsTunnel Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route114_LanettesHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route115 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route116 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route116_TunnelersRestHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route117 Moved callfuncs to general macros folder + added comments + removed unused "emote" macro 2024-05-22 13:52:26 -04:00
Route117_PokemonDayCare Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route118 Merge branch '_RHH/master' into _RHH/upcoming 2024-01-28 18:11:44 -03:00
Route119 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route119_House Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route119_WeatherInstitute_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route119_WeatherInstitute_2F Add species defines for base forms with names (#3248) 2023-10-23 12:59:15 +01:00
Route120 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route121 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route121_SafariZoneEntrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route122 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Route123 Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo 2024-03-25 16:03:56 -03:00
Route123_BerryMastersHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route124 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route124_DivingTreasureHuntersHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Route125 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route126 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route127 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route128 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Route129 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Route130 Add temp flag aliases 2023-08-03 15:55:06 -04:00
Route131 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Route132 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route133 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
Route134 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
RustboroCity Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
RustboroCity_CuttersHouse Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
RustboroCity_DevonCorp_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_DevonCorp_2F Add temp var aliases 2023-08-04 14:17:28 -04:00
RustboroCity_DevonCorp_3F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Flat1_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Flat1_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Flat2_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Flat2_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Flat2_3F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Gym Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
RustboroCity_House1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_House2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_House3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
RustboroCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RustboroCity_PokemonSchool Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
RusturfTunnel Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 2024-02-17 23:40:08 -03:00
SafariZone_North Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SafariZone_Northeast Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SafariZone_Northwest Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SafariZone_RestHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SafariZone_South Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
SafariZone_Southeast Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SafariZone_Southwest Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
ScorchedSlab Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SeafloorCavern_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room6 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room7 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room8 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SeafloorCavern_Room9 Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SealedChamber_InnerRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SealedChamber_OuterRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BlueCave1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BlueCave2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BlueCave3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BlueCave4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BrownCave1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BrownCave2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BrownCave3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_BrownCave4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_RedCave1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_RedCave2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_RedCave3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_RedCave4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Shrub1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Shrub2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Shrub3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Shrub4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Tree1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Tree2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Tree3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_Tree4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_YellowCave1 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_YellowCave2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_YellowCave3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SecretBase_YellowCave4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
ShoalCave_HighTideEntranceRoom Remove address comments 2021-07-20 15:18:31 -04:00
ShoalCave_HighTideInnerRoom Remove address comments 2021-07-20 15:18:31 -04:00
ShoalCave_LowTideEntranceRoom Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
ShoalCave_LowTideIceRoom Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
ShoalCave_LowTideInnerRoom Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
ShoalCave_LowTideLowerRoom Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
ShoalCave_LowTideStairsRoom Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
SkyPillar_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_3F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_4F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_5F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_Outside Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SkyPillar_Top Merge pull request #1755 from GriffinRichards/map-dynamic 2022-10-18 22:45:56 -04:00
SlateportCity Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
SlateportCity_BattleTentBattleRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
SlateportCity_BattleTentCorridor Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
SlateportCity_BattleTentLobby Merge pull request #1904 from GriffinRichards/temp-alias 2023-08-11 15:45:00 -04:00
SlateportCity_Harbor Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SlateportCity_House Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SlateportCity_Mart Added POKEMART_LIST_END to avoid users accidentally removing it (#1947) 2024-12-04 17:38:23 -05:00
SlateportCity_NameRatersHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SlateportCity_OceanicMuseum_1F Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
SlateportCity_OceanicMuseum_2F Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
SlateportCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SlateportCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SlateportCity_PokemonFanClub Merge pull request #1755 from GriffinRichards/map-dynamic 2022-10-18 22:45:56 -04:00
SlateportCity_SternsShipyard_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SlateportCity_SternsShipyard_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity Whitespace, documentation and style 2024-01-22 19:12:52 -03:00
SootopolisCity_Gym_1F Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
SootopolisCity_Gym_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_House1 Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
SootopolisCity_House2 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_House3 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_House4 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_House5 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_House6 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_House7 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_LotadAndSeedotHouse - Fixes Seedot and Lotad House to give measurements based on the unit system and decimal seperator chosen by the developer. (#4193) 2024-02-15 10:23:11 +01:00
SootopolisCity_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
SootopolisCity_MysteryEventsHouse_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_MysteryEventsHouse_B1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SootopolisCity_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SouthernIsland_Exterior Merge pull request #1807 from pret/porymap-5 2022-10-30 11:01:37 -04:00
SouthernIsland_Interior Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SSTidalCorridor Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
SSTidalLowerDeck Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
SSTidalRooms Reference TMs and HMs by move instead of number (#1732) 2023-08-09 10:51:01 -04:00
TerraCave_End Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TerraCave_Entrance Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TradeCenter Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TrainerHill_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TrainerHill_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TrainerHill_3F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TrainerHill_4F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TrainerHill_Elevator Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
TrainerHill_Entrance Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
TrainerHill_Roof Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Underwater_MarineCave Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Underwater_Route105 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route124 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route125 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route126 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route127 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route128 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route129 Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
Underwater_Route134 Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Underwater_SeafloorCavern Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Underwater_SealedChamber Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
Underwater_SootopolisCity Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
UnionRoom fix: disable followers in Union Room 2024-05-21 22:14:29 -04:00
UnusedContestHall1 Label unused layouts 2021-02-08 14:45:56 -05:00
UnusedContestHall2 Label unused layouts 2021-02-08 14:45:56 -05:00
UnusedContestHall3 Label unused layouts 2021-02-08 14:45:56 -05:00
UnusedContestHall4 Label unused layouts 2021-02-08 14:45:56 -05:00
UnusedContestHall5 Label unused layouts 2021-02-08 14:45:56 -05:00
UnusedContestHall6 Label unused layouts 2021-02-08 14:45:56 -05:00
VerdanturfTown Use Porymap's new order for connection fields 2022-10-24 10:05:59 -04:00
VerdanturfTown_BattleTentBattleRoom Reformat compare + goto_if/call_if to single statements 2021-11-18 23:06:51 -05:00
VerdanturfTown_BattleTentCorridor Handle optional arguments for warp commands, add WARP_ID_NONE 2021-11-16 10:53:00 -05:00
VerdanturfTown_BattleTentLobby Merge pull request #1904 from GriffinRichards/temp-alias 2023-08-11 15:45:00 -04:00
VerdanturfTown_FriendshipRatersHouse Merge pull request #1755 from GriffinRichards/map-dynamic 2022-10-18 22:45:56 -04:00
VerdanturfTown_House Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
VerdanturfTown_Mart Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
VerdanturfTown_PokemonCenter_1F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
VerdanturfTown_PokemonCenter_2F Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
VerdanturfTown_WandasHouse Treat warp ids as strings to allow constants 2022-09-03 15:43:43 -04:00
VictoryRoad_1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
VictoryRoad_B1F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
VictoryRoad_B2F Item Ball refactor / Pluralize item names for giveitem and finditem (#3942) 2024-01-14 21:35:45 +01:00
.gitignore Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
map_groups.json Fix swapped cycling road entrances 2024-08-31 01:54:25 -04:00