DizzyEggg 1b7246395d merge conflicts, review changes, daycare

2017-11-17 19:31:03 +01:00

..

AbandonedShip_CaptainsOffice.inc

…

AbandonedShip_Corridors_1F.inc

…

AbandonedShip_Corridors_B1F.inc

…

AbandonedShip_Deck.inc

…

AbandonedShip_HiddenFloorCorridors.inc

…

AbandonedShip_HiddenFloorRooms.inc

…

AbandonedShip_Room_B1F.inc

…

AbandonedShip_Rooms2_1F.inc

…

AbandonedShip_Rooms2_B1F.inc

…

AbandonedShip_Rooms_1F.inc

…

AbandonedShip_Rooms_B1F.inc

…

AbandonedShip_Underwater1.inc

…

AbandonedShip_Underwater2.inc

…

AlteringCave.inc

…

AncientTomb.inc

…

AquaHideout_1F.inc

…

AquaHideout_B1F.inc

…

AquaHideout_B2F.inc

…

AquaHideout_UnusedRubyMap1.inc

…

AquaHideout_UnusedRubyMap2.inc

…

AquaHideout_UnusedRubyMap3.inc

…

ArtisanCave_1F.inc

…

ArtisanCave_B1F.inc

…

BattleFrontier_BattleArenaBattleRoom.inc

…

BattleFrontier_BattleArenaCorridor.inc

…

BattleFrontier_BattleArenaLobby.inc

…

BattleFrontier_BattleDomeBattleRoom.inc

…

BattleFrontier_BattleDomeCorridor.inc

…

BattleFrontier_BattleDomeLobby.inc

…

BattleFrontier_BattleDomePreBattleRoom.inc

…

BattleFrontier_BattleFactoryBattleRoom.inc

…

BattleFrontier_BattleFactoryLobby.inc

…

BattleFrontier_BattleFactoryPreBattleRoom.inc

…

BattleFrontier_BattlePalaceBattleRoom.inc

…

BattleFrontier_BattlePalaceCorridor.inc

…

BattleFrontier_BattlePalaceLobby.inc

…

BattleFrontier_BattlePikeCorridor.inc

…

BattleFrontier_BattlePikeLobby.inc

…

BattleFrontier_BattlePikeRandomRoom1.inc

…

BattleFrontier_BattlePikeRandomRoom2.inc

…

BattleFrontier_BattlePikeRandomRoom3.inc

…

BattleFrontier_BattlePikeThreePathRoom.inc

…

BattleFrontier_BattlePointExchangeServiceCorner.inc

…

BattleFrontier_BattlePyramidEmptySquare.inc

…

BattleFrontier_BattlePyramidLobby.inc

…

BattleFrontier_BattlePyramidTop.inc

…

BattleFrontier_BattleTowerBattleRoom2.inc

…

BattleFrontier_BattleTowerBattleRoom.inc

…

BattleFrontier_BattleTowerCorridor2.inc

…

BattleFrontier_BattleTowerCorridor.inc

…

BattleFrontier_BattleTowerElevator.inc

…

BattleFrontier_BattleTowerLobby.inc

…

BattleFrontier_BattleTowerMultiBattleRoom.inc

…

BattleFrontier_Lounge1.inc

…

BattleFrontier_Lounge2.inc

…

BattleFrontier_Lounge3.inc

…

BattleFrontier_Lounge4.inc

…

BattleFrontier_Lounge5.inc

…

BattleFrontier_Lounge6.inc

…

BattleFrontier_Lounge7.inc

…

BattleFrontier_Lounge8.inc

…

BattleFrontier_Lounge9.inc

…

BattleFrontier_Mart.inc

…

BattleFrontier_OutsideEast.inc

…

BattleFrontier_OutsideWest.inc

…

BattleFrontier_PokemonCenter_1F.inc

…

BattleFrontier_PokemonCenter_2F.inc

…

BattleFrontier_RankingHall.inc

…

BattleFrontier_ReceptionGate.inc

…

BattleFrontier_ScottsHouse.inc

…

BattlePyramidSquare01.inc

…

BattlePyramidSquare02.inc

…

BattlePyramidSquare03.inc

…

BattlePyramidSquare04.inc

…

BattlePyramidSquare05.inc

…

BattlePyramidSquare06.inc

…

BattlePyramidSquare07.inc

…

BattlePyramidSquare08.inc

…

BattlePyramidSquare09.inc

…

BattlePyramidSquare10.inc

…

BattlePyramidSquare11.inc

…

BattlePyramidSquare12.inc

…

BattlePyramidSquare13.inc

…

BattlePyramidSquare14.inc

…

BattlePyramidSquare15.inc

…

BattlePyramidSquare16.inc

…

BirthIsland_Exterior.inc

…

BirthIsland_Harbor.inc

…

CaveOfOrigin_1F.inc

…

CaveOfOrigin_B1F.inc

…

CaveOfOrigin_Entrance.inc

…

CaveOfOrigin_UnusedRubySapphireMap1.inc

…

CaveOfOrigin_UnusedRubySapphireMap2.inc

…

CaveOfOrigin_UnusedRubySapphireMap3.inc

…

DesertRuins.inc

…

DesertUnderpass.inc

…

DewfordTown_Gym.inc

…

DewfordTown_Hall.inc

…

DewfordTown_House1.inc

…

DewfordTown_House2.inc

…

DewfordTown_PokemonCenter_1F.inc

…

DewfordTown_PokemonCenter_2F.inc

…

DewfordTown.inc

…

DoubleBattleColosseum.inc

…

EverGrandeCity_ChampionsRoom.inc

…

EverGrandeCity_DrakesRoom.inc

…

EverGrandeCity_GlaciasRoom.inc

…

EverGrandeCity_Hall1.inc

…

EverGrandeCity_Hall2.inc

…

EverGrandeCity_Hall3.inc

…

EverGrandeCity_Hall4.inc

…

EverGrandeCity_Hall5.inc

…

EverGrandeCity_HallOfFame.inc

…

EverGrandeCity_PhoebesRoom.inc

…

EverGrandeCity_PokemonCenter_1F.inc

…

EverGrandeCity_PokemonCenter_2F.inc

…

EverGrandeCity_PokemonLeague_1F.inc

…

EverGrandeCity_PokemonLeague_2F.inc

…

EverGrandeCity_SidneysRoom.inc

…

EverGrandeCity.inc

…

FallarborTown_BattleTentBattleRoom.inc

…

FallarborTown_BattleTentCorridor.inc

…

FallarborTown_BattleTentLobby.inc

…

FallarborTown_House1.inc

…

FallarborTown_House2.inc

…

FallarborTown_Mart.inc

…

FallarborTown_PokemonCenter_1F.inc

…

FallarborTown_PokemonCenter_2F.inc

…

FallarborTown.inc

…

FarawayIsland_Entrance.inc

…

FarawayIsland_Interior.inc

…

FieryPath.inc

…

FortreeCity_DecorationShop.inc

…

FortreeCity_Gym.inc

…

FortreeCity_House1.inc

…

FortreeCity_House2.inc

…

FortreeCity_House3.inc

…

FortreeCity_House4.inc

…

FortreeCity_House5.inc

…

FortreeCity_Mart.inc

…

FortreeCity_PokemonCenter_1F.inc

…

FortreeCity_PokemonCenter_2F.inc

…

FortreeCity.inc

…

GraniteCave_1F.inc

…

GraniteCave_B1F.inc

…

GraniteCave_B2F.inc

…

GraniteCave_StevensRoom.inc

…

InsideOfTruck.inc

…

IslandCave.inc

…

JaggedPass.inc

…

LavaridgeTown_Gym_1F.inc

…

LavaridgeTown_Gym_B1F.inc

…

LavaridgeTown_HerbShop.inc

…

LavaridgeTown_House.inc

…

LavaridgeTown_Mart.inc

…

LavaridgeTown_PokemonCenter_1F.inc

…

LavaridgeTown_PokemonCenter_2F.inc

…

LavaridgeTown.inc

…

LilycoveCity_ContestHall.inc

…

LilycoveCity_ContestLobby.inc

…

LilycoveCity_CoveLilyMotel_1F.inc

…

LilycoveCity_CoveLilyMotel_2F.inc

…

LilycoveCity_DepartmentStore_1F.inc

…

LilycoveCity_DepartmentStore_2F.inc

…

LilycoveCity_DepartmentStore_3F.inc

…

LilycoveCity_DepartmentStore_4F.inc

…

LilycoveCity_DepartmentStore_5F.inc

…

LilycoveCity_DepartmentStoreElevator.inc

…

LilycoveCity_DepartmentStoreRooftop.inc

…

LilycoveCity_Harbor.inc

…

LilycoveCity_House1.inc

…

LilycoveCity_House2.inc

…

LilycoveCity_House3.inc

…

LilycoveCity_House4.inc

…

LilycoveCity_LilycoveMuseum_1F.inc

…

LilycoveCity_LilycoveMuseum_2F.inc

…

LilycoveCity_MoveDeletersHouse.inc

…

LilycoveCity_PokemonCenter_1F.inc

…

LilycoveCity_PokemonCenter_2F.inc

…

LilycoveCity_PokemonTrainerFanClub.inc

…

LilycoveCity_UnusedMart.inc

…

LilycoveCity.inc

…

LinkContestRoom1.inc

…

LinkContestRoom2.inc

…

LinkContestRoom3.inc

…

LinkContestRoom4.inc

…

LinkContestRoom5.inc

…

LinkContestRoom6.inc

…

LittlerootTown_BrendansHouse_1F.inc

…

LittlerootTown_BrendansHouse_2F.inc

…

LittlerootTown_MaysHouse_1F.inc

…

LittlerootTown_MaysHouse_2F.inc

…

LittlerootTown_ProfessorBirchsLab.inc

…

LittlerootTown.inc

…

MagmaHideout_1F.inc

…

MagmaHideout_2F_1R.inc

…

MagmaHideout_2F_2R.inc

…

MagmaHideout_2F_3R.inc

…

MagmaHideout_3F_1R.inc

…

MagmaHideout_3F_2R.inc

…

MagmaHideout_3F_3R.inc

…

MagmaHideout_4F.inc

…

MarineCave_End.inc

…

MarineCave_Entrance.inc

…

MauvilleCity_BikeShop.inc

…

MauvilleCity_GameCorner.inc

…

MauvilleCity_Gym.inc

…

MauvilleCity_House1.inc

…

MauvilleCity_House2.inc

…

MauvilleCity_Mart.inc

…

MauvilleCity_PokemonCenter_1F.inc

…

MauvilleCity_PokemonCenter_2F.inc

…

MauvilleCity.inc

…

MeteorFalls_1F_1R.inc

…

MeteorFalls_1F_2R.inc

…

MeteorFalls_B1F_1R.inc

…

MeteorFalls_B1F_2R.inc

…

MeteorFalls_StevensCave.inc

…

MirageTower_1F.inc

…

MirageTower_2F.inc

…

MirageTower_3F.inc

…

MirageTower_4F.inc

…

MossdeepCity_GameCorner_1F.inc

…

MossdeepCity_GameCorner_B1F.inc

…

MossdeepCity_Gym.inc

…

MossdeepCity_House1.inc

…

MossdeepCity_House2.inc

…

MossdeepCity_House3.inc

…

MossdeepCity_House4.inc

…

MossdeepCity_Mart.inc

…

MossdeepCity_PokemonCenter_1F.inc

…

MossdeepCity_PokemonCenter_2F.inc

…

MossdeepCity_SpaceCenter_1F.inc

…

MossdeepCity_SpaceCenter_2F.inc

…

MossdeepCity_StevensHouse.inc

…

MossdeepCity.inc

…

MtChimney_CableCarStation.inc

…

MtChimney.inc

…

MtPyre_1F.inc

…

MtPyre_2F.inc

…

MtPyre_3F.inc

…

MtPyre_4F.inc

…

MtPyre_5F.inc

…

MtPyre_6F.inc

…

MtPyre_Exterior.inc

…

MtPyre_Summit.inc

…

NavelRock_B1F.inc

…

NavelRock_Bottom.inc

…

NavelRock_Down01.inc

…

NavelRock_Down02.inc

…

NavelRock_Down03.inc

…

NavelRock_Down04.inc

…

NavelRock_Down05.inc

…

NavelRock_Down06.inc

…

NavelRock_Down07.inc

…

NavelRock_Down08.inc

…

NavelRock_Down09.inc

…

NavelRock_Down10.inc

…

NavelRock_Down11.inc

…

NavelRock_Entrance.inc

…

NavelRock_Exterior.inc

…

NavelRock_Fork.inc

…

NavelRock_Harbor.inc

…

NavelRock_Top.inc

…

NavelRock_Up1.inc

…

NavelRock_Up2.inc

…

NavelRock_Up3.inc

…

NavelRock_Up4.inc

…

NewMauville_Entrance.inc

…

NewMauville_Inside.inc

…

OldaleTown_House1.inc

…

OldaleTown_House2.inc

…

OldaleTown_Mart.inc

…

OldaleTown_PokemonCenter_1F.inc

…

OldaleTown_PokemonCenter_2F.inc

…

OldaleTown.inc

…

PacifidlogTown_House1.inc

…

PacifidlogTown_House2.inc

…

PacifidlogTown_House3.inc

…

PacifidlogTown_House4.inc

…

PacifidlogTown_House5.inc

…

PacifidlogTown_PokemonCenter_1F.inc

…

PacifidlogTown_PokemonCenter_2F.inc

…

PacifidlogTown.inc

…

PetalburgCity_Gym.inc

…

PetalburgCity_House1.inc

…

PetalburgCity_House2.inc

…

PetalburgCity_Mart.inc

…

PetalburgCity_PokemonCenter_1F.inc

…

PetalburgCity_PokemonCenter_2F.inc

…

PetalburgCity_WallysHouse.inc

…

PetalburgCity.inc

…

PetalburgWoods.inc

…

RecordCorner.inc

…

Route101.inc

…

Route102.inc

…

Route103.inc

…

Route104_MrBrineysHouse.inc

…

Route104_PrettyPetalFlowerShop.inc

…

Route104_Prototype.inc

…

Route104_PrototypePrettyPetalFlowerShop.inc

…

Route104.inc

…

Route105.inc

…

Route106.inc

…

Route107.inc

…

Route108.inc

…

Route109_SeashoreHouse.inc

…

Route109.inc

…

Route110_SeasideCyclingRoadEntrance1.inc

…

Route110_SeasideCyclingRoadEntrance2.inc

…

Route110_TrickHouseCorridor.inc

…

Route110_TrickHouseEnd.inc

…

Route110_TrickHouseEntrance.inc

…

Route110_TrickHousePuzzle1.inc

…

Route110_TrickHousePuzzle2.inc

…

Route110_TrickHousePuzzle3.inc

…

Route110_TrickHousePuzzle4.inc

…

Route110_TrickHousePuzzle5.inc

…

Route110_TrickHousePuzzle6.inc

…

Route110_TrickHousePuzzle7.inc

…

Route110_TrickHousePuzzle8.inc

…

Route110.inc

…

Route111_OldLadysRestStop.inc

…

Route111_WinstrateFamilysHouse.inc

…

Route111.inc

…

Route112_CableCarStation.inc

…

Route112.inc

…

Route113_GlassWorkshop.inc

…

Route113.inc

…

Route114_FossilManiacsHouse.inc

…

Route114_FossilManiacsTunnel.inc

…

Route114_LanettesHouse.inc

…

Route114.inc

…

Route115.inc

…

Route116_TunnelersRestHouse.inc

…

Route116.inc

…

Route117_PokemonDayCare.inc

…

Route117.inc

merge conflicts, review changes, daycare

2017-11-17 19:31:03 +01:00

Route118.inc

…

Route119_House.inc

…

Route119_WeatherInstitute_1F.inc

…

Route119_WeatherInstitute_2F.inc

…

Route119.inc

…

Route120.inc

…

Route121_SafariZoneEntrance.inc

…

Route121.inc

…

Route122.inc

…

Route123_BerryMastersHouse.inc

…

Route123.inc

…

Route124_DivingTreasureHuntersHouse.inc

…

Route124.inc

…

Route125.inc

…

Route126.inc

…

Route127.inc

…

Route128.inc

…

Route129.inc

…

Route130.inc

…

Route131.inc

…

Route132.inc

…

Route133.inc

…

Route134.inc

…

RustboroCity_CuttersHouse.inc

…

RustboroCity_DevonCorp_1F.inc

…

RustboroCity_DevonCorp_2F.inc

…

RustboroCity_DevonCorp_3F.inc

…

RustboroCity_Flat1_1F.inc

…

RustboroCity_Flat1_2F.inc

…

RustboroCity_Flat2_1F.inc

…

RustboroCity_Flat2_2F.inc

…

RustboroCity_Flat2_3F.inc

…

RustboroCity_Gym.inc

…

RustboroCity_House1.inc

…

RustboroCity_House2.inc

…

RustboroCity_House3.inc

…

RustboroCity_Mart.inc

…

RustboroCity_PokemonCenter_1F.inc

…

RustboroCity_PokemonCenter_2F.inc

…

RustboroCity_PokemonSchool.inc

…

RustboroCity.inc

…

RusturfTunnel.inc

…

SafariZone_North.inc

…

SafariZone_Northeast.inc

…

SafariZone_Northwest.inc

…

SafariZone_RestHouse.inc

…

SafariZone_South.inc

…

SafariZone_Southeast.inc

…

SafariZone_Southwest.inc

…

ScorchedSlab.inc

…

SeafloorCavern_Entrance.inc

…

SeafloorCavern_Room1.inc

…

SeafloorCavern_Room2.inc

…

SeafloorCavern_Room3.inc

…

SeafloorCavern_Room4.inc

…

SeafloorCavern_Room5.inc

…

SeafloorCavern_Room6.inc

…

SeafloorCavern_Room7.inc

…

SeafloorCavern_Room8.inc

…

SeafloorCavern_Room9.inc

…

SealedChamber_InnerRoom.inc

…

SealedChamber_OuterRoom.inc

…

SecretBase_BlueCave1.inc

…

SecretBase_BlueCave2.inc

…

SecretBase_BlueCave3.inc

…

SecretBase_BlueCave4.inc

…

SecretBase_BrownCave1.inc

…

SecretBase_BrownCave2.inc

…

SecretBase_BrownCave3.inc

…

SecretBase_BrownCave4.inc

…

SecretBase_RedCave1.inc

…

SecretBase_RedCave2.inc

…

SecretBase_RedCave3.inc

…

SecretBase_RedCave4.inc

…

SecretBase_Shrub1.inc

…

SecretBase_Shrub2.inc

…

SecretBase_Shrub3.inc

…

SecretBase_Shrub4.inc

…

SecretBase_Tree1.inc

…

SecretBase_Tree2.inc

…

SecretBase_Tree3.inc

…

SecretBase_Tree4.inc

…

SecretBase_YellowCave1.inc

…

SecretBase_YellowCave2.inc

…

SecretBase_YellowCave3.inc

…

SecretBase_YellowCave4.inc

…

ShoalCave_HighTideEntranceRoom.inc

…

ShoalCave_HighTideInnerRoom.inc

…

ShoalCave_LowTideEntranceRoom.inc

…

ShoalCave_LowTideIceRoom.inc

…

ShoalCave_LowTideInnerRoom.inc

…

ShoalCave_LowTideLowerRoom.inc

…

ShoalCave_LowTideStairsRoom.inc

…

SingleBattleColosseum.inc

…

SkyPillar_1F.inc

…

SkyPillar_2F.inc

…

SkyPillar_3F.inc

…

SkyPillar_4F.inc

…

SkyPillar_5F.inc

…

SkyPillar_Entrance.inc

…

SkyPillar_Outside.inc

…

SkyPillar_Top.inc

…

SlateportCity_BattleTentBattleRoom.inc

…

SlateportCity_BattleTentCorridor.inc

…

SlateportCity_BattleTentLobby.inc

…

SlateportCity_Harbor.inc

…

SlateportCity_House1.inc

…

SlateportCity_House2.inc

…

SlateportCity_Mart.inc

…

SlateportCity_OceanicMuseum_1F.inc

…

SlateportCity_OceanicMuseum_2F.inc

…

SlateportCity_PokemonCenter_1F.inc

…

SlateportCity_PokemonCenter_2F.inc

…

SlateportCity_PokemonFanClub.inc

…

SlateportCity_SternsShipyard_1F.inc

…

SlateportCity_SternsShipyard_2F.inc

…

SlateportCity.inc

…

SootopolisCity_Gym_1F.inc

…

SootopolisCity_Gym_B1F.inc

…

SootopolisCity_House1.inc

…

SootopolisCity_House2.inc

…

SootopolisCity_House3.inc

…

SootopolisCity_House4.inc

…

SootopolisCity_House5.inc

…

SootopolisCity_House6.inc

…

SootopolisCity_House7.inc

…

SootopolisCity_LotadAndSeedotHouse.inc

…

SootopolisCity_Mart.inc

…

SootopolisCity_MysteryEventsHouse_1F.inc

…

SootopolisCity_MysteryEventsHouse_B1F.inc

…

SootopolisCity_PokemonCenter_1F.inc

…

SootopolisCity_PokemonCenter_2F.inc

…

SootopolisCity.inc

…

SouthernIsland_Exterior.inc

…

SouthernIsland_Interior.inc

…

SSTidalCorridor.inc

…

SSTidalLowerDeck.inc

…

SSTidalRooms.inc

…

TerraCave_End.inc

…

TerraCave_Entrance.inc

…

TradeCenter.inc

…

TrainerHill_1F.inc

…

TrainerHill_2F.inc

…

TrainerHill_3F.inc

…

TrainerHill_4F.inc

…

TrainerHill_Elevator.inc

…

TrainerHill_Entrance.inc

…

TrainerHill_Roof.inc

…

Underwater1.inc

…

Underwater2.inc

…

Underwater3.inc

…

Underwater4.inc

…

Underwater5.inc

…

Underwater6.inc

…

Underwater7.inc

…

Underwater_MarineCave.inc

…

Underwater_Route134.inc

…

Underwater_SeafloorCavern.inc

…

Underwater_SealedChamber.inc

…

Underwater_SootopolisCity.inc

…

UnionRoom.inc

…

UnknownMap_25_29.inc

…

UnknownMap_25_30.inc

…

UnknownMap_25_31.inc

…

UnknownMap_25_32.inc

…

UnknownMap_25_33.inc

…

UnknownMap_25_34.inc

…

VerdanturfTown_BattleTentBattleRoom.inc

…

VerdanturfTown_BattleTentCorridor.inc

…

VerdanturfTown_BattleTentLobby.inc

…

VerdanturfTown_FriendshipRatersHouse.inc

…

VerdanturfTown_House.inc

…

VerdanturfTown_Mart.inc

…

VerdanturfTown_PokemonCenter_1F.inc

…

VerdanturfTown_PokemonCenter_2F.inc

…

VerdanturfTown_WandasHouse.inc

…

VerdanturfTown.inc

…

VictoryRoad_1F.inc

…

VictoryRoad_B1F.inc

…

VictoryRoad_B2F.inc

…