Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/data/maps
History
Eduardo Quezada 341ce6fd95 Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 
# Conflicts:
#	.github/workflows/build.yml
#	README.md
#	gflib/sprite.c
#	graphics/pokemon/banette/anim_front.png
#	graphics/pokemon/banette/normal.pal
#	graphics/pokemon/sentret/normal.pal
#	graphics/pokemon/togetic/anim_front.png
#	graphics/pokemon/togetic/normal.pal
#	include/battle_script_commands.h
#	include/data.h
#	ld_script.txt
#	src/battle_controller_player.c
#	src/bike.c
#	src/event_object_movement.c
2023-06-16 21:25:16 -04:00
..
AbandonedShip_CaptainsOffice
Fix scanner item flag name
2023-03-23 21:47:26 -07: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
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413
2023-04-13 17:05:48 -04:00
AbandonedShip_Room_B1F
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04:00
AbandonedShip_Rooms2_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
AbandonedShip_Rooms2_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
AbandonedShip_Rooms_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
AbandonedShip_Rooms_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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 remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
AquaHideout_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
AquaHideout_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
AquaHideout_B2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
ArtisanCave_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
BattleFrontier_BattleDomeBattleRoom
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
BattleFrontier_BattleDomeCorridor
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
BattleFrontier_BattleDomeLobby
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
BattleFrontier_BattlePikeCorridor
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
BattleFrontier_BattlePikeLobby
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePyramidFloor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePyramidLobby
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
BattleFrontier_BattlePyramidTop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Fixed right Frontier move tutor not loading their move list correctly.
2022-12-18 13:17:33 -03: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Misc field_specials cleanup
2023-02-01 11:48:55 -05: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 remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
DesertUnderpass
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
DewfordTown
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
DewfordTown_Gym
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
DewfordTown_Hall
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FallarborTown_CozmosHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FallarborTown_Mart
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -03:00
FallarborTown_MoveRelearnersHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FallarborTown_PokemonCenter_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FortreeCity
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
FortreeCity_DecorationShop
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FortreeCity_Gym
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
FortreeCity_House1
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FortreeCity_House2
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
GraniteCave_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
GraniteCave_B2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
GraniteCave_StevensRoom
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
InsideOfTruck
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
IslandCave
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
JaggedPass
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LavaridgeTown
Merge pull request #1807 from pret/porymap-5
2022-10-30 11:01:37 -04:00
LavaridgeTown_Gym_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LavaridgeTown_Gym_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LavaridgeTown_HerbShop
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LavaridgeTown_House
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LavaridgeTown_Mart
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LilycoveCity_DepartmentStore_3F
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -03:00
LilycoveCity_DepartmentStore_4F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LilycoveCity_DepartmentStore_5F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_2F_1R
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_2F_2R
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_2F_3R
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_3F_1R
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_3F_2R
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_3F_3R
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MagmaHideout_4F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
MauvilleCity_BikeShop
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MauvilleCity_GameCorner
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MauvilleCity_Gym
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MauvilleCity_House1
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MauvilleCity_House2
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MauvilleCity_Mart
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04: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
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity_House4
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity_Mart
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity_SpaceCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity_StevensHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MtChimney
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MtPyre_3F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MtPyre_4F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MtPyre_5F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MtPyre_6F
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04:00
MtPyre_Exterior
Merge pull request #1807 from pret/porymap-5
2022-10-30 11:01:37 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -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
Misc field_specials cleanup
2023-02-01 11:48:55 -05:00
PetalburgCity_Gym
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -03: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 remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
PetalburgWoods
Fix spelling mistake for item flag
2023-02-20 18:17:30 -08: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route103
Merge pull request #1807 from pret/porymap-5
2022-10-30 11:01:37 -04:00
Route104
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route104_MrBrineysHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route104_PrettyPetalFlowerShop
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route106
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route107
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route108
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route109
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route109_SeashoreHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303
2023-03-03 11:00:50 -03:00
Route110_SeasideCyclingRoadNorthEntrance
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_SeasideCyclingRoadSouthEntrance
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHouseCorridor
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHouseEnd
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHouseEntrance
Merge pull request #1807 from pret/porymap-5
2022-10-30 11:01:37 -04:00
Route110_TrickHousePuzzle1
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle2
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle3
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle4
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle5
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle6
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHousePuzzle7
Merge pull request #1807 from pret/porymap-5
2022-10-30 11:01:37 -04:00
Route110_TrickHousePuzzle8
Merge pull request #1807 from pret/porymap-5
2022-10-30 11:01:37 -04:00
Route111
Review changes
2023-03-05 17:17:39 -03: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route112_CableCarStation
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route113
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route113_GlassWorkshop
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route114
Fix wrong route in hidden item flag name
2023-02-22 13:13:57 -08:00
Route114_FossilManiacsHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route116
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route116_TunnelersRestHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route117
Added OW daycare pokemon.
2023-04-23 17:34:38 -04:00
Route117_PokemonDayCare
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route118
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route119
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route120
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route121
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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 branch 'master' into followers
2022-11-21 21:21:50 -05:00
Route123_BerryMastersHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route124
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route124_DivingTreasureHuntersHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route125
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route126
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route127
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route131
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route132
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route133
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
Route134
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
RustboroCity
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
RustboroCity_CuttersHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
RustboroCity_DevonCorp_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
RustboroCity_DevonCorp_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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 remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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 merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04:00
SafariZone_North
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
SafariZone_Northeast
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
SafariZone_Northwest
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
SafariZone_Southwest
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04:00
ScorchedSlab
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04: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
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
ShoalCave_LowTideIceRoom
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04:00
ShoalCave_LowTideInnerRoom
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
ShoalCave_LowTideLowerRoom
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
ShoalCave_LowTideStairsRoom
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04: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
Use Porymap's new order for connection fields
2022-10-24 10:05:59 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SlateportCity_NameRatersHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SlateportCity_OceanicMuseum_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SlateportCity_OceanicMuseum_2F
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Merge branch 'master' into followers
2022-11-21 21:21:50 -05:00
SootopolisCity_Gym_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SootopolisCity_Gym_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SootopolisCity_House1
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SootopolisCity_Mart
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SSTidalLowerDeck
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SSTidalRooms
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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 remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
2023-06-16 21:25:16 -04: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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -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 remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
2022-10-30 12:30:38 -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
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
VictoryRoad_B1F
Merge pull request #1755 from GriffinRichards/map-dynamic
2022-10-18 22:45:56 -04:00
VictoryRoad_B2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
.gitignore
Cleanup and add game version flag to mapjson tool
2019-02-04 17:28:45 -06:00
map_groups.json
Merge branch 'master' into romhack
2021-06-04 23:36:21 -04:00