ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/data/maps
History
DizzyEggg 576d1b3474 Document and match somne trainer card
2019-01-19 23:04:33 +01:00
..
AbandonedShip_CaptainsOffice
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AbandonedShip_Corridors_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Corridors_B1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AbandonedShip_Deck
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_HiddenFloorCorridors
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AbandonedShip_HiddenFloorRooms
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Room_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Rooms2_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Rooms2_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Rooms_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Rooms_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Underwater1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AbandonedShip_Underwater2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AlteringCave
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AncientTomb
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AquaHideout_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AquaHideout_B1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AquaHideout_B2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
AquaHideout_UnusedRubyMap1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AquaHideout_UnusedRubyMap2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
AquaHideout_UnusedRubyMap3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
ArtisanCave_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
ArtisanCave_B1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_BattleArenaBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattleArenaCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleArenaLobby
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleDomeBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattleDomeCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleDomeLobby
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleDomePreBattleRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleFactoryBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattleFactoryLobby
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleFactoryPreBattleRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePalaceBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattlePalaceCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePalaceLobby
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePikeCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePikeLobby
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePikeRandomRoom1
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattlePikeRandomRoom2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePikeRandomRoom3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePikeThreePathRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePointExchangeServiceCorner
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePyramidEmptySquare
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePyramidLobby
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattlePyramidTop
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleTowerBattleRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_BattleTowerBattleRoom2
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattleTowerCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_BattleTowerCorridor2
add event object var references
2018-12-29 11:56:53 -06:00
BattleFrontier_BattleTowerElevator
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_BattleTowerLobby
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_BattleTowerMultiBattleRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_Lounge1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_Lounge2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_Lounge3
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_Lounge4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_Lounge5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_Lounge6
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_Lounge7
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_Lounge8
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_Lounge9
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_OutsideEast
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BattleFrontier_OutsideWest
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_RankingHall
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_ReceptionGate
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattleFrontier_ScottsHouse
Corrected typos
2019-01-03 01:54:55 +00:00
BattlePyramidSquare01
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare02
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare03
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare04
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare05
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare06
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare07
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare08
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare09
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare10
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare11
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare12
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare13
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare14
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare15
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BattlePyramidSquare16
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
BirthIsland_Exterior
Fix merge conflicts
2019-01-02 21:25:14 +00:00
BirthIsland_Harbor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
CaveOfOrigin_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
CaveOfOrigin_B1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
CaveOfOrigin_Entrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
CaveOfOrigin_UnusedRubySapphireMap1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
CaveOfOrigin_UnusedRubySapphireMap2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
CaveOfOrigin_UnusedRubySapphireMap3
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DesertRuins
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DesertUnderpass
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DewfordTown
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DewfordTown_Gym
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DewfordTown_Hall
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DewfordTown_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
DewfordTown_House2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
DewfordTown_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
DewfordTown_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
DoubleBattleColosseum
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_ChampionsRoom
add event object var references
2018-12-29 11:56:53 -06:00
EverGrandeCity_DrakesRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
EverGrandeCity_GlaciasRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
EverGrandeCity_Hall1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_Hall2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_Hall3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_Hall4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_Hall5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_HallOfFame
improve checkplayergender calls
2018-12-28 08:22:21 -06:00
EverGrandeCity_PhoebesRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
EverGrandeCity_PokemonCenter_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
EverGrandeCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_PokemonLeague_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
EverGrandeCity_PokemonLeague_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
EverGrandeCity_SidneysRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FallarborTown
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FallarborTown_BattleTentBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
FallarborTown_BattleTentCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FallarborTown_BattleTentLobby
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FallarborTown_House1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FallarborTown_House2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FallarborTown_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FallarborTown_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FallarborTown_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FarawayIsland_Entrance
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FarawayIsland_Interior
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FieryPath
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FortreeCity
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FortreeCity_DecorationShop
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FortreeCity_Gym
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FortreeCity_House1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FortreeCity_House2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FortreeCity_House3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FortreeCity_House4
Fix merge conflicts
2019-01-02 21:25:14 +00:00
FortreeCity_House5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FortreeCity_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FortreeCity_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
FortreeCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
GraniteCave_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
GraniteCave_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
GraniteCave_B2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
GraniteCave_StevensRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
InsideOfTruck
improve checkplayergender calls
2018-12-28 08:22:21 -06:00
IslandCave
Fix merge conflicts
2019-01-02 21:25:14 +00:00
JaggedPass
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LavaridgeTown
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LavaridgeTown_Gym_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LavaridgeTown_Gym_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LavaridgeTown_HerbShop
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LavaridgeTown_House
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LavaridgeTown_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LavaridgeTown_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LavaridgeTown_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
LilycoveCity_ContestHall
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_ContestLobby
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
LilycoveCity_CoveLilyMotel_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_CoveLilyMotel_2F
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
LilycoveCity_DepartmentStore_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LilycoveCity_DepartmentStore_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_DepartmentStore_3F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_DepartmentStore_4F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_DepartmentStore_5F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_DepartmentStoreElevator
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_DepartmentStoreRooftop
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_Harbor
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LilycoveCity_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_House2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LilycoveCity_House3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_House4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_LilycoveMuseum_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_LilycoveMuseum_2F
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
LilycoveCity_MoveDeletersHouse
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_PokemonCenter_1F
add event object var references
2018-12-29 11:56:53 -06:00
LilycoveCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LilycoveCity_PokemonTrainerFanClub
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LilycoveCity_UnusedMart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LinkContestRoom1
add event object var references
2018-12-29 11:56:53 -06:00
LinkContestRoom2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LinkContestRoom3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LinkContestRoom4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LinkContestRoom5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LinkContestRoom6
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
LittlerootTown
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LittlerootTown_BrendansHouse_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LittlerootTown_BrendansHouse_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LittlerootTown_MaysHouse_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LittlerootTown_MaysHouse_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
LittlerootTown_ProfessorBirchsLab
Document and match somne trainer card
2019-01-19 23:04:33 +01:00
MagmaHideout_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_2F_1R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_2F_2R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_2F_3R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_3F_1R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_3F_2R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_3F_3R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MagmaHideout_4F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MarineCave_End
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MarineCave_Entrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MauvilleCity
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MauvilleCity_BikeShop
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MauvilleCity_GameCorner
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MauvilleCity_Gym
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MauvilleCity_House1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MauvilleCity_House2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MauvilleCity_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MauvilleCity_PokemonCenter_1F
add event object var references
2018-12-29 11:56:53 -06:00
MauvilleCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MeteorFalls_1F_1R
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MeteorFalls_1F_2R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MeteorFalls_B1F_1R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MeteorFalls_B1F_2R
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MeteorFalls_StevensCave
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MirageTower_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MirageTower_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MirageTower_3F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MirageTower_4F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity_GameCorner_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MossdeepCity_GameCorner_B1F
add event object var references
2018-12-29 11:56:53 -06:00
MossdeepCity_Gym
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MossdeepCity_House2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity_House3
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity_House4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MossdeepCity_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MossdeepCity_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MossdeepCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MossdeepCity_SpaceCenter_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity_SpaceCenter_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MossdeepCity_StevensHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MtChimney
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MtChimney_CableCarStation
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
MtPyre_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_3F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_4F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_5F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_6F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_Exterior
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
MtPyre_Summit
Fix merge conflicts
2019-01-02 21:25:14 +00:00
NavelRock_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Bottom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
NavelRock_Down01
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down02
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down03
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down04
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down05
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down06
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down07
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down08
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down09
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down10
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Down11
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Entrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Exterior
Fix merge conflicts
2019-01-02 21:25:14 +00:00
NavelRock_Fork
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Harbor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Top
Fix merge conflicts
2019-01-02 21:25:14 +00:00
NavelRock_Up1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Up2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Up3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NavelRock_Up4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NewMauville_Entrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
NewMauville_Inside
Fix merge conflicts
2019-01-02 21:25:14 +00:00
OldaleTown
Fix merge conflicts
2019-01-02 21:25:14 +00:00
OldaleTown_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
OldaleTown_House2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
OldaleTown_Mart
Fix merge conflicts
2019-01-02 21:25:14 +00:00
OldaleTown_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
OldaleTown_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PacifidlogTown
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PacifidlogTown_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PacifidlogTown_House2
Fix merge conflicts
2019-01-02 21:25:14 +00:00
PacifidlogTown_House3
Fix merge conflicts
2019-01-02 21:25:14 +00:00
PacifidlogTown_House4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PacifidlogTown_House5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PacifidlogTown_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PacifidlogTown_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PetalburgCity
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PetalburgCity_Gym
Fix merge conflicts
2019-01-02 21:25:14 +00:00
PetalburgCity_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PetalburgCity_House2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PetalburgCity_Mart
Fix merge conflicts
2019-01-02 21:25:14 +00:00
PetalburgCity_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PetalburgCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
PetalburgCity_WallysHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
PetalburgWoods
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RecordCorner
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route101
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route102
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route103
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route104
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route104_MrBrineysHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route104_PrettyPetalFlowerShop
Corrected typos
2019-01-03 01:54:55 +00:00
Route104_Prototype
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route104_PrototypePrettyPetalFlowerShop
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route105
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route106
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route107
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route108
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route109
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route109_SeashoreHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route110
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route110_SeasideCyclingRoadNorthEntrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_SeasideCyclingRoadSouthEntrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHouseCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHouseEnd
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHouseEntrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle6
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route110_TrickHousePuzzle7
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route110_TrickHousePuzzle8
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route111
Corrected typos
2019-01-03 01:54:55 +00:00
Route111_OldLadysRestStop
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route111_WinstrateFamilysHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route112
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route112_CableCarStation
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route113
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route113_GlassWorkshop
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route114
Corrected typos
2019-01-03 01:54:55 +00:00
Route114_FossilManiacsHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route114_FossilManiacsTunnel
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route114_LanettesHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route115
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route116
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route116_TunnelersRestHouse
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route117
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route117_PokemonDayCare
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route118
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route119
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route119_House
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route119_WeatherInstitute_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route119_WeatherInstitute_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route120
Corrected typos
2019-01-03 01:54:55 +00:00
Route121
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route121_SafariZoneEntrance
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route122
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route123
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route123_BerryMastersHouse
Corrected typos
2019-01-03 01:54:55 +00:00
Route124
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route124_DivingTreasureHuntersHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Route125
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route126
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route127
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route128
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route129
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route130
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route131
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route132
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route133
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Route134
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_CuttersHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_DevonCorp_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_DevonCorp_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_DevonCorp_3F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_Flat1_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_Flat1_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_Flat2_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_Flat2_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_Flat2_3F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_Gym
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_House1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_House2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_House3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_Mart
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RustboroCity_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
RustboroCity_PokemonSchool
Fix merge conflicts
2019-01-02 21:25:14 +00:00
RusturfTunnel
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SafariZone_North
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SafariZone_Northeast
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SafariZone_Northwest
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SafariZone_RestHouse
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SafariZone_South
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SafariZone_Southeast
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SafariZone_Southwest
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
ScorchedSlab
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Entrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room6
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room7
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room8
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SeafloorCavern_Room9
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SealedChamber_InnerRoom
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SealedChamber_OuterRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SecretBase_BlueCave1
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BlueCave2
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BlueCave3
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BlueCave4
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BrownCave1
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BrownCave2
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BrownCave3
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_BrownCave4
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_RedCave1
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_RedCave2
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_RedCave3
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_RedCave4
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Shrub1
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Shrub2
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Shrub3
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Shrub4
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Tree1
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Tree2
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Tree3
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_Tree4
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_YellowCave1
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_YellowCave2
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_YellowCave3
add event object var references
2018-12-29 11:56:53 -06:00
SecretBase_YellowCave4
add event object var references
2018-12-29 11:56:53 -06:00
ShoalCave_HighTideEntranceRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
ShoalCave_HighTideInnerRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
ShoalCave_LowTideEntranceRoom
Corrected typos
2019-01-03 01:54:55 +00:00
ShoalCave_LowTideIceRoom
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
ShoalCave_LowTideInnerRoom
Corrected typos
2019-01-03 01:54:55 +00:00
ShoalCave_LowTideLowerRoom
Corrected typos
2019-01-03 01:54:55 +00:00
ShoalCave_LowTideStairsRoom
Corrected typos
2019-01-03 01:54:55 +00:00
SingleBattleColosseum
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_3F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_4F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_5F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_Entrance
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SkyPillar_Outside
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SkyPillar_Top
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity
Corrected typos
2019-01-03 01:54:55 +00:00
SlateportCity_BattleTentBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
SlateportCity_BattleTentCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SlateportCity_BattleTentLobby
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity_Harbor
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity_House1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SlateportCity_House2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SlateportCity_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SlateportCity_OceanicMuseum_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity_OceanicMuseum_2F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SlateportCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SlateportCity_PokemonFanClub
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity_SternsShipyard_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SlateportCity_SternsShipyard_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity
Corrected typos
2019-01-03 01:54:55 +00:00
SootopolisCity_Gym_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SootopolisCity_Gym_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_House1
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SootopolisCity_House2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_House3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_House4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_House5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_House6
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SootopolisCity_House7
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_LotadAndSeedotHouse
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_Mart
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SootopolisCity_MysteryEventsHouse_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SootopolisCity_MysteryEventsHouse_B1F
add event object var references
2018-12-29 11:56:53 -06:00
SootopolisCity_PokemonCenter_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SootopolisCity_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SouthernIsland_Exterior
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SouthernIsland_Interior
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SSTidalCorridor
Fix merge conflicts
2019-01-02 21:25:14 +00:00
SSTidalLowerDeck
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
SSTidalRooms
Fix merge conflicts
2019-01-02 21:25:14 +00:00
TerraCave_End
Fix merge conflicts
2019-01-02 21:25:14 +00:00
TerraCave_Entrance
Fix merge conflicts
2019-01-02 21:25:14 +00:00
TradeCenter
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
TrainerHill_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
TrainerHill_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
TrainerHill_3F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
TrainerHill_4F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
TrainerHill_Elevator
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
TrainerHill_Entrance
Move some vars to C
2019-01-13 13:15:23 +01:00
TrainerHill_Roof
Move some vars to C
2019-01-13 13:15:23 +01:00
Underwater1
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater2
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater3
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater4
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater5
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater6
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater7
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater_MarineCave
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Underwater_Route134
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater_SeafloorCavern
Fix merge conflicts
2019-01-02 21:25:14 +00:00
Underwater_SealedChamber
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
Underwater_SootopolisCity
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
UnionRoom
add event object var references
2018-12-29 11:56:53 -06:00
UnknownMap_25_29
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
UnknownMap_25_30
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
UnknownMap_25_31
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
UnknownMap_25_32
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
UnknownMap_25_33
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
UnknownMap_25_34
improve checkplayergender calls
2018-12-28 08:22:21 -06:00
VerdanturfTown
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_BattleTentBattleRoom
add event object var references
2018-12-29 11:56:53 -06:00
VerdanturfTown_BattleTentCorridor
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_BattleTentLobby
Fix merge conflicts
2019-01-02 21:25:14 +00:00
VerdanturfTown_FriendshipRatersHouse
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_House
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_Mart
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_PokemonCenter_1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_PokemonCenter_2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VerdanturfTown_WandasHouse
Fix merge conflicts
2019-01-02 21:25:14 +00:00
VictoryRoad_1F
Fix merge conflicts
2019-01-02 21:25:14 +00:00
VictoryRoad_B1F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
VictoryRoad_B2F
Use map_header_flags macro (#483)
2018-12-26 12:20:15 -06:00
connections.inc
Organize map data
2017-11-10 12:39:00 -06:00
groups.inc
Fix map constants
2018-06-20 19:54:21 -05:00
headers.inc
Fix map constants
2018-06-20 19:54:21 -05:00