dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9abda59bd1e08ede1f6fce18d2f2f2bb230327f6
PokemonEmeraldSafariFrontier/data/maps
History
GriffinR 8e4b987699 Revert more porymap-breaking changes
2020-03-18 03:22:07 -04:00
..
AbandonedShip_CaptainsOffice
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Corridors_1F
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Corridors_B1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
AbandonedShip_Deck
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
AbandonedShip_HiddenFloorCorridors
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
AbandonedShip_HiddenFloorRooms
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Room_B1F
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Rooms2_1F
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Rooms2_B1F
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Rooms_1F
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Rooms_B1F
Revert WEATHER_CLOUDY to WEATHER_SHADE
2019-12-06 19:05:28 -06:00
AbandonedShip_Underwater1
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
AbandonedShip_Underwater2
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
AlteringCave
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
AncientTomb
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
AquaHideout_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
AquaHideout_B1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
AquaHideout_B2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
AquaHideout_UnusedRubyMap1
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
AquaHideout_UnusedRubyMap2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
AquaHideout_UnusedRubyMap3
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ArtisanCave_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
ArtisanCave_B1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleColosseum_2P
Merge master into fix-eventobj
2020-01-15 16:11:20 -05:00
BattleColosseum_4P
Merge master into fix-eventobj
2020-01-15 16:11:20 -05:00
BattleFrontier_BattleArenaBattleRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleArenaCorridor
Merge master into ObjEvent rename
2019-11-27 12:51:10 -05:00
BattleFrontier_BattleArenaLobby
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleDomeBattleRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
BattleFrontier_BattleDomeCorridor
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
BattleFrontier_BattleDomeLobby
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
BattleFrontier_BattleDomePreBattleRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
BattleFrontier_BattleFactoryBattleRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleFactoryLobby
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleFactoryPreBattleRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattlePalaceBattleRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattlePalaceCorridor
Merge branch 'master' into fix-eventobj
2019-12-11 01:09:06 -05:00
BattleFrontier_BattlePalaceLobby
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattlePikeCorridor
Merge branch 'master' into fix-eventobj
2019-12-11 01:09:06 -05:00
BattleFrontier_BattlePikeLobby
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
BattleFrontier_BattlePikeRoomFinal
Merge branch 'master' into fix-eventobj
2019-12-11 01:09:06 -05:00
BattleFrontier_BattlePikeRoomNormal
Merge branch 'master' into fix-eventobj
2019-12-11 01:09:06 -05:00
BattleFrontier_BattlePikeRoomWildMons
Merge branch 'master' into fix-eventobj
2019-12-11 01:09:06 -05:00
BattleFrontier_BattlePikeThreePathRoom
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
BattleFrontier_BattlePyramidFloor
Merge master into ObjEvent rename
2019-12-15 02:00:00 -05:00
BattleFrontier_BattlePyramidLobby
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
BattleFrontier_BattlePyramidTop
Merge master into ObjEvent rename
2019-12-15 02:00:00 -05:00
BattleFrontier_BattleTowerBattleRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleTowerCorridor
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleTowerElevator
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleTowerLobby
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
BattleFrontier_BattleTowerMultiBattleRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleTowerMultiCorridor
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_BattleTowerMultiPartnerRoom
Merge master into ObjEvent rename and prune accidental inclusions
2020-01-08 05:43:06 -05:00
BattleFrontier_ExchangeServiceCorner
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
BattleFrontier_Lounge1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge6
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge7
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
BattleFrontier_Lounge8
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Lounge9
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_OutsideEast
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_OutsideWest
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_RankingHall
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_ReceptionGate
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
BattleFrontier_ScottsHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
BattlePyramidSquare01
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare02
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare03
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare04
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare05
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare06
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare07
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare08
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare09
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare10
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare11
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare12
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare13
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare14
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare15
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BattlePyramidSquare16
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
BirthIsland_Exterior
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
BirthIsland_Harbor
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
CaveOfOrigin_1F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
CaveOfOrigin_B1F
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
CaveOfOrigin_Entrance
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
CaveOfOrigin_UnusedRubySapphireMap1
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
CaveOfOrigin_UnusedRubySapphireMap2
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
CaveOfOrigin_UnusedRubySapphireMap3
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
ContestHall
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
ContestHallBeauty
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ContestHallCool
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ContestHallCute
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ContestHallSmart
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ContestHallTough
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
DesertRuins
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
DesertUnderpass
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
DewfordTown
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
DewfordTown_Gym
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
DewfordTown_Hall
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
DewfordTown_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
DewfordTown_House2
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
DewfordTown_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
DewfordTown_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
EverGrandeCity_ChampionsRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
EverGrandeCity_DrakesRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
EverGrandeCity_GlaciasRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
EverGrandeCity_Hall1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_Hall2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_Hall3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_Hall4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_Hall5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_HallOfFame
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
EverGrandeCity_PhoebesRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
EverGrandeCity_PokemonCenter_1F
Revert more porymap-breaking changes
2020-03-18 03:22:07 -04:00
EverGrandeCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_PokemonLeague_1F
Revert more porymap-breaking changes
2020-03-18 03:22:07 -04:00
EverGrandeCity_PokemonLeague_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
EverGrandeCity_SidneysRoom
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
FallarborTown
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FallarborTown_BattleTentBattleRoom
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
FallarborTown_BattleTentCorridor
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
FallarborTown_BattleTentLobby
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
FallarborTown_CozmosHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
FallarborTown_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FallarborTown_MoveRelearnersHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
FallarborTown_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FallarborTown_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FarawayIsland_Entrance
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
FarawayIsland_Interior
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
FieryPath
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_DecorationShop
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_Gym
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
FortreeCity_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_House2
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
FortreeCity_House3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_House4
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
FortreeCity_House5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
FortreeCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
GraniteCave_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
GraniteCave_B1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
GraniteCave_B2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
GraniteCave_StevensRoom
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
InsideOfTruck
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
IslandCave
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
JaggedPass
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
LavaridgeTown
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LavaridgeTown_Gym_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LavaridgeTown_Gym_B1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LavaridgeTown_HerbShop
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LavaridgeTown_House
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LavaridgeTown_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LavaridgeTown_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LavaridgeTown_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LilycoveCity_ContestHall
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_ContestLobby
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LilycoveCity_CoveLilyMotel_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_CoveLilyMotel_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_DepartmentStore_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LilycoveCity_DepartmentStore_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_DepartmentStore_3F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_DepartmentStore_4F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_DepartmentStore_5F
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
LilycoveCity_DepartmentStoreElevator
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_DepartmentStoreRooftop
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LilycoveCity_Harbor
Clarify event ticket flag names
2020-03-03 01:36:20 -05:00
LilycoveCity_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_House2
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LilycoveCity_House3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_House4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_LilycoveMuseum_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_LilycoveMuseum_2F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LilycoveCity_MoveDeletersHouse
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
LilycoveCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_PokemonTrainerFanClub
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LilycoveCity_UnusedMart
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
LittlerootTown
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
LittlerootTown_BrendansHouse_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LittlerootTown_BrendansHouse_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LittlerootTown_MaysHouse_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LittlerootTown_MaysHouse_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
LittlerootTown_ProfessorBirchsLab
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MagmaHideout_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MagmaHideout_2F_1R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MagmaHideout_2F_2R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MagmaHideout_2F_3R
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
MagmaHideout_3F_1R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MagmaHideout_3F_2R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MagmaHideout_3F_3R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MagmaHideout_4F
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
MarineCave_End
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
MarineCave_Entrance
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
MauvilleCity
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MauvilleCity_BikeShop
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MauvilleCity_GameCorner
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-02-12 13:05:57 -05:00
MauvilleCity_Gym
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MauvilleCity_House1
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MauvilleCity_House2
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MauvilleCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MauvilleCity_PokemonCenter_1F
Rename EventObj to ObjEvent
2019-11-21 00:14:40 -05:00
MauvilleCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MeteorFalls_1F_1R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MeteorFalls_1F_2R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MeteorFalls_B1F_1R
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
MeteorFalls_B1F_2R
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MeteorFalls_StevensCave
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MirageTower_1F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
MirageTower_2F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
MirageTower_3F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MirageTower_4F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MossdeepCity
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MossdeepCity_GameCorner_1F
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
MossdeepCity_GameCorner_B1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_Gym
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MossdeepCity_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_House2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_House3
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MossdeepCity_House4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MossdeepCity_SpaceCenter_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MossdeepCity_SpaceCenter_2F
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
MossdeepCity_StevensHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MtChimney
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MtChimney_CableCarStation
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MtPyre_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
MtPyre_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MtPyre_3F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MtPyre_4F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MtPyre_5F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MtPyre_6F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
MtPyre_Exterior
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
MtPyre_Summit
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
NavelRock_B1F
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Bottom
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down01
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down02
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down03
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down04
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down05
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down06
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down07
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down08
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down09
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down10
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Down11
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Entrance
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Exterior
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Fork
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Harbor
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Top
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Up1
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Up2
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Up3
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NavelRock_Up4
Merge pull request #968 from GriffinRichards/doc-regionmap
2020-03-17 10:38:20 -04:00
NewMauville_Entrance
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
NewMauville_Inside
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
OldaleTown
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
OldaleTown_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
OldaleTown_House2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
OldaleTown_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
OldaleTown_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
OldaleTown_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown_House2
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
PacifidlogTown_House3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown_House4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown_House5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PacifidlogTown_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PetalburgCity
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
PetalburgCity_Gym
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
PetalburgCity_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PetalburgCity_House2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PetalburgCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PetalburgCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PetalburgCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
PetalburgCity_WallysHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
PetalburgWoods
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RecordCorner
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
Route101
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
Route102
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route103
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
Route104
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route104_MrBrineysHouse
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route104_PrettyPetalFlowerShop
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route104_Prototype
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
Route104_PrototypePrettyPetalFlowerShop
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
Route105
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route106
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route107
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route108
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route109
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route109_SeashoreHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route110
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route110_SeasideCyclingRoadNorthEntrance
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_SeasideCyclingRoadSouthEntrance
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHouseCorridor
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
Route110_TrickHouseEnd
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route110_TrickHouseEntrance
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route110_TrickHousePuzzle1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle6
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle7
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route110_TrickHousePuzzle8
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route111
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route111_OldLadysRestStop
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route111_WinstrateFamilysHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route112
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route112_CableCarStation
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route113
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route113_GlassWorkshop
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route114
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route114_FossilManiacsHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route114_FossilManiacsTunnel
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route114_LanettesHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route115
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route116
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route116_TunnelersRestHouse
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route117
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route117_PokemonDayCare
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route118
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route119
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route119_House
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route119_WeatherInstitute_1F
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route119_WeatherInstitute_2F
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
Route120
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route121
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route121_SafariZoneEntrance
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route122
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
Route123
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route123_BerryMastersHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route124
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route124_DivingTreasureHuntersHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
Route125
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route126
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route127
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route128
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
Route129
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route130
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route131
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Route132
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route133
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
Route134
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RustboroCity_CuttersHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RustboroCity_DevonCorp_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_DevonCorp_2F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RustboroCity_DevonCorp_3F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RustboroCity_Flat1_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_Flat1_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_Flat2_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_Flat2_2F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RustboroCity_Flat2_3F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_Gym
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RustboroCity_House1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_House2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_House3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
RustboroCity_PokemonSchool
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
RusturfTunnel
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SafariZone_North
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SafariZone_Northeast
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SafariZone_Northwest
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SafariZone_RestHouse
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SafariZone_South
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SafariZone_Southeast
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SafariZone_Southwest
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
ScorchedSlab
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SeafloorCavern_Entrance
Merge branch 'master' into fix-eventobj
2019-12-06 02:34:54 -05:00
SeafloorCavern_Room1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SeafloorCavern_Room2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SeafloorCavern_Room3
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
SeafloorCavern_Room4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SeafloorCavern_Room5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SeafloorCavern_Room6
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SeafloorCavern_Room7
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SeafloorCavern_Room8
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SeafloorCavern_Room9
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
SealedChamber_InnerRoom
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SealedChamber_OuterRoom
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SecretBase_BlueCave1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BlueCave2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BlueCave3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BlueCave4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BrownCave1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BrownCave2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BrownCave3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_BrownCave4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_RedCave1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_RedCave2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_RedCave3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_RedCave4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Shrub1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Shrub2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Shrub3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Shrub4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Tree1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Tree2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Tree3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_Tree4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_YellowCave1
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_YellowCave2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_YellowCave3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SecretBase_YellowCave4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
ShoalCave_HighTideEntranceRoom
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ShoalCave_HighTideInnerRoom
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
ShoalCave_LowTideEntranceRoom
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
ShoalCave_LowTideIceRoom
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
ShoalCave_LowTideInnerRoom
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
ShoalCave_LowTideLowerRoom
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
ShoalCave_LowTideStairsRoom
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SkyPillar_1F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SkyPillar_2F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SkyPillar_3F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SkyPillar_4F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SkyPillar_5F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SkyPillar_Entrance
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
SkyPillar_Outside
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
SkyPillar_Top
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
SlateportCity
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SlateportCity_BattleTentBattleRoom
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
SlateportCity_BattleTentCorridor
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
SlateportCity_BattleTentLobby
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SlateportCity_Harbor
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SlateportCity_House
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SlateportCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SlateportCity_NameRatersHouse
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SlateportCity_OceanicMuseum_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SlateportCity_OceanicMuseum_2F
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
SlateportCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SlateportCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SlateportCity_PokemonFanClub
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SlateportCity_SternsShipyard_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SlateportCity_SternsShipyard_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SootopolisCity_Gym_1F
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SootopolisCity_Gym_B1F
Merge branch 'master' into fix-eventobj
2020-01-12 22:42:43 -05:00
SootopolisCity_House1
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SootopolisCity_House2
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_House3
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_House4
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_House5
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_House6
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SootopolisCity_House7
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_LotadAndSeedotHouse
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SootopolisCity_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_MysteryEventsHouse_1F
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
SootopolisCity_MysteryEventsHouse_B1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SootopolisCity_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SouthernIsland_Exterior
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SouthernIsland_Interior
Clarify event ticket flag names
2020-03-03 01:36:20 -05:00
SSTidalCorridor
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
SSTidalLowerDeck
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
SSTidalRooms
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
TerraCave_End
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
TerraCave_Entrance
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
TradeCenter
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
TrainerHill_1F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
TrainerHill_2F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
TrainerHill_3F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
TrainerHill_4F
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
TrainerHill_Elevator
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
TrainerHill_Entrance
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
TrainerHill_Roof
Merge master into ObjEvent rename
2019-11-25 20:00:04 -05:00
Underwater1
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater2
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater3
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater4
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater5
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater6
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater7
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater_MarineCave
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater_Route134
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater_SeafloorCavern
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater_SealedChamber
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
Underwater_SootopolisCity
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
UnionRoom
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
UnknownLinkContestRoom_25_29
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
UnknownLinkContestRoom_25_30
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
UnknownLinkContestRoom_25_31
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
UnknownLinkContestRoom_25_32
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
UnknownLinkContestRoom_25_33
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
UnknownLinkContestRoom_25_34
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
VerdanturfTown
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VerdanturfTown_BattleTentBattleRoom
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
VerdanturfTown_BattleTentCorridor
Merge branch 'master' into fix-eventobj
2019-12-18 13:16:38 -05:00
VerdanturfTown_BattleTentLobby
Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj
2020-01-13 20:41:57 -05:00
VerdanturfTown_FriendshipRatersHouse
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VerdanturfTown_House
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VerdanturfTown_Mart
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VerdanturfTown_PokemonCenter_1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VerdanturfTown_PokemonCenter_2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VerdanturfTown_WandasHouse
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VictoryRoad_1F
Merge branch 'master' into fix-eventobj
2020-01-08 05:51:49 -05:00
VictoryRoad_B1F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
VictoryRoad_B2F
Standardize EVENT_OBJECT to OBJECT_EVENT
2019-11-20 23:12:51 -05:00
.gitignore
Cleanup and add game version flag to mapjson tool
2019-02-04 17:28:45 -06:00
map_groups.json
Merge master into fix-eventobj
2020-01-15 16:11:20 -05:00