Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
pokeemmo/data/maps
History
Hedara 5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge 
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
2025-11-01 15:13:16 +01: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_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_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_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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleArenaCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleArenaLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattleDomeBattleRoom
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
BattleFrontier_BattleDomeCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleDomeLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattleDomePreBattleRoom
Fix battle dome bug (again) (#8007)
2025-10-24 18:55:32 +02:00
BattleFrontier_BattleFactoryBattleRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleFactoryLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattleFactoryPreBattleRoom
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
BattleFrontier_BattlePalaceBattleRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePalaceCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePalaceLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattlePikeCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePikeLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattlePikeRoomFinal
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePikeRoomNormal
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePikeRoomWildMons
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePikeThreePathRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattlePyramidFloor
Merge remote-tracking branch 'pret/master' into pret-merge
2025-06-24 10:42:24 +02:00
BattleFrontier_BattlePyramidLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattlePyramidTop
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleTowerBattleRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleTowerCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleTowerElevator
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleTowerLobby
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
BattleFrontier_BattleTowerMultiBattleRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleTowerMultiCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_BattleTowerMultiPartnerRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04: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
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195)
2025-02-08 12:51:22 -08: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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
BattleFrontier_OutsideEast
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
BattleFrontier_OutsideWest
Finish adding local IDs to map.json files
2024-10-12 23:32:28 -04:00
BattleFrontier_PokemonCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
BattleFrontier_ScottsHouse
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
BirthIsland_Harbor
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
CaveOfOrigin_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
CaveOfOrigin_B1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04: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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
DewfordTown
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
DewfordTown_Gym
Reference TMs and HMs by move instead of number (#1732)
2023-08-09 10:51:01 -04:00
DewfordTown_Hall
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
DewfordTown_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
EverGrandeCity
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
EverGrandeCity_ChampionsRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_DrakesRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_GlaciasRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_Hall1
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_Hall2
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_Hall3
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_Hall4
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_Hall5
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_HallOfFame
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_PhoebesRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
EverGrandeCity_PokemonCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
EverGrandeCity_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
EverGrandeCity_PokemonLeague_1F
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
EverGrandeCity_PokemonLeague_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
EverGrandeCity_SidneysRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
FallarborTown
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
FallarborTown_BattleTentBattleRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
FallarborTown_BattleTentCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
FallarborTown_BattleTentLobby
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
FallarborTown_MoveRelearnersHouse
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
FallarborTown_PokemonCenter_1F
Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants
2024-10-15 22:04:45 -04:00
FallarborTown_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FarawayIsland_Entrance
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
FarawayIsland_Interior
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
FieryPath
Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)
2024-01-14 21:35:45 +01:00
FortreeCity
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05: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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
FortreeCity_House5
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
FortreeCity_Mart
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
FortreeCity_PokemonCenter_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
InsideOfTruck
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
IslandCave
Merge branch 'followers' into followers-expanded-id
2024-02-17 17:19:01 -05:00
JaggedPass
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
LavaridgeTown
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
LavaridgeTown_Gym_1F
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
LavaridgeTown_Gym_B1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
LavaridgeTown_PokemonCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
LavaridgeTown_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LilycoveCity
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
LilycoveCity_ContestHall
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
LilycoveCity_ContestLobby
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LilycoveCity_CoveLilyMotel_1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LilycoveCity_CoveLilyMotel_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LilycoveCity_DepartmentStore_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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
Improve undefined map assembler messages (#2196)
2025-10-29 21:34:03 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LilycoveCity_LilycoveMuseum_2F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LilycoveCity_MoveDeletersHouse
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
LilycoveCity_PokemonCenter_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
LilycoveCity_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LilycoveCity_PokemonTrainerFanClub
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LilycoveCity_UnusedMart
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
LittlerootTown
Improve undefined map assembler messages (#2196)
2025-10-29 21:34:03 -04:00
LittlerootTown_BrendansHouse_1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LittlerootTown_BrendansHouse_2F
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
LittlerootTown_MaysHouse_1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
LittlerootTown_MaysHouse_2F
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
LittlerootTown_ProfessorBirchsLab
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
MarineCave_End
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
MarineCave_Entrance
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MauvilleCity
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04: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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
MauvilleCity_PokemonCenter_1F
Finish adding local IDs to map.json files
2024-10-12 23:32:28 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
MossdeepCity
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -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 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
MossdeepCity_House1
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity_House2
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
MossdeepCity_PokemonCenter_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
MossdeepCity_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
MossdeepCity_SpaceCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
MossdeepCity_SpaceCenter_2F
Add missing uses of LOCALID_NONE for trainerbattle
2025-06-20 15:33:12 -04:00
MossdeepCity_StevensHouse
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
MtChimney
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
2025-06-25 17:54:59 +02:00
MtChimney_CableCarStation
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
NavelRock_B1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
NavelRock_Bottom
Generate local IDs from map.json files
2024-10-12 03:04:24 -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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
NavelRock_Top
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
NewMauville_Inside
Item Ball refactor / Pluralize item names for giveitem and finditem (#3942)
2024-01-14 21:35:45 +01:00
OldaleTown
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05: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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
OldaleTown_PokemonCenter_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
OldaleTown_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
PacifidlogTown
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05: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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
PacifidlogTown_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
PetalburgCity
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
PetalburgCity_Gym
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
PetalburgCity_PokemonCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
PetalburgCity_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
PetalburgCity_WallysHouse
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
PetalburgWoods
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
RecordCorner
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route101
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
Route102
REVERT ME TO RESTORE HOENN MAP ADJUSTMENTS
2024-12-21 11:00:27 -03:00
Route103
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route104
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route104_MrBrineysHouse
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
Route104_PrettyPetalFlowerShop
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route109_SeashoreHouse
(Default Off) Item Description Headers (#4767)
2024-09-03 20:22:01 +02:00
Route110
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route110_SeasideCyclingRoadNorthEntrance
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
Route110_SeasideCyclingRoadSouthEntrance
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
Route110_TrickHouseCorridor
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route110_TrickHouseEnd
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
Route110_TrickHouseEntrance
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route111_OldLadysRestStop
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route111_WinstrateFamilysHouse
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
Route112
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route112_CableCarStation
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route116_TunnelersRestHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route117
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route117_PokemonDayCare
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
Route118
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route119
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route119_House
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
Route119_WeatherInstitute_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
Route119_WeatherInstitute_2F
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route120
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route121
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
Route121_SafariZoneEntrance
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
RustboroCity_CuttersHouse
Reference TMs and HMs by move instead of number (#1732)
2023-08-09 10:51:01 -04:00
RustboroCity_DevonCorp_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
RustboroCity_DevonCorp_2F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
RustboroCity_DevonCorp_3F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
RustboroCity_Flat1_1F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
RustboroCity_Flat1_2F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
RustboroCity_PokemonCenter_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -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 'upstream/master' into followers
2025-06-24 20:39:12 -04: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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SkyPillar_Top
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SlateportCity
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
SlateportCity_BattleTentBattleRoom
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
SlateportCity_BattleTentCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SlateportCity_BattleTentLobby
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SlateportCity_Harbor
Improve undefined map assembler messages (#2196)
2025-10-29 21:34:03 -04:00
SlateportCity_House
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SlateportCity_Mart
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
SlateportCity_NameRatersHouse
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SlateportCity_OceanicMuseum_1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SlateportCity_OceanicMuseum_2F
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
2025-06-25 17:49:19 +02:00
SlateportCity_PokemonCenter_1F
Generate local IDs from map.json files
2024-10-12 03:04:24 -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
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
SlateportCity_SternsShipyard_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SootopolisCity
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
SootopolisCity_Gym_1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
SootopolisCity_MysteryEventsHouse_1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SootopolisCity_MysteryEventsHouse_B1F
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SootopolisCity_PokemonCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -04:00
SootopolisCity_PokemonCenter_2F
Treat warp ids as strings to allow constants
2022-09-03 15:43:43 -04:00
SouthernIsland_Exterior
Generate heal location constants automatically, move data back to a single file.
2025-02-03 20:25:11 -05:00
SouthernIsland_Interior
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
SSTidalCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
TrainerHill_Entrance
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -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
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -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
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
VerdanturfTown_BattleTentBattleRoom
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
VerdanturfTown_BattleTentCorridor
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
VerdanturfTown_BattleTentLobby
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -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 commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02:00
VerdanturfTown_PokemonCenter_1F
Continue adding local IDs to map.json files
2024-10-12 12:24:57 -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
Merge commit '678fdf9' into pret-merge
2025-05-27 19:22:40 +02: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
Merge remote-tracking branch 'upstream/master' into followers
2025-02-10 00:11:38 -05:00