Hedara 9d80ad530d Merge branch 'master' into master-to-upcoming ... Conflicts: Makefile data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc data/maps/MtChimney/scripts.inc data/maps/MtPyre_Summit/scripts.inc data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc include/constants/event_objects.h include/constants/expansion.h src/battle_script_commands.c src/battle_util.c src/field_screen_effect.c		2025-05-28 14:26:15 +02:00
..
AbandonedShip_CaptainsOffice
AbandonedShip_Corridors_1F
AbandonedShip_Corridors_B1F
AbandonedShip_Deck
AbandonedShip_HiddenFloorCorridors
AbandonedShip_HiddenFloorRooms
AbandonedShip_Room_B1F
AbandonedShip_Rooms_1F
AbandonedShip_Rooms_B1F
AbandonedShip_Rooms2_1F
AbandonedShip_Rooms2_B1F
AbandonedShip_Underwater1
AbandonedShip_Underwater2
AlteringCave
AncientTomb
AquaHideout_1F
AquaHideout_B1F
AquaHideout_B2F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
AquaHideout_UnusedRubyMap1
AquaHideout_UnusedRubyMap2
AquaHideout_UnusedRubyMap3
ArtisanCave_1F
ArtisanCave_B1F
BattleColosseum_2P
BattleColosseum_4P
BattleFrontier_BattleArenaBattleRoom
BattleFrontier_BattleArenaCorridor
BattleFrontier_BattleArenaLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattleDomeBattleRoom	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02:00
BattleFrontier_BattleDomeCorridor
BattleFrontier_BattleDomeLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattleDomePreBattleRoom
BattleFrontier_BattleFactoryBattleRoom
BattleFrontier_BattleFactoryLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattleFactoryPreBattleRoom	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattlePalaceBattleRoom
BattleFrontier_BattlePalaceCorridor
BattleFrontier_BattlePalaceLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattlePikeCorridor
BattleFrontier_BattlePikeLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattlePikeRoomFinal
BattleFrontier_BattlePikeRoomNormal
BattleFrontier_BattlePikeRoomWildMons
BattleFrontier_BattlePikeThreePathRoom
BattleFrontier_BattlePyramidFloor	Trainer Battle Parameter Consolidation (#5982)	2025-01-25 22:02:39 +01:00
BattleFrontier_BattlePyramidLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattlePyramidTop
BattleFrontier_BattleTowerBattleRoom
BattleFrontier_BattleTowerCorridor
BattleFrontier_BattleTowerElevator
BattleFrontier_BattleTowerLobby	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_BattleTowerMultiBattleRoom
BattleFrontier_BattleTowerMultiCorridor
BattleFrontier_BattleTowerMultiPartnerRoom
BattleFrontier_ExchangeServiceCorner
BattleFrontier_Lounge1
BattleFrontier_Lounge2
BattleFrontier_Lounge3
BattleFrontier_Lounge4
BattleFrontier_Lounge5	Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195)	2025-02-08 12:51:22 -08:00
BattleFrontier_Lounge6
BattleFrontier_Lounge7
BattleFrontier_Lounge8
BattleFrontier_Lounge9
BattleFrontier_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BattleFrontier_OutsideEast	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
BattleFrontier_OutsideWest
BattleFrontier_PokemonCenter_1F
BattleFrontier_PokemonCenter_2F
BattleFrontier_RankingHall
BattleFrontier_ReceptionGate
BattleFrontier_ScottsHouse
BattlePyramidSquare01
BattlePyramidSquare02
BattlePyramidSquare03
BattlePyramidSquare04
BattlePyramidSquare05
BattlePyramidSquare06
BattlePyramidSquare07
BattlePyramidSquare08
BattlePyramidSquare09
BattlePyramidSquare10
BattlePyramidSquare11
BattlePyramidSquare12
BattlePyramidSquare13
BattlePyramidSquare14
BattlePyramidSquare15
BattlePyramidSquare16
BirthIsland_Exterior	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
BirthIsland_Harbor
CaveOfOrigin_1F
CaveOfOrigin_B1F
CaveOfOrigin_Entrance
CaveOfOrigin_UnusedRubySapphireMap1
CaveOfOrigin_UnusedRubySapphireMap2
CaveOfOrigin_UnusedRubySapphireMap3
ContestHall
ContestHallBeauty
ContestHallCool
ContestHallCute
ContestHallSmart
ContestHallTough
DesertRuins
DesertUnderpass	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
DewfordTown	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
DewfordTown_Gym
DewfordTown_Hall
DewfordTown_House1
DewfordTown_House2
DewfordTown_PokemonCenter_1F
DewfordTown_PokemonCenter_2F
EverGrandeCity	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
EverGrandeCity_ChampionsRoom
EverGrandeCity_DrakesRoom
EverGrandeCity_GlaciasRoom
EverGrandeCity_Hall1
EverGrandeCity_Hall2
EverGrandeCity_Hall3
EverGrandeCity_Hall4
EverGrandeCity_Hall5
EverGrandeCity_HallOfFame
EverGrandeCity_PhoebesRoom
EverGrandeCity_PokemonCenter_1F
EverGrandeCity_PokemonCenter_2F
EverGrandeCity_PokemonLeague_1F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
EverGrandeCity_PokemonLeague_2F
EverGrandeCity_SidneysRoom
FallarborTown	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
FallarborTown_BattleTentBattleRoom
FallarborTown_BattleTentCorridor
FallarborTown_BattleTentLobby
FallarborTown_CozmosHouse
FallarborTown_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
FallarborTown_MoveRelearnersHouse
FallarborTown_PokemonCenter_1F
FallarborTown_PokemonCenter_2F
FarawayIsland_Entrance
FarawayIsland_Interior
FieryPath
FortreeCity	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
FortreeCity_DecorationShop
FortreeCity_Gym
FortreeCity_House1
FortreeCity_House2
FortreeCity_House3
FortreeCity_House4
FortreeCity_House5
FortreeCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
FortreeCity_PokemonCenter_1F
FortreeCity_PokemonCenter_2F
GraniteCave_1F
GraniteCave_B1F
GraniteCave_B2F
GraniteCave_StevensRoom
InsideOfTruck
IslandCave
JaggedPass	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
LavaridgeTown	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
LavaridgeTown_Gym_1F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
LavaridgeTown_Gym_B1F
LavaridgeTown_HerbShop
LavaridgeTown_House
LavaridgeTown_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
LavaridgeTown_PokemonCenter_1F
LavaridgeTown_PokemonCenter_2F
LilycoveCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
LilycoveCity_ContestHall
LilycoveCity_ContestLobby
LilycoveCity_CoveLilyMotel_1F
LilycoveCity_CoveLilyMotel_2F
LilycoveCity_DepartmentStore_1F
LilycoveCity_DepartmentStore_2F
LilycoveCity_DepartmentStore_3F
LilycoveCity_DepartmentStore_4F
LilycoveCity_DepartmentStore_5F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
LilycoveCity_DepartmentStoreElevator
LilycoveCity_DepartmentStoreRooftop
LilycoveCity_Harbor
LilycoveCity_House1
LilycoveCity_House2
LilycoveCity_House3
LilycoveCity_House4
LilycoveCity_LilycoveMuseum_1F
LilycoveCity_LilycoveMuseum_2F
LilycoveCity_MoveDeletersHouse
LilycoveCity_PokemonCenter_1F
LilycoveCity_PokemonCenter_2F
LilycoveCity_PokemonTrainerFanClub
LilycoveCity_UnusedMart
LittlerootTown	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
LittlerootTown_BrendansHouse_1F
LittlerootTown_BrendansHouse_2F	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
LittlerootTown_MaysHouse_1F
LittlerootTown_MaysHouse_2F	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
LittlerootTown_ProfessorBirchsLab
MagmaHideout_1F
MagmaHideout_2F_1R
MagmaHideout_2F_2R
MagmaHideout_2F_3R
MagmaHideout_3F_1R
MagmaHideout_3F_2R
MagmaHideout_3F_3R
MagmaHideout_4F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MarineCave_End
MarineCave_Entrance
MauvilleCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
MauvilleCity_BikeShop
MauvilleCity_GameCorner
MauvilleCity_Gym
MauvilleCity_House1
MauvilleCity_House2
MauvilleCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MauvilleCity_PokemonCenter_1F
MauvilleCity_PokemonCenter_2F
MeteorFalls_1F_1R	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MeteorFalls_1F_2R
MeteorFalls_B1F_1R
MeteorFalls_B1F_2R
MeteorFalls_StevensCave
MirageTower_1F
MirageTower_2F
MirageTower_3F
MirageTower_4F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MossdeepCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
MossdeepCity_GameCorner_1F
MossdeepCity_GameCorner_B1F
MossdeepCity_Gym	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MossdeepCity_House1
MossdeepCity_House2
MossdeepCity_House3
MossdeepCity_House4
MossdeepCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MossdeepCity_PokemonCenter_1F
MossdeepCity_PokemonCenter_2F
MossdeepCity_SpaceCenter_1F
MossdeepCity_SpaceCenter_2F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
MossdeepCity_StevensHouse
MtChimney	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02:00
MtChimney_CableCarStation
MtPyre_1F
MtPyre_2F
MtPyre_3F
MtPyre_4F
MtPyre_5F
MtPyre_6F
MtPyre_Exterior
MtPyre_Summit	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02:00
NavelRock_B1F
NavelRock_Bottom
NavelRock_Down01
NavelRock_Down02
NavelRock_Down03
NavelRock_Down04
NavelRock_Down05
NavelRock_Down06
NavelRock_Down07
NavelRock_Down08
NavelRock_Down09
NavelRock_Down10
NavelRock_Down11
NavelRock_Entrance
NavelRock_Exterior
NavelRock_Fork
NavelRock_Harbor
NavelRock_Top
NavelRock_Up1
NavelRock_Up2
NavelRock_Up3
NavelRock_Up4
NewMauville_Entrance
NewMauville_Inside
OldaleTown	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
OldaleTown_House1
OldaleTown_House2
OldaleTown_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
OldaleTown_PokemonCenter_1F
OldaleTown_PokemonCenter_2F
PacifidlogTown	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
PacifidlogTown_House1
PacifidlogTown_House2
PacifidlogTown_House3
PacifidlogTown_House4
PacifidlogTown_House5
PacifidlogTown_PokemonCenter_1F
PacifidlogTown_PokemonCenter_2F
PetalburgCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
PetalburgCity_Gym	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
PetalburgCity_House1
PetalburgCity_House2
PetalburgCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
PetalburgCity_PokemonCenter_1F
PetalburgCity_PokemonCenter_2F
PetalburgCity_WallysHouse
PetalburgWoods	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
RecordCorner
Route101
Route102
Route103	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route104	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route104_MrBrineysHouse
Route104_PrettyPetalFlowerShop	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route104_Prototype
Route104_PrototypePrettyPetalFlowerShop
Route105
Route106
Route107
Route108
Route109	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route109_SeashoreHouse
Route110	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route110_SeasideCyclingRoadNorthEntrance
Route110_SeasideCyclingRoadSouthEntrance
Route110_TrickHouseCorridor
Route110_TrickHouseEnd
Route110_TrickHouseEntrance
Route110_TrickHousePuzzle1
Route110_TrickHousePuzzle2
Route110_TrickHousePuzzle3
Route110_TrickHousePuzzle4
Route110_TrickHousePuzzle5
Route110_TrickHousePuzzle6
Route110_TrickHousePuzzle7
Route110_TrickHousePuzzle8
Route111	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route111_OldLadysRestStop
Route111_WinstrateFamilysHouse
Route112	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route112_CableCarStation
Route113
Route113_GlassWorkshop
Route114
Route114_FossilManiacsHouse
Route114_FossilManiacsTunnel
Route114_LanettesHouse
Route115
Route116	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route116_TunnelersRestHouse
Route117	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route117_PokemonDayCare
Route118	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route119	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route119_House
Route119_WeatherInstitute_1F
Route119_WeatherInstitute_2F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route120	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route121	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
Route121_SafariZoneEntrance
Route122
Route123
Route123_BerryMastersHouse
Route124
Route124_DivingTreasureHuntersHouse
Route125
Route126
Route127
Route128
Route129
Route130
Route131
Route132
Route133
Route134
RustboroCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
RustboroCity_CuttersHouse
RustboroCity_DevonCorp_1F
RustboroCity_DevonCorp_2F
RustboroCity_DevonCorp_3F
RustboroCity_Flat1_1F
RustboroCity_Flat1_2F
RustboroCity_Flat2_1F
RustboroCity_Flat2_2F
RustboroCity_Flat2_3F
RustboroCity_Gym
RustboroCity_House1
RustboroCity_House2
RustboroCity_House3
RustboroCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
RustboroCity_PokemonCenter_1F
RustboroCity_PokemonCenter_2F
RustboroCity_PokemonSchool
RusturfTunnel	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
SafariZone_North
SafariZone_Northeast
SafariZone_Northwest
SafariZone_RestHouse
SafariZone_South
SafariZone_Southeast
SafariZone_Southwest
ScorchedSlab
SeafloorCavern_Entrance
SeafloorCavern_Room1
SeafloorCavern_Room2
SeafloorCavern_Room3
SeafloorCavern_Room4
SeafloorCavern_Room5
SeafloorCavern_Room6
SeafloorCavern_Room7
SeafloorCavern_Room8
SeafloorCavern_Room9	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
SealedChamber_InnerRoom
SealedChamber_OuterRoom
SecretBase_BlueCave1
SecretBase_BlueCave2
SecretBase_BlueCave3
SecretBase_BlueCave4
SecretBase_BrownCave1
SecretBase_BrownCave2
SecretBase_BrownCave3
SecretBase_BrownCave4
SecretBase_RedCave1
SecretBase_RedCave2
SecretBase_RedCave3
SecretBase_RedCave4
SecretBase_Shrub1
SecretBase_Shrub2
SecretBase_Shrub3
SecretBase_Shrub4
SecretBase_Tree1
SecretBase_Tree2
SecretBase_Tree3
SecretBase_Tree4
SecretBase_YellowCave1
SecretBase_YellowCave2
SecretBase_YellowCave3
SecretBase_YellowCave4
ShoalCave_HighTideEntranceRoom
ShoalCave_HighTideInnerRoom
ShoalCave_LowTideEntranceRoom
ShoalCave_LowTideIceRoom
ShoalCave_LowTideInnerRoom
ShoalCave_LowTideLowerRoom
ShoalCave_LowTideStairsRoom
SkyPillar_1F
SkyPillar_2F
SkyPillar_3F
SkyPillar_4F
SkyPillar_5F
SkyPillar_Entrance
SkyPillar_Outside
SkyPillar_Top
SlateportCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
SlateportCity_BattleTentBattleRoom	Merge branch 'master' into master-to-upcoming	2025-05-28 14:26:15 +02:00
SlateportCity_BattleTentCorridor
SlateportCity_BattleTentLobby
SlateportCity_Harbor
SlateportCity_House
SlateportCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
SlateportCity_NameRatersHouse
SlateportCity_OceanicMuseum_1F
SlateportCity_OceanicMuseum_2F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
SlateportCity_PokemonCenter_1F
SlateportCity_PokemonCenter_2F
SlateportCity_PokemonFanClub
SlateportCity_SternsShipyard_1F
SlateportCity_SternsShipyard_2F
SootopolisCity	Merge commit '07c897a' into pret-merge	2025-05-27 19:46:13 +02:00
SootopolisCity_Gym_1F
SootopolisCity_Gym_B1F
SootopolisCity_House1
SootopolisCity_House2
SootopolisCity_House3
SootopolisCity_House4
SootopolisCity_House5
SootopolisCity_House6
SootopolisCity_House7
SootopolisCity_LotadAndSeedotHouse
SootopolisCity_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
SootopolisCity_MysteryEventsHouse_1F
SootopolisCity_MysteryEventsHouse_B1F
SootopolisCity_PokemonCenter_1F
SootopolisCity_PokemonCenter_2F
SouthernIsland_Exterior	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
SouthernIsland_Interior
SSTidalCorridor
SSTidalLowerDeck
SSTidalRooms
TerraCave_End
TerraCave_Entrance
TradeCenter
TrainerHill_1F
TrainerHill_2F
TrainerHill_3F
TrainerHill_4F
TrainerHill_Elevator
TrainerHill_Entrance	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
TrainerHill_Roof
Underwater_MarineCave
Underwater_Route105
Underwater_Route124
Underwater_Route125
Underwater_Route126
Underwater_Route127
Underwater_Route128
Underwater_Route129
Underwater_Route134
Underwater_SeafloorCavern
Underwater_SealedChamber
Underwater_SootopolisCity
UnionRoom	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
UnusedContestHall1
UnusedContestHall2
UnusedContestHall3
UnusedContestHall4
UnusedContestHall5
UnusedContestHall6
VerdanturfTown	Generate heal location constants automatically, move data back to a single file.	2025-02-03 20:25:11 -05:00
VerdanturfTown_BattleTentBattleRoom
VerdanturfTown_BattleTentCorridor
VerdanturfTown_BattleTentLobby
VerdanturfTown_FriendshipRatersHouse
VerdanturfTown_House
VerdanturfTown_Mart	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
VerdanturfTown_PokemonCenter_1F
VerdanturfTown_PokemonCenter_2F
VerdanturfTown_WandasHouse
VictoryRoad_1F	Merge commit '678fdf9' into pret-merge	2025-05-27 19:22:40 +02:00
VictoryRoad_B1F
VictoryRoad_B2F
.gitignore
map_groups.json