From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: [PATCH] Move events and scripts into map dirs --- data/event_scripts.s | 1036 ++++++++--------- data/map_events.s | 1036 ++++++++--------- .../events.inc} | 0 .../AbandonedShip_CaptainsOffice/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Corridors_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Corridors_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Deck/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Room_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms2_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms2_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms_1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Rooms_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Underwater1/scripts.inc} | 0 .../events.inc} | 0 .../AbandonedShip_Underwater2/scripts.inc} | 0 .../events.inc} | 0 .../AlteringCave/scripts.inc} | 0 .../events.inc} | 0 .../AncientTomb/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_1F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_B1F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_B2F/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap1/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap2/scripts.inc} | 0 .../events.inc} | 0 .../AquaHideout_UnusedRubyMap3/scripts.inc} | 0 .../events.inc} | 0 .../ArtisanCave_1F/scripts.inc} | 0 .../events.inc} | 0 .../ArtisanCave_B1F/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge1/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge2/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge3/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge4/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge5/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge6/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge7/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge8/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Lounge9/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_Mart/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_OutsideEast/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_OutsideWest/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_RankingHall/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_ReceptionGate/scripts.inc} | 0 .../events.inc} | 0 .../BattleFrontier_ScottsHouse/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare01/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare02/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare03/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare04/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare05/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare06/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare07/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare08/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare09/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare10/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare11/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare12/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare13/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare14/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare15/scripts.inc} | 0 .../events.inc} | 0 .../BattlePyramidSquare16/scripts.inc} | 0 .../events.inc} | 0 .../BirthIsland_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../BirthIsland_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_1F/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_B1F/scripts.inc} | 0 .../events.inc} | 0 .../CaveOfOrigin_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../DesertRuins/scripts.inc} | 0 .../events.inc} | 0 .../DesertUnderpass/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_Gym/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_Hall/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../DewfordTown_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../DoubleBattleColosseum/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_ChampionsRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_DrakesRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_GlaciasRoom/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall1/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall2/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall3/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall4/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_Hall5/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_HallOfFame/scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_PhoebesRoom/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../EverGrandeCity_SidneysRoom/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../FallarborTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../FarawayIsland_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../FarawayIsland_Interior/scripts.inc} | 0 .../FieryPath.inc => FieryPath/events.inc} | 0 .../FieryPath/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_DecorationShop/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_House5/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../FortreeCity_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_1F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_B1F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_B2F/scripts.inc} | 0 .../events.inc} | 0 .../GraniteCave_StevensRoom/scripts.inc} | 0 .../events.inc} | 0 .../InsideOfTruck/scripts.inc} | 0 .../IslandCave.inc => IslandCave/events.inc} | 0 .../IslandCave/scripts.inc} | 0 .../JaggedPass.inc => JaggedPass/events.inc} | 0 .../JaggedPass/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Gym_1F/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Gym_B1F/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_HerbShop/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_House/scripts.inc} | 0 .../events.inc} | 0 .../LavaridgeTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_ContestHall/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_ContestLobby/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LilycoveCity_UnusedMart/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom1/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom2/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom3/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom4/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom5/scripts.inc} | 0 .../events.inc} | 0 .../LinkContestRoom6/scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown_MaysHouse_1F/scripts.inc} | 0 .../events.inc} | 0 .../LittlerootTown_MaysHouse_2F/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_1F/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_2F_3R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_3F_3R/scripts.inc} | 0 .../events.inc} | 0 .../MagmaHideout_4F/scripts.inc} | 0 .../events.inc} | 0 .../MarineCave_End/scripts.inc} | 0 .../events.inc} | 0 .../MarineCave_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_BikeShop/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_GameCorner/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../MauvilleCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_1F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_1F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_B1F_1R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_B1F_2R/scripts.inc} | 0 .../events.inc} | 0 .../MeteorFalls_StevensCave/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_1F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_2F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_3F/scripts.inc} | 0 .../events.inc} | 0 .../MirageTower_4F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_GameCorner_1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_GameCorner_B1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_SpaceCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_SpaceCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../MossdeepCity_StevensHouse/scripts.inc} | 0 .../MtChimney.inc => MtChimney/events.inc} | 0 .../MtChimney/scripts.inc} | 0 .../events.inc} | 0 .../MtChimney_CableCarStation/scripts.inc} | 0 .../MtPyre_1F.inc => MtPyre_1F/events.inc} | 0 .../MtPyre_1F/scripts.inc} | 0 .../MtPyre_2F.inc => MtPyre_2F/events.inc} | 0 .../MtPyre_2F/scripts.inc} | 0 .../MtPyre_3F.inc => MtPyre_3F/events.inc} | 0 .../MtPyre_3F/scripts.inc} | 0 .../MtPyre_4F.inc => MtPyre_4F/events.inc} | 0 .../MtPyre_4F/scripts.inc} | 0 .../MtPyre_5F.inc => MtPyre_5F/events.inc} | 0 .../MtPyre_5F/scripts.inc} | 0 .../MtPyre_6F.inc => MtPyre_6F/events.inc} | 0 .../MtPyre_6F/scripts.inc} | 0 .../events.inc} | 0 .../MtPyre_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../MtPyre_Summit/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_B1F/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Bottom/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down01/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down02/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down03/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down04/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down05/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down06/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down07/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down08/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down09/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down10/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Down11/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Fork/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Top/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up1/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up2/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up3/scripts.inc} | 0 .../events.inc} | 0 .../NavelRock_Up4/scripts.inc} | 0 .../events.inc} | 0 .../NewMauville_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../NewMauville_Inside/scripts.inc} | 0 .../OldaleTown.inc => OldaleTown/events.inc} | 0 .../OldaleTown/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_PokemonCenter_1F/scripts.inc} | 0 .../events.inc} | 0 .../OldaleTown_PokemonCenter_2F/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House1/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House2/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House3/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House4/scripts.inc} | 0 .../events.inc} | 0 .../PacifidlogTown_House5/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../PetalburgCity_WallysHouse/scripts.inc} | 0 .../events.inc} | 0 .../PetalburgWoods/scripts.inc} | 0 .../events.inc} | 0 .../RecordCorner/scripts.inc} | 0 .../Route101.inc => Route101/events.inc} | 0 .../Route101/scripts.inc} | 0 .../Route102.inc => Route102/events.inc} | 0 .../Route102/scripts.inc} | 0 .../Route103.inc => Route103/events.inc} | 0 .../Route103/scripts.inc} | 0 .../Route104.inc => Route104/events.inc} | 0 .../Route104/scripts.inc} | 0 .../events.inc} | 0 .../Route104_MrBrineysHouse/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../Route104_Prototype/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route105.inc => Route105/events.inc} | 0 .../Route105/scripts.inc} | 0 .../Route106.inc => Route106/events.inc} | 0 .../Route106/scripts.inc} | 0 .../Route107.inc => Route107/events.inc} | 0 .../Route107/scripts.inc} | 0 .../Route108.inc => Route108/events.inc} | 0 .../Route108/scripts.inc} | 0 .../Route109.inc => Route109/events.inc} | 0 .../Route109/scripts.inc} | 0 .../events.inc} | 0 .../Route109_SeashoreHouse/scripts.inc} | 0 .../Route110.inc => Route110/events.inc} | 0 .../Route110/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseCorridor/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseEnd/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHouseEntrance/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle1/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle2/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle3/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle4/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle5/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle6/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle7/scripts.inc} | 0 .../events.inc} | 0 .../Route110_TrickHousePuzzle8/scripts.inc} | 0 .../Route111.inc => Route111/events.inc} | 0 .../Route111/scripts.inc} | 0 .../events.inc} | 0 .../Route111_OldLadysRestStop/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route112.inc => Route112/events.inc} | 0 .../Route112/scripts.inc} | 0 .../events.inc} | 0 .../Route112_CableCarStation/scripts.inc} | 0 .../Route113.inc => Route113/events.inc} | 0 .../Route113/scripts.inc} | 0 .../events.inc} | 0 .../Route113_GlassWorkshop/scripts.inc} | 0 .../Route114.inc => Route114/events.inc} | 0 .../Route114/scripts.inc} | 0 .../events.inc} | 0 .../Route114_FossilManiacsHouse/scripts.inc} | 0 .../events.inc} | 0 .../Route114_FossilManiacsTunnel/scripts.inc} | 0 .../events.inc} | 0 .../Route114_LanettesHouse/scripts.inc} | 0 .../Route115.inc => Route115/events.inc} | 0 .../Route115/scripts.inc} | 0 .../Route116.inc => Route116/events.inc} | 0 .../Route116/scripts.inc} | 0 .../events.inc} | 0 .../Route116_TunnelersRestHouse/scripts.inc} | 0 .../Route117.inc => Route117/events.inc} | 0 .../Route117/scripts.inc} | 0 .../events.inc} | 0 .../Route117_PokemonDayCare/scripts.inc} | 0 .../Route118.inc => Route118/events.inc} | 0 .../Route118/scripts.inc} | 0 .../Route119.inc => Route119/events.inc} | 0 .../Route119/scripts.inc} | 0 .../events.inc} | 0 .../Route119_House/scripts.inc} | 0 .../events.inc} | 0 .../Route119_WeatherInstitute_1F/scripts.inc} | 0 .../events.inc} | 0 .../Route119_WeatherInstitute_2F/scripts.inc} | 0 .../Route120.inc => Route120/events.inc} | 0 .../Route120/scripts.inc} | 0 .../Route121.inc => Route121/events.inc} | 0 .../Route121/scripts.inc} | 0 .../events.inc} | 0 .../Route121_SafariZoneEntrance/scripts.inc} | 0 .../Route122.inc => Route122/events.inc} | 0 .../Route122/scripts.inc} | 0 .../Route123.inc => Route123/events.inc} | 0 .../Route123/scripts.inc} | 0 .../events.inc} | 0 .../Route123_BerryMastersHouse/scripts.inc} | 0 .../Route124.inc => Route124/events.inc} | 0 .../Route124/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../Route125.inc => Route125/events.inc} | 0 .../Route125/scripts.inc} | 0 .../Route126.inc => Route126/events.inc} | 0 .../Route126/scripts.inc} | 0 .../Route127.inc => Route127/events.inc} | 0 .../Route127/scripts.inc} | 0 .../Route128.inc => Route128/events.inc} | 0 .../Route128/scripts.inc} | 0 .../Route129.inc => Route129/events.inc} | 0 .../Route129/scripts.inc} | 0 .../Route130.inc => Route130/events.inc} | 0 .../Route130/scripts.inc} | 0 .../Route131.inc => Route131/events.inc} | 0 .../Route131/scripts.inc} | 0 .../Route132.inc => Route132/events.inc} | 0 .../Route132/scripts.inc} | 0 .../Route133.inc => Route133/events.inc} | 0 .../Route133/scripts.inc} | 0 .../Route134.inc => Route134/events.inc} | 0 .../Route134/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_CuttersHouse/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_DevonCorp_3F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat1_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat1_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_1F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_2F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Flat2_3F/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Gym/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../RustboroCity_PokemonSchool/scripts.inc} | 0 .../events.inc} | 0 .../RusturfTunnel/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalCorridor/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalLowerDeck/scripts.inc} | 0 .../events.inc} | 0 .../SSTidalRooms/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_North/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Northeast/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Northwest/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_RestHouse/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_South/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Southeast/scripts.inc} | 0 .../events.inc} | 0 .../SafariZone_Southwest/scripts.inc} | 0 .../events.inc} | 0 .../ScorchedSlab/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room1/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room2/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room3/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room4/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room5/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room6/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room7/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room8/scripts.inc} | 0 .../events.inc} | 0 .../SeafloorCavern_Room9/scripts.inc} | 0 .../events.inc} | 0 .../SealedChamber_InnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../SealedChamber_OuterRoom/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BlueCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_BrownCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_RedCave4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Shrub4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_Tree4/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave1/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave2/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave3/scripts.inc} | 0 .../events.inc} | 0 .../SecretBase_YellowCave4/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_HighTideInnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideIceRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideInnerRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideLowerRoom/scripts.inc} | 0 .../events.inc} | 0 .../ShoalCave_LowTideStairsRoom/scripts.inc} | 0 .../events.inc} | 0 .../SingleBattleColosseum/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_1F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_2F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_3F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_4F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_5F/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Outside/scripts.inc} | 0 .../events.inc} | 0 .../SkyPillar_Top/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_Harbor/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SlateportCity_PokemonFanClub/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Gym_1F/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Gym_B1F/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House1/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House2/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House3/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House4/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House5/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House6/scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_House7/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SootopolisCity_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../SouthernIsland_Exterior/scripts.inc} | 0 .../events.inc} | 0 .../SouthernIsland_Interior/scripts.inc} | 0 .../events.inc} | 0 .../TerraCave_End/scripts.inc} | 0 .../events.inc} | 0 .../TerraCave_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../TradeCenter/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_1F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_2F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_3F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_4F/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Elevator/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Entrance/scripts.inc} | 0 .../events.inc} | 0 .../TrainerHill_Roof/scripts.inc} | 0 .../events.inc} | 0 .../Underwater1/scripts.inc} | 0 .../events.inc} | 0 .../Underwater2/scripts.inc} | 0 .../events.inc} | 0 .../Underwater3/scripts.inc} | 0 .../events.inc} | 0 .../Underwater4/scripts.inc} | 0 .../events.inc} | 0 .../Underwater5/scripts.inc} | 0 .../events.inc} | 0 .../Underwater6/scripts.inc} | 0 .../events.inc} | 0 .../Underwater7/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_MarineCave/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_Route134/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SeafloorCavern/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SealedChamber/scripts.inc} | 0 .../events.inc} | 0 .../Underwater_SootopolisCity/scripts.inc} | 0 .../UnionRoom.inc => UnionRoom/events.inc} | 0 .../UnionRoom/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_29/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_30/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_31/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_32/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_33/scripts.inc} | 0 .../events.inc} | 0 .../UnknownMap_25_34/scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_House/scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_Mart/scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../scripts.inc} | 0 .../events.inc} | 0 .../VerdanturfTown_WandasHouse/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_1F/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_B1F/scripts.inc} | 0 .../events.inc} | 0 .../VictoryRoad_B2F/scripts.inc} | 0 1038 files changed, 1036 insertions(+), 1036 deletions(-) rename data/maps/{events/AbandonedShip_CaptainsOffice.inc => AbandonedShip_CaptainsOffice/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_CaptainsOffice.inc => maps/AbandonedShip_CaptainsOffice/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_1F.inc => AbandonedShip_Corridors_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_1F.inc => maps/AbandonedShip_Corridors_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Corridors_B1F.inc => AbandonedShip_Corridors_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Corridors_B1F.inc => maps/AbandonedShip_Corridors_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Deck.inc => AbandonedShip_Deck/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Deck.inc => maps/AbandonedShip_Deck/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorCorridors.inc => AbandonedShip_HiddenFloorCorridors/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorCorridors.inc => maps/AbandonedShip_HiddenFloorCorridors/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_HiddenFloorRooms.inc => AbandonedShip_HiddenFloorRooms/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_HiddenFloorRooms.inc => maps/AbandonedShip_HiddenFloorRooms/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Room_B1F.inc => AbandonedShip_Room_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Room_B1F.inc => maps/AbandonedShip_Room_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_1F.inc => AbandonedShip_Rooms2_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_1F.inc => maps/AbandonedShip_Rooms2_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms2_B1F.inc => AbandonedShip_Rooms2_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms2_B1F.inc => maps/AbandonedShip_Rooms2_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_1F.inc => AbandonedShip_Rooms_1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_1F.inc => maps/AbandonedShip_Rooms_1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Rooms_B1F.inc => AbandonedShip_Rooms_B1F/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Rooms_B1F.inc => maps/AbandonedShip_Rooms_B1F/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater1.inc => AbandonedShip_Underwater1/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater1.inc => maps/AbandonedShip_Underwater1/scripts.inc} (100%) rename data/maps/{events/AbandonedShip_Underwater2.inc => AbandonedShip_Underwater2/events.inc} (100%) rename data/{scripts/maps/AbandonedShip_Underwater2.inc => maps/AbandonedShip_Underwater2/scripts.inc} (100%) rename data/maps/{events/AlteringCave.inc => AlteringCave/events.inc} (100%) rename data/{scripts/maps/AlteringCave.inc => maps/AlteringCave/scripts.inc} (100%) rename data/maps/{events/AncientTomb.inc => AncientTomb/events.inc} (100%) rename data/{scripts/maps/AncientTomb.inc => maps/AncientTomb/scripts.inc} (100%) rename data/maps/{events/AquaHideout_1F.inc => AquaHideout_1F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_1F.inc => maps/AquaHideout_1F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_B1F.inc => AquaHideout_B1F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_B1F.inc => maps/AquaHideout_B1F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_B2F.inc => AquaHideout_B2F/events.inc} (100%) rename data/{scripts/maps/AquaHideout_B2F.inc => maps/AquaHideout_B2F/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap1.inc => AquaHideout_UnusedRubyMap1/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap1.inc => maps/AquaHideout_UnusedRubyMap1/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap2.inc => AquaHideout_UnusedRubyMap2/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap2.inc => maps/AquaHideout_UnusedRubyMap2/scripts.inc} (100%) rename data/maps/{events/AquaHideout_UnusedRubyMap3.inc => AquaHideout_UnusedRubyMap3/events.inc} (100%) rename data/{scripts/maps/AquaHideout_UnusedRubyMap3.inc => maps/AquaHideout_UnusedRubyMap3/scripts.inc} (100%) rename data/maps/{events/ArtisanCave_1F.inc => ArtisanCave_1F/events.inc} (100%) rename data/{scripts/maps/ArtisanCave_1F.inc => maps/ArtisanCave_1F/scripts.inc} (100%) rename data/maps/{events/ArtisanCave_B1F.inc => ArtisanCave_B1F/events.inc} (100%) rename data/{scripts/maps/ArtisanCave_B1F.inc => maps/ArtisanCave_B1F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaBattleRoom.inc => BattleFrontier_BattleArenaBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc => maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaCorridor.inc => BattleFrontier_BattleArenaCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaCorridor.inc => maps/BattleFrontier_BattleArenaCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleArenaLobby.inc => BattleFrontier_BattleArenaLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleArenaLobby.inc => maps/BattleFrontier_BattleArenaLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeBattleRoom.inc => BattleFrontier_BattleDomeBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc => maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeCorridor.inc => BattleFrontier_BattleDomeCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeCorridor.inc => maps/BattleFrontier_BattleDomeCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomeLobby.inc => BattleFrontier_BattleDomeLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomeLobby.inc => maps/BattleFrontier_BattleDomeLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleDomePreBattleRoom.inc => BattleFrontier_BattleDomePreBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc => maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryBattleRoom.inc => BattleFrontier_BattleFactoryBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc => maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryLobby.inc => BattleFrontier_BattleFactoryLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryLobby.inc => maps/BattleFrontier_BattleFactoryLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleFactoryPreBattleRoom.inc => BattleFrontier_BattleFactoryPreBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc => maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceBattleRoom.inc => BattleFrontier_BattlePalaceBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc => maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceCorridor.inc => BattleFrontier_BattlePalaceCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceCorridor.inc => maps/BattleFrontier_BattlePalaceCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePalaceLobby.inc => BattleFrontier_BattlePalaceLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePalaceLobby.inc => maps/BattleFrontier_BattlePalaceLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeCorridor.inc => BattleFrontier_BattlePikeCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeCorridor.inc => maps/BattleFrontier_BattlePikeCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeLobby.inc => BattleFrontier_BattlePikeLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeLobby.inc => maps/BattleFrontier_BattlePikeLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom1.inc => BattleFrontier_BattlePikeRandomRoom1/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc => maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom2.inc => BattleFrontier_BattlePikeRandomRoom2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc => maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeRandomRoom3.inc => BattleFrontier_BattlePikeRandomRoom3/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc => maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePikeThreePathRoom.inc => BattleFrontier_BattlePikeThreePathRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc => maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePointExchangeServiceCorner.inc => BattleFrontier_BattlePointExchangeServiceCorner/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc => maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidEmptySquare.inc => BattleFrontier_BattlePyramidEmptySquare/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc => maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidLobby.inc => BattleFrontier_BattlePyramidLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidLobby.inc => maps/BattleFrontier_BattlePyramidLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattlePyramidTop.inc => BattleFrontier_BattlePyramidTop/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattlePyramidTop.inc => maps/BattleFrontier_BattlePyramidTop/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerBattleRoom.inc => BattleFrontier_BattleTowerBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc => maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerBattleRoom2.inc => BattleFrontier_BattleTowerBattleRoom2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc => maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerCorridor.inc => BattleFrontier_BattleTowerCorridor/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerCorridor.inc => maps/BattleFrontier_BattleTowerCorridor/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerCorridor2.inc => BattleFrontier_BattleTowerCorridor2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerCorridor2.inc => maps/BattleFrontier_BattleTowerCorridor2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerElevator.inc => BattleFrontier_BattleTowerElevator/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerElevator.inc => maps/BattleFrontier_BattleTowerElevator/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerLobby.inc => BattleFrontier_BattleTowerLobby/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerLobby.inc => maps/BattleFrontier_BattleTowerLobby/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_BattleTowerMultiBattleRoom.inc => BattleFrontier_BattleTowerMultiBattleRoom/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc => maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge1.inc => BattleFrontier_Lounge1/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge1.inc => maps/BattleFrontier_Lounge1/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge2.inc => BattleFrontier_Lounge2/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge2.inc => maps/BattleFrontier_Lounge2/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge3.inc => BattleFrontier_Lounge3/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge3.inc => maps/BattleFrontier_Lounge3/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge4.inc => BattleFrontier_Lounge4/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge4.inc => maps/BattleFrontier_Lounge4/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge5.inc => BattleFrontier_Lounge5/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge5.inc => maps/BattleFrontier_Lounge5/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge6.inc => BattleFrontier_Lounge6/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge6.inc => maps/BattleFrontier_Lounge6/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge7.inc => BattleFrontier_Lounge7/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge7.inc => maps/BattleFrontier_Lounge7/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge8.inc => BattleFrontier_Lounge8/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge8.inc => maps/BattleFrontier_Lounge8/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Lounge9.inc => BattleFrontier_Lounge9/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Lounge9.inc => maps/BattleFrontier_Lounge9/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_Mart.inc => BattleFrontier_Mart/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_Mart.inc => maps/BattleFrontier_Mart/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_OutsideEast.inc => BattleFrontier_OutsideEast/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_OutsideEast.inc => maps/BattleFrontier_OutsideEast/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_OutsideWest.inc => BattleFrontier_OutsideWest/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_OutsideWest.inc => maps/BattleFrontier_OutsideWest/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_PokemonCenter_1F.inc => BattleFrontier_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_PokemonCenter_1F.inc => maps/BattleFrontier_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_PokemonCenter_2F.inc => BattleFrontier_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_PokemonCenter_2F.inc => maps/BattleFrontier_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_RankingHall.inc => BattleFrontier_RankingHall/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_RankingHall.inc => maps/BattleFrontier_RankingHall/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_ReceptionGate.inc => BattleFrontier_ReceptionGate/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_ReceptionGate.inc => maps/BattleFrontier_ReceptionGate/scripts.inc} (100%) rename data/maps/{events/BattleFrontier_ScottsHouse.inc => BattleFrontier_ScottsHouse/events.inc} (100%) rename data/{scripts/maps/BattleFrontier_ScottsHouse.inc => maps/BattleFrontier_ScottsHouse/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare01.inc => BattlePyramidSquare01/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare01.inc => maps/BattlePyramidSquare01/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare02.inc => BattlePyramidSquare02/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare02.inc => maps/BattlePyramidSquare02/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare03.inc => BattlePyramidSquare03/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare03.inc => maps/BattlePyramidSquare03/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare04.inc => BattlePyramidSquare04/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare04.inc => maps/BattlePyramidSquare04/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare05.inc => BattlePyramidSquare05/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare05.inc => maps/BattlePyramidSquare05/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare06.inc => BattlePyramidSquare06/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare06.inc => maps/BattlePyramidSquare06/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare07.inc => BattlePyramidSquare07/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare07.inc => maps/BattlePyramidSquare07/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare08.inc => BattlePyramidSquare08/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare08.inc => maps/BattlePyramidSquare08/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare09.inc => BattlePyramidSquare09/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare09.inc => maps/BattlePyramidSquare09/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare10.inc => BattlePyramidSquare10/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare10.inc => maps/BattlePyramidSquare10/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare11.inc => BattlePyramidSquare11/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare11.inc => maps/BattlePyramidSquare11/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare12.inc => BattlePyramidSquare12/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare12.inc => maps/BattlePyramidSquare12/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare13.inc => BattlePyramidSquare13/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare13.inc => maps/BattlePyramidSquare13/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare14.inc => BattlePyramidSquare14/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare14.inc => maps/BattlePyramidSquare14/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare15.inc => BattlePyramidSquare15/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare15.inc => maps/BattlePyramidSquare15/scripts.inc} (100%) rename data/maps/{events/BattlePyramidSquare16.inc => BattlePyramidSquare16/events.inc} (100%) rename data/{scripts/maps/BattlePyramidSquare16.inc => maps/BattlePyramidSquare16/scripts.inc} (100%) rename data/maps/{events/BirthIsland_Exterior.inc => BirthIsland_Exterior/events.inc} (100%) rename data/{scripts/maps/BirthIsland_Exterior.inc => maps/BirthIsland_Exterior/scripts.inc} (100%) rename data/maps/{events/BirthIsland_Harbor.inc => BirthIsland_Harbor/events.inc} (100%) rename data/{scripts/maps/BirthIsland_Harbor.inc => maps/BirthIsland_Harbor/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_1F.inc => CaveOfOrigin_1F/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_1F.inc => maps/CaveOfOrigin_1F/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_B1F.inc => CaveOfOrigin_B1F/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_B1F.inc => maps/CaveOfOrigin_B1F/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_Entrance.inc => CaveOfOrigin_Entrance/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_Entrance.inc => maps/CaveOfOrigin_Entrance/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap1.inc => CaveOfOrigin_UnusedRubySapphireMap1/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc => maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap2.inc => CaveOfOrigin_UnusedRubySapphireMap2/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc => maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc} (100%) rename data/maps/{events/CaveOfOrigin_UnusedRubySapphireMap3.inc => CaveOfOrigin_UnusedRubySapphireMap3/events.inc} (100%) rename data/{scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc => maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc} (100%) rename data/maps/{events/DesertRuins.inc => DesertRuins/events.inc} (100%) rename data/{scripts/maps/DesertRuins.inc => maps/DesertRuins/scripts.inc} (100%) rename data/maps/{events/DesertUnderpass.inc => DesertUnderpass/events.inc} (100%) rename data/{scripts/maps/DesertUnderpass.inc => maps/DesertUnderpass/scripts.inc} (100%) rename data/maps/{events/DewfordTown.inc => DewfordTown/events.inc} (100%) rename data/{scripts/maps/DewfordTown.inc => maps/DewfordTown/scripts.inc} (100%) rename data/maps/{events/DewfordTown_Gym.inc => DewfordTown_Gym/events.inc} (100%) rename data/{scripts/maps/DewfordTown_Gym.inc => maps/DewfordTown_Gym/scripts.inc} (100%) rename data/maps/{events/DewfordTown_Hall.inc => DewfordTown_Hall/events.inc} (100%) rename data/{scripts/maps/DewfordTown_Hall.inc => maps/DewfordTown_Hall/scripts.inc} (100%) rename data/maps/{events/DewfordTown_House1.inc => DewfordTown_House1/events.inc} (100%) rename data/{scripts/maps/DewfordTown_House1.inc => maps/DewfordTown_House1/scripts.inc} (100%) rename data/maps/{events/DewfordTown_House2.inc => DewfordTown_House2/events.inc} (100%) rename data/{scripts/maps/DewfordTown_House2.inc => maps/DewfordTown_House2/scripts.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_1F.inc => DewfordTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_1F.inc => maps/DewfordTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/DewfordTown_PokemonCenter_2F.inc => DewfordTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/DewfordTown_PokemonCenter_2F.inc => maps/DewfordTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/DoubleBattleColosseum.inc => DoubleBattleColosseum/events.inc} (100%) rename data/{scripts/maps/DoubleBattleColosseum.inc => maps/DoubleBattleColosseum/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity.inc => EverGrandeCity/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity.inc => maps/EverGrandeCity/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_ChampionsRoom.inc => EverGrandeCity_ChampionsRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_ChampionsRoom.inc => maps/EverGrandeCity_ChampionsRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_DrakesRoom.inc => EverGrandeCity_DrakesRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_DrakesRoom.inc => maps/EverGrandeCity_DrakesRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_GlaciasRoom.inc => EverGrandeCity_GlaciasRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_GlaciasRoom.inc => maps/EverGrandeCity_GlaciasRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall1.inc => EverGrandeCity_Hall1/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall1.inc => maps/EverGrandeCity_Hall1/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall2.inc => EverGrandeCity_Hall2/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall2.inc => maps/EverGrandeCity_Hall2/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall3.inc => EverGrandeCity_Hall3/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall3.inc => maps/EverGrandeCity_Hall3/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall4.inc => EverGrandeCity_Hall4/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall4.inc => maps/EverGrandeCity_Hall4/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_Hall5.inc => EverGrandeCity_Hall5/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_Hall5.inc => maps/EverGrandeCity_Hall5/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_HallOfFame.inc => EverGrandeCity_HallOfFame/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_HallOfFame.inc => maps/EverGrandeCity_HallOfFame/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PhoebesRoom.inc => EverGrandeCity_PhoebesRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PhoebesRoom.inc => maps/EverGrandeCity_PhoebesRoom/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_1F.inc => EverGrandeCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_1F.inc => maps/EverGrandeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonCenter_2F.inc => EverGrandeCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonCenter_2F.inc => maps/EverGrandeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague_1F.inc => EverGrandeCity_PokemonLeague_1F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague_1F.inc => maps/EverGrandeCity_PokemonLeague_1F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_PokemonLeague_2F.inc => EverGrandeCity_PokemonLeague_2F/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_PokemonLeague_2F.inc => maps/EverGrandeCity_PokemonLeague_2F/scripts.inc} (100%) rename data/maps/{events/EverGrandeCity_SidneysRoom.inc => EverGrandeCity_SidneysRoom/events.inc} (100%) rename data/{scripts/maps/EverGrandeCity_SidneysRoom.inc => maps/EverGrandeCity_SidneysRoom/scripts.inc} (100%) rename data/maps/{events/FallarborTown.inc => FallarborTown/events.inc} (100%) rename data/{scripts/maps/FallarborTown.inc => maps/FallarborTown/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentBattleRoom.inc => FallarborTown_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentBattleRoom.inc => maps/FallarborTown_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentCorridor.inc => FallarborTown_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentCorridor.inc => maps/FallarborTown_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/FallarborTown_BattleTentLobby.inc => FallarborTown_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/FallarborTown_BattleTentLobby.inc => maps/FallarborTown_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/FallarborTown_House1.inc => FallarborTown_House1/events.inc} (100%) rename data/{scripts/maps/FallarborTown_House1.inc => maps/FallarborTown_House1/scripts.inc} (100%) rename data/maps/{events/FallarborTown_House2.inc => FallarborTown_House2/events.inc} (100%) rename data/{scripts/maps/FallarborTown_House2.inc => maps/FallarborTown_House2/scripts.inc} (100%) rename data/maps/{events/FallarborTown_Mart.inc => FallarborTown_Mart/events.inc} (100%) rename data/{scripts/maps/FallarborTown_Mart.inc => maps/FallarborTown_Mart/scripts.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_1F.inc => FallarborTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_1F.inc => maps/FallarborTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/FallarborTown_PokemonCenter_2F.inc => FallarborTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/FallarborTown_PokemonCenter_2F.inc => maps/FallarborTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/FarawayIsland_Entrance.inc => FarawayIsland_Entrance/events.inc} (100%) rename data/{scripts/maps/FarawayIsland_Entrance.inc => maps/FarawayIsland_Entrance/scripts.inc} (100%) rename data/maps/{events/FarawayIsland_Interior.inc => FarawayIsland_Interior/events.inc} (100%) rename data/{scripts/maps/FarawayIsland_Interior.inc => maps/FarawayIsland_Interior/scripts.inc} (100%) rename data/maps/{events/FieryPath.inc => FieryPath/events.inc} (100%) rename data/{scripts/maps/FieryPath.inc => maps/FieryPath/scripts.inc} (100%) rename data/maps/{events/FortreeCity.inc => FortreeCity/events.inc} (100%) rename data/{scripts/maps/FortreeCity.inc => maps/FortreeCity/scripts.inc} (100%) rename data/maps/{events/FortreeCity_DecorationShop.inc => FortreeCity_DecorationShop/events.inc} (100%) rename data/{scripts/maps/FortreeCity_DecorationShop.inc => maps/FortreeCity_DecorationShop/scripts.inc} (100%) rename data/maps/{events/FortreeCity_Gym.inc => FortreeCity_Gym/events.inc} (100%) rename data/{scripts/maps/FortreeCity_Gym.inc => maps/FortreeCity_Gym/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House1.inc => FortreeCity_House1/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House1.inc => maps/FortreeCity_House1/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House2.inc => FortreeCity_House2/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House2.inc => maps/FortreeCity_House2/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House3.inc => FortreeCity_House3/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House3.inc => maps/FortreeCity_House3/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House4.inc => FortreeCity_House4/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House4.inc => maps/FortreeCity_House4/scripts.inc} (100%) rename data/maps/{events/FortreeCity_House5.inc => FortreeCity_House5/events.inc} (100%) rename data/{scripts/maps/FortreeCity_House5.inc => maps/FortreeCity_House5/scripts.inc} (100%) rename data/maps/{events/FortreeCity_Mart.inc => FortreeCity_Mart/events.inc} (100%) rename data/{scripts/maps/FortreeCity_Mart.inc => maps/FortreeCity_Mart/scripts.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_1F.inc => FortreeCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_1F.inc => maps/FortreeCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/FortreeCity_PokemonCenter_2F.inc => FortreeCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/FortreeCity_PokemonCenter_2F.inc => maps/FortreeCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_1F.inc => GraniteCave_1F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_1F.inc => maps/GraniteCave_1F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_B1F.inc => GraniteCave_B1F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_B1F.inc => maps/GraniteCave_B1F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_B2F.inc => GraniteCave_B2F/events.inc} (100%) rename data/{scripts/maps/GraniteCave_B2F.inc => maps/GraniteCave_B2F/scripts.inc} (100%) rename data/maps/{events/GraniteCave_StevensRoom.inc => GraniteCave_StevensRoom/events.inc} (100%) rename data/{scripts/maps/GraniteCave_StevensRoom.inc => maps/GraniteCave_StevensRoom/scripts.inc} (100%) rename data/maps/{events/InsideOfTruck.inc => InsideOfTruck/events.inc} (100%) rename data/{scripts/maps/InsideOfTruck.inc => maps/InsideOfTruck/scripts.inc} (100%) rename data/maps/{events/IslandCave.inc => IslandCave/events.inc} (100%) rename data/{scripts/maps/IslandCave.inc => maps/IslandCave/scripts.inc} (100%) rename data/maps/{events/JaggedPass.inc => JaggedPass/events.inc} (100%) rename data/{scripts/maps/JaggedPass.inc => maps/JaggedPass/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown.inc => LavaridgeTown/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown.inc => maps/LavaridgeTown/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_1F.inc => LavaridgeTown_Gym_1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_1F.inc => maps/LavaridgeTown_Gym_1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Gym_B1F.inc => LavaridgeTown_Gym_B1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Gym_B1F.inc => maps/LavaridgeTown_Gym_B1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_HerbShop.inc => LavaridgeTown_HerbShop/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_HerbShop.inc => maps/LavaridgeTown_HerbShop/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_House.inc => LavaridgeTown_House/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_House.inc => maps/LavaridgeTown_House/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_Mart.inc => LavaridgeTown_Mart/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_Mart.inc => maps/LavaridgeTown_Mart/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_1F.inc => LavaridgeTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_1F.inc => maps/LavaridgeTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/LavaridgeTown_PokemonCenter_2F.inc => LavaridgeTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/LavaridgeTown_PokemonCenter_2F.inc => maps/LavaridgeTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity.inc => LilycoveCity/events.inc} (100%) rename data/{scripts/maps/LilycoveCity.inc => maps/LilycoveCity/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_ContestHall.inc => LilycoveCity_ContestHall/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestHall.inc => maps/LilycoveCity_ContestHall/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_ContestLobby.inc => LilycoveCity_ContestLobby/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_ContestLobby.inc => maps/LilycoveCity_ContestLobby/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_1F.inc => LilycoveCity_CoveLilyMotel_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc => maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_CoveLilyMotel_2F.inc => LilycoveCity_CoveLilyMotel_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc => maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreElevator.inc => LilycoveCity_DepartmentStoreElevator/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreElevator.inc => maps/LilycoveCity_DepartmentStoreElevator/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStoreRooftop.inc => LilycoveCity_DepartmentStoreRooftop/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc => maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_1F.inc => LilycoveCity_DepartmentStore_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_1F.inc => maps/LilycoveCity_DepartmentStore_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_2F.inc => LilycoveCity_DepartmentStore_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_2F.inc => maps/LilycoveCity_DepartmentStore_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_3F.inc => LilycoveCity_DepartmentStore_3F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_3F.inc => maps/LilycoveCity_DepartmentStore_3F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_4F.inc => LilycoveCity_DepartmentStore_4F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_4F.inc => maps/LilycoveCity_DepartmentStore_4F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_DepartmentStore_5F.inc => LilycoveCity_DepartmentStore_5F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_DepartmentStore_5F.inc => maps/LilycoveCity_DepartmentStore_5F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_Harbor.inc => LilycoveCity_Harbor/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_Harbor.inc => maps/LilycoveCity_Harbor/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House1.inc => LilycoveCity_House1/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House1.inc => maps/LilycoveCity_House1/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House2.inc => LilycoveCity_House2/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House2.inc => maps/LilycoveCity_House2/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House3.inc => LilycoveCity_House3/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House3.inc => maps/LilycoveCity_House3/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_House4.inc => LilycoveCity_House4/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_House4.inc => maps/LilycoveCity_House4/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_1F.inc => LilycoveCity_LilycoveMuseum_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc => maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_LilycoveMuseum_2F.inc => LilycoveCity_LilycoveMuseum_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc => maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_MoveDeletersHouse.inc => LilycoveCity_MoveDeletersHouse/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_MoveDeletersHouse.inc => maps/LilycoveCity_MoveDeletersHouse/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_1F.inc => LilycoveCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_1F.inc => maps/LilycoveCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonCenter_2F.inc => LilycoveCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonCenter_2F.inc => maps/LilycoveCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_PokemonTrainerFanClub.inc => LilycoveCity_PokemonTrainerFanClub/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc => maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc} (100%) rename data/maps/{events/LilycoveCity_UnusedMart.inc => LilycoveCity_UnusedMart/events.inc} (100%) rename data/{scripts/maps/LilycoveCity_UnusedMart.inc => maps/LilycoveCity_UnusedMart/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom1.inc => LinkContestRoom1/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom1.inc => maps/LinkContestRoom1/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom2.inc => LinkContestRoom2/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom2.inc => maps/LinkContestRoom2/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom3.inc => LinkContestRoom3/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom3.inc => maps/LinkContestRoom3/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom4.inc => LinkContestRoom4/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom4.inc => maps/LinkContestRoom4/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom5.inc => LinkContestRoom5/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom5.inc => maps/LinkContestRoom5/scripts.inc} (100%) rename data/maps/{events/LinkContestRoom6.inc => LinkContestRoom6/events.inc} (100%) rename data/{scripts/maps/LinkContestRoom6.inc => maps/LinkContestRoom6/scripts.inc} (100%) rename data/maps/{events/LittlerootTown.inc => LittlerootTown/events.inc} (100%) rename data/{scripts/maps/LittlerootTown.inc => maps/LittlerootTown/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_1F.inc => LittlerootTown_BrendansHouse_1F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_1F.inc => maps/LittlerootTown_BrendansHouse_1F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_BrendansHouse_2F.inc => LittlerootTown_BrendansHouse_2F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_BrendansHouse_2F.inc => maps/LittlerootTown_BrendansHouse_2F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_1F.inc => LittlerootTown_MaysHouse_1F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_1F.inc => maps/LittlerootTown_MaysHouse_1F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_MaysHouse_2F.inc => LittlerootTown_MaysHouse_2F/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_MaysHouse_2F.inc => maps/LittlerootTown_MaysHouse_2F/scripts.inc} (100%) rename data/maps/{events/LittlerootTown_ProfessorBirchsLab.inc => LittlerootTown_ProfessorBirchsLab/events.inc} (100%) rename data/{scripts/maps/LittlerootTown_ProfessorBirchsLab.inc => maps/LittlerootTown_ProfessorBirchsLab/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_1F.inc => MagmaHideout_1F/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_1F.inc => maps/MagmaHideout_1F/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_1R.inc => MagmaHideout_2F_1R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_1R.inc => maps/MagmaHideout_2F_1R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_2R.inc => MagmaHideout_2F_2R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_2R.inc => maps/MagmaHideout_2F_2R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_2F_3R.inc => MagmaHideout_2F_3R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_2F_3R.inc => maps/MagmaHideout_2F_3R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_1R.inc => MagmaHideout_3F_1R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_1R.inc => maps/MagmaHideout_3F_1R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_2R.inc => MagmaHideout_3F_2R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_2R.inc => maps/MagmaHideout_3F_2R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_3F_3R.inc => MagmaHideout_3F_3R/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_3F_3R.inc => maps/MagmaHideout_3F_3R/scripts.inc} (100%) rename data/maps/{events/MagmaHideout_4F.inc => MagmaHideout_4F/events.inc} (100%) rename data/{scripts/maps/MagmaHideout_4F.inc => maps/MagmaHideout_4F/scripts.inc} (100%) rename data/maps/{events/MarineCave_End.inc => MarineCave_End/events.inc} (100%) rename data/{scripts/maps/MarineCave_End.inc => maps/MarineCave_End/scripts.inc} (100%) rename data/maps/{events/MarineCave_Entrance.inc => MarineCave_Entrance/events.inc} (100%) rename data/{scripts/maps/MarineCave_Entrance.inc => maps/MarineCave_Entrance/scripts.inc} (100%) rename data/maps/{events/MauvilleCity.inc => MauvilleCity/events.inc} (100%) rename data/{scripts/maps/MauvilleCity.inc => maps/MauvilleCity/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_BikeShop.inc => MauvilleCity_BikeShop/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_BikeShop.inc => maps/MauvilleCity_BikeShop/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_GameCorner.inc => MauvilleCity_GameCorner/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_GameCorner.inc => maps/MauvilleCity_GameCorner/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_Gym.inc => MauvilleCity_Gym/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_Gym.inc => maps/MauvilleCity_Gym/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_House1.inc => MauvilleCity_House1/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_House1.inc => maps/MauvilleCity_House1/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_House2.inc => MauvilleCity_House2/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_House2.inc => maps/MauvilleCity_House2/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_Mart.inc => MauvilleCity_Mart/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_Mart.inc => maps/MauvilleCity_Mart/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_1F.inc => MauvilleCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_1F.inc => maps/MauvilleCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/MauvilleCity_PokemonCenter_2F.inc => MauvilleCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/MauvilleCity_PokemonCenter_2F.inc => maps/MauvilleCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_1F_1R.inc => MeteorFalls_1F_1R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_1R.inc => maps/MeteorFalls_1F_1R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_1F_2R.inc => MeteorFalls_1F_2R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_1F_2R.inc => maps/MeteorFalls_1F_2R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_1R.inc => MeteorFalls_B1F_1R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_1R.inc => maps/MeteorFalls_B1F_1R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_B1F_2R.inc => MeteorFalls_B1F_2R/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_B1F_2R.inc => maps/MeteorFalls_B1F_2R/scripts.inc} (100%) rename data/maps/{events/MeteorFalls_StevensCave.inc => MeteorFalls_StevensCave/events.inc} (100%) rename data/{scripts/maps/MeteorFalls_StevensCave.inc => maps/MeteorFalls_StevensCave/scripts.inc} (100%) rename data/maps/{events/MirageTower_1F.inc => MirageTower_1F/events.inc} (100%) rename data/{scripts/maps/MirageTower_1F.inc => maps/MirageTower_1F/scripts.inc} (100%) rename data/maps/{events/MirageTower_2F.inc => MirageTower_2F/events.inc} (100%) rename data/{scripts/maps/MirageTower_2F.inc => maps/MirageTower_2F/scripts.inc} (100%) rename data/maps/{events/MirageTower_3F.inc => MirageTower_3F/events.inc} (100%) rename data/{scripts/maps/MirageTower_3F.inc => maps/MirageTower_3F/scripts.inc} (100%) rename data/maps/{events/MirageTower_4F.inc => MirageTower_4F/events.inc} (100%) rename data/{scripts/maps/MirageTower_4F.inc => maps/MirageTower_4F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity.inc => MossdeepCity/events.inc} (100%) rename data/{scripts/maps/MossdeepCity.inc => maps/MossdeepCity/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_1F.inc => MossdeepCity_GameCorner_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_1F.inc => maps/MossdeepCity_GameCorner_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_GameCorner_B1F.inc => MossdeepCity_GameCorner_B1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_GameCorner_B1F.inc => maps/MossdeepCity_GameCorner_B1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_Gym.inc => MossdeepCity_Gym/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_Gym.inc => maps/MossdeepCity_Gym/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House1.inc => MossdeepCity_House1/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House1.inc => maps/MossdeepCity_House1/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House2.inc => MossdeepCity_House2/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House2.inc => maps/MossdeepCity_House2/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House3.inc => MossdeepCity_House3/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House3.inc => maps/MossdeepCity_House3/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_House4.inc => MossdeepCity_House4/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_House4.inc => maps/MossdeepCity_House4/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_Mart.inc => MossdeepCity_Mart/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_Mart.inc => maps/MossdeepCity_Mart/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_1F.inc => MossdeepCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_1F.inc => maps/MossdeepCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_PokemonCenter_2F.inc => MossdeepCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_PokemonCenter_2F.inc => maps/MossdeepCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_1F.inc => MossdeepCity_SpaceCenter_1F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_1F.inc => maps/MossdeepCity_SpaceCenter_1F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_SpaceCenter_2F.inc => MossdeepCity_SpaceCenter_2F/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_SpaceCenter_2F.inc => maps/MossdeepCity_SpaceCenter_2F/scripts.inc} (100%) rename data/maps/{events/MossdeepCity_StevensHouse.inc => MossdeepCity_StevensHouse/events.inc} (100%) rename data/{scripts/maps/MossdeepCity_StevensHouse.inc => maps/MossdeepCity_StevensHouse/scripts.inc} (100%) rename data/maps/{events/MtChimney.inc => MtChimney/events.inc} (100%) rename data/{scripts/maps/MtChimney.inc => maps/MtChimney/scripts.inc} (100%) rename data/maps/{events/MtChimney_CableCarStation.inc => MtChimney_CableCarStation/events.inc} (100%) rename data/{scripts/maps/MtChimney_CableCarStation.inc => maps/MtChimney_CableCarStation/scripts.inc} (100%) rename data/maps/{events/MtPyre_1F.inc => MtPyre_1F/events.inc} (100%) rename data/{scripts/maps/MtPyre_1F.inc => maps/MtPyre_1F/scripts.inc} (100%) rename data/maps/{events/MtPyre_2F.inc => MtPyre_2F/events.inc} (100%) rename data/{scripts/maps/MtPyre_2F.inc => maps/MtPyre_2F/scripts.inc} (100%) rename data/maps/{events/MtPyre_3F.inc => MtPyre_3F/events.inc} (100%) rename data/{scripts/maps/MtPyre_3F.inc => maps/MtPyre_3F/scripts.inc} (100%) rename data/maps/{events/MtPyre_4F.inc => MtPyre_4F/events.inc} (100%) rename data/{scripts/maps/MtPyre_4F.inc => maps/MtPyre_4F/scripts.inc} (100%) rename data/maps/{events/MtPyre_5F.inc => MtPyre_5F/events.inc} (100%) rename data/{scripts/maps/MtPyre_5F.inc => maps/MtPyre_5F/scripts.inc} (100%) rename data/maps/{events/MtPyre_6F.inc => MtPyre_6F/events.inc} (100%) rename data/{scripts/maps/MtPyre_6F.inc => maps/MtPyre_6F/scripts.inc} (100%) rename data/maps/{events/MtPyre_Exterior.inc => MtPyre_Exterior/events.inc} (100%) rename data/{scripts/maps/MtPyre_Exterior.inc => maps/MtPyre_Exterior/scripts.inc} (100%) rename data/maps/{events/MtPyre_Summit.inc => MtPyre_Summit/events.inc} (100%) rename data/{scripts/maps/MtPyre_Summit.inc => maps/MtPyre_Summit/scripts.inc} (100%) rename data/maps/{events/NavelRock_B1F.inc => NavelRock_B1F/events.inc} (100%) rename data/{scripts/maps/NavelRock_B1F.inc => maps/NavelRock_B1F/scripts.inc} (100%) rename data/maps/{events/NavelRock_Bottom.inc => NavelRock_Bottom/events.inc} (100%) rename data/{scripts/maps/NavelRock_Bottom.inc => maps/NavelRock_Bottom/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down01.inc => NavelRock_Down01/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down01.inc => maps/NavelRock_Down01/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down02.inc => NavelRock_Down02/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down02.inc => maps/NavelRock_Down02/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down03.inc => NavelRock_Down03/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down03.inc => maps/NavelRock_Down03/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down04.inc => NavelRock_Down04/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down04.inc => maps/NavelRock_Down04/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down05.inc => NavelRock_Down05/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down05.inc => maps/NavelRock_Down05/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down06.inc => NavelRock_Down06/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down06.inc => maps/NavelRock_Down06/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down07.inc => NavelRock_Down07/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down07.inc => maps/NavelRock_Down07/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down08.inc => NavelRock_Down08/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down08.inc => maps/NavelRock_Down08/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down09.inc => NavelRock_Down09/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down09.inc => maps/NavelRock_Down09/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down10.inc => NavelRock_Down10/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down10.inc => maps/NavelRock_Down10/scripts.inc} (100%) rename data/maps/{events/NavelRock_Down11.inc => NavelRock_Down11/events.inc} (100%) rename data/{scripts/maps/NavelRock_Down11.inc => maps/NavelRock_Down11/scripts.inc} (100%) rename data/maps/{events/NavelRock_Entrance.inc => NavelRock_Entrance/events.inc} (100%) rename data/{scripts/maps/NavelRock_Entrance.inc => maps/NavelRock_Entrance/scripts.inc} (100%) rename data/maps/{events/NavelRock_Exterior.inc => NavelRock_Exterior/events.inc} (100%) rename data/{scripts/maps/NavelRock_Exterior.inc => maps/NavelRock_Exterior/scripts.inc} (100%) rename data/maps/{events/NavelRock_Fork.inc => NavelRock_Fork/events.inc} (100%) rename data/{scripts/maps/NavelRock_Fork.inc => maps/NavelRock_Fork/scripts.inc} (100%) rename data/maps/{events/NavelRock_Harbor.inc => NavelRock_Harbor/events.inc} (100%) rename data/{scripts/maps/NavelRock_Harbor.inc => maps/NavelRock_Harbor/scripts.inc} (100%) rename data/maps/{events/NavelRock_Top.inc => NavelRock_Top/events.inc} (100%) rename data/{scripts/maps/NavelRock_Top.inc => maps/NavelRock_Top/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up1.inc => NavelRock_Up1/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up1.inc => maps/NavelRock_Up1/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up2.inc => NavelRock_Up2/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up2.inc => maps/NavelRock_Up2/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up3.inc => NavelRock_Up3/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up3.inc => maps/NavelRock_Up3/scripts.inc} (100%) rename data/maps/{events/NavelRock_Up4.inc => NavelRock_Up4/events.inc} (100%) rename data/{scripts/maps/NavelRock_Up4.inc => maps/NavelRock_Up4/scripts.inc} (100%) rename data/maps/{events/NewMauville_Entrance.inc => NewMauville_Entrance/events.inc} (100%) rename data/{scripts/maps/NewMauville_Entrance.inc => maps/NewMauville_Entrance/scripts.inc} (100%) rename data/maps/{events/NewMauville_Inside.inc => NewMauville_Inside/events.inc} (100%) rename data/{scripts/maps/NewMauville_Inside.inc => maps/NewMauville_Inside/scripts.inc} (100%) rename data/maps/{events/OldaleTown.inc => OldaleTown/events.inc} (100%) rename data/{scripts/maps/OldaleTown.inc => maps/OldaleTown/scripts.inc} (100%) rename data/maps/{events/OldaleTown_House1.inc => OldaleTown_House1/events.inc} (100%) rename data/{scripts/maps/OldaleTown_House1.inc => maps/OldaleTown_House1/scripts.inc} (100%) rename data/maps/{events/OldaleTown_House2.inc => OldaleTown_House2/events.inc} (100%) rename data/{scripts/maps/OldaleTown_House2.inc => maps/OldaleTown_House2/scripts.inc} (100%) rename data/maps/{events/OldaleTown_Mart.inc => OldaleTown_Mart/events.inc} (100%) rename data/{scripts/maps/OldaleTown_Mart.inc => maps/OldaleTown_Mart/scripts.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_1F.inc => OldaleTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_1F.inc => maps/OldaleTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/OldaleTown_PokemonCenter_2F.inc => OldaleTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/OldaleTown_PokemonCenter_2F.inc => maps/OldaleTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown.inc => PacifidlogTown/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown.inc => maps/PacifidlogTown/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House1.inc => PacifidlogTown_House1/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House1.inc => maps/PacifidlogTown_House1/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House2.inc => PacifidlogTown_House2/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House2.inc => maps/PacifidlogTown_House2/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House3.inc => PacifidlogTown_House3/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House3.inc => maps/PacifidlogTown_House3/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House4.inc => PacifidlogTown_House4/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House4.inc => maps/PacifidlogTown_House4/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_House5.inc => PacifidlogTown_House5/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_House5.inc => maps/PacifidlogTown_House5/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_1F.inc => PacifidlogTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_1F.inc => maps/PacifidlogTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/PacifidlogTown_PokemonCenter_2F.inc => PacifidlogTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/PacifidlogTown_PokemonCenter_2F.inc => maps/PacifidlogTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity.inc => PetalburgCity/events.inc} (100%) rename data/{scripts/maps/PetalburgCity.inc => maps/PetalburgCity/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_Gym.inc => PetalburgCity_Gym/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_Gym.inc => maps/PetalburgCity_Gym/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_House1.inc => PetalburgCity_House1/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_House1.inc => maps/PetalburgCity_House1/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_House2.inc => PetalburgCity_House2/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_House2.inc => maps/PetalburgCity_House2/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_Mart.inc => PetalburgCity_Mart/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_Mart.inc => maps/PetalburgCity_Mart/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_1F.inc => PetalburgCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_1F.inc => maps/PetalburgCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_PokemonCenter_2F.inc => PetalburgCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_PokemonCenter_2F.inc => maps/PetalburgCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/PetalburgCity_WallysHouse.inc => PetalburgCity_WallysHouse/events.inc} (100%) rename data/{scripts/maps/PetalburgCity_WallysHouse.inc => maps/PetalburgCity_WallysHouse/scripts.inc} (100%) rename data/maps/{events/PetalburgWoods.inc => PetalburgWoods/events.inc} (100%) rename data/{scripts/maps/PetalburgWoods.inc => maps/PetalburgWoods/scripts.inc} (100%) rename data/maps/{events/RecordCorner.inc => RecordCorner/events.inc} (100%) rename data/{scripts/maps/RecordCorner.inc => maps/RecordCorner/scripts.inc} (100%) rename data/maps/{events/Route101.inc => Route101/events.inc} (100%) rename data/{scripts/maps/Route101.inc => maps/Route101/scripts.inc} (100%) rename data/maps/{events/Route102.inc => Route102/events.inc} (100%) rename data/{scripts/maps/Route102.inc => maps/Route102/scripts.inc} (100%) rename data/maps/{events/Route103.inc => Route103/events.inc} (100%) rename data/{scripts/maps/Route103.inc => maps/Route103/scripts.inc} (100%) rename data/maps/{events/Route104.inc => Route104/events.inc} (100%) rename data/{scripts/maps/Route104.inc => maps/Route104/scripts.inc} (100%) rename data/maps/{events/Route104_MrBrineysHouse.inc => Route104_MrBrineysHouse/events.inc} (100%) rename data/{scripts/maps/Route104_MrBrineysHouse.inc => maps/Route104_MrBrineysHouse/scripts.inc} (100%) rename data/maps/{events/Route104_PrettyPetalFlowerShop.inc => Route104_PrettyPetalFlowerShop/events.inc} (100%) rename data/{scripts/maps/Route104_PrettyPetalFlowerShop.inc => maps/Route104_PrettyPetalFlowerShop/scripts.inc} (100%) rename data/maps/{events/Route104_Prototype.inc => Route104_Prototype/events.inc} (100%) rename data/{scripts/maps/Route104_Prototype.inc => maps/Route104_Prototype/scripts.inc} (100%) rename data/maps/{events/Route104_PrototypePrettyPetalFlowerShop.inc => Route104_PrototypePrettyPetalFlowerShop/events.inc} (100%) rename data/{scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc => maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc} (100%) rename data/maps/{events/Route105.inc => Route105/events.inc} (100%) rename data/{scripts/maps/Route105.inc => maps/Route105/scripts.inc} (100%) rename data/maps/{events/Route106.inc => Route106/events.inc} (100%) rename data/{scripts/maps/Route106.inc => maps/Route106/scripts.inc} (100%) rename data/maps/{events/Route107.inc => Route107/events.inc} (100%) rename data/{scripts/maps/Route107.inc => maps/Route107/scripts.inc} (100%) rename data/maps/{events/Route108.inc => Route108/events.inc} (100%) rename data/{scripts/maps/Route108.inc => maps/Route108/scripts.inc} (100%) rename data/maps/{events/Route109.inc => Route109/events.inc} (100%) rename data/{scripts/maps/Route109.inc => maps/Route109/scripts.inc} (100%) rename data/maps/{events/Route109_SeashoreHouse.inc => Route109_SeashoreHouse/events.inc} (100%) rename data/{scripts/maps/Route109_SeashoreHouse.inc => maps/Route109_SeashoreHouse/scripts.inc} (100%) rename data/maps/{events/Route110.inc => Route110/events.inc} (100%) rename data/{scripts/maps/Route110.inc => maps/Route110/scripts.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadEntrance1.inc => Route110_SeasideCyclingRoadEntrance1/events.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc => maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc} (100%) rename data/maps/{events/Route110_SeasideCyclingRoadEntrance2.inc => Route110_SeasideCyclingRoadEntrance2/events.inc} (100%) rename data/{scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc => maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseCorridor.inc => Route110_TrickHouseCorridor/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseCorridor.inc => maps/Route110_TrickHouseCorridor/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseEnd.inc => Route110_TrickHouseEnd/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEnd.inc => maps/Route110_TrickHouseEnd/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHouseEntrance.inc => Route110_TrickHouseEntrance/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHouseEntrance.inc => maps/Route110_TrickHouseEntrance/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle1.inc => Route110_TrickHousePuzzle1/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle1.inc => maps/Route110_TrickHousePuzzle1/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle2.inc => Route110_TrickHousePuzzle2/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle2.inc => maps/Route110_TrickHousePuzzle2/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle3.inc => Route110_TrickHousePuzzle3/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle3.inc => maps/Route110_TrickHousePuzzle3/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle4.inc => Route110_TrickHousePuzzle4/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle4.inc => maps/Route110_TrickHousePuzzle4/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle5.inc => Route110_TrickHousePuzzle5/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle5.inc => maps/Route110_TrickHousePuzzle5/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle6.inc => Route110_TrickHousePuzzle6/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle6.inc => maps/Route110_TrickHousePuzzle6/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle7.inc => Route110_TrickHousePuzzle7/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle7.inc => maps/Route110_TrickHousePuzzle7/scripts.inc} (100%) rename data/maps/{events/Route110_TrickHousePuzzle8.inc => Route110_TrickHousePuzzle8/events.inc} (100%) rename data/{scripts/maps/Route110_TrickHousePuzzle8.inc => maps/Route110_TrickHousePuzzle8/scripts.inc} (100%) rename data/maps/{events/Route111.inc => Route111/events.inc} (100%) rename data/{scripts/maps/Route111.inc => maps/Route111/scripts.inc} (100%) rename data/maps/{events/Route111_OldLadysRestStop.inc => Route111_OldLadysRestStop/events.inc} (100%) rename data/{scripts/maps/Route111_OldLadysRestStop.inc => maps/Route111_OldLadysRestStop/scripts.inc} (100%) rename data/maps/{events/Route111_WinstrateFamilysHouse.inc => Route111_WinstrateFamilysHouse/events.inc} (100%) rename data/{scripts/maps/Route111_WinstrateFamilysHouse.inc => maps/Route111_WinstrateFamilysHouse/scripts.inc} (100%) rename data/maps/{events/Route112.inc => Route112/events.inc} (100%) rename data/{scripts/maps/Route112.inc => maps/Route112/scripts.inc} (100%) rename data/maps/{events/Route112_CableCarStation.inc => Route112_CableCarStation/events.inc} (100%) rename data/{scripts/maps/Route112_CableCarStation.inc => maps/Route112_CableCarStation/scripts.inc} (100%) rename data/maps/{events/Route113.inc => Route113/events.inc} (100%) rename data/{scripts/maps/Route113.inc => maps/Route113/scripts.inc} (100%) rename data/maps/{events/Route113_GlassWorkshop.inc => Route113_GlassWorkshop/events.inc} (100%) rename data/{scripts/maps/Route113_GlassWorkshop.inc => maps/Route113_GlassWorkshop/scripts.inc} (100%) rename data/maps/{events/Route114.inc => Route114/events.inc} (100%) rename data/{scripts/maps/Route114.inc => maps/Route114/scripts.inc} (100%) rename data/maps/{events/Route114_FossilManiacsHouse.inc => Route114_FossilManiacsHouse/events.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsHouse.inc => maps/Route114_FossilManiacsHouse/scripts.inc} (100%) rename data/maps/{events/Route114_FossilManiacsTunnel.inc => Route114_FossilManiacsTunnel/events.inc} (100%) rename data/{scripts/maps/Route114_FossilManiacsTunnel.inc => maps/Route114_FossilManiacsTunnel/scripts.inc} (100%) rename data/maps/{events/Route114_LanettesHouse.inc => Route114_LanettesHouse/events.inc} (100%) rename data/{scripts/maps/Route114_LanettesHouse.inc => maps/Route114_LanettesHouse/scripts.inc} (100%) rename data/maps/{events/Route115.inc => Route115/events.inc} (100%) rename data/{scripts/maps/Route115.inc => maps/Route115/scripts.inc} (100%) rename data/maps/{events/Route116.inc => Route116/events.inc} (100%) rename data/{scripts/maps/Route116.inc => maps/Route116/scripts.inc} (100%) rename data/maps/{events/Route116_TunnelersRestHouse.inc => Route116_TunnelersRestHouse/events.inc} (100%) rename data/{scripts/maps/Route116_TunnelersRestHouse.inc => maps/Route116_TunnelersRestHouse/scripts.inc} (100%) rename data/maps/{events/Route117.inc => Route117/events.inc} (100%) rename data/{scripts/maps/Route117.inc => maps/Route117/scripts.inc} (100%) rename data/maps/{events/Route117_PokemonDayCare.inc => Route117_PokemonDayCare/events.inc} (100%) rename data/{scripts/maps/Route117_PokemonDayCare.inc => maps/Route117_PokemonDayCare/scripts.inc} (100%) rename data/maps/{events/Route118.inc => Route118/events.inc} (100%) rename data/{scripts/maps/Route118.inc => maps/Route118/scripts.inc} (100%) rename data/maps/{events/Route119.inc => Route119/events.inc} (100%) rename data/{scripts/maps/Route119.inc => maps/Route119/scripts.inc} (100%) rename data/maps/{events/Route119_House.inc => Route119_House/events.inc} (100%) rename data/{scripts/maps/Route119_House.inc => maps/Route119_House/scripts.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_1F.inc => Route119_WeatherInstitute_1F/events.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_1F.inc => maps/Route119_WeatherInstitute_1F/scripts.inc} (100%) rename data/maps/{events/Route119_WeatherInstitute_2F.inc => Route119_WeatherInstitute_2F/events.inc} (100%) rename data/{scripts/maps/Route119_WeatherInstitute_2F.inc => maps/Route119_WeatherInstitute_2F/scripts.inc} (100%) rename data/maps/{events/Route120.inc => Route120/events.inc} (100%) rename data/{scripts/maps/Route120.inc => maps/Route120/scripts.inc} (100%) rename data/maps/{events/Route121.inc => Route121/events.inc} (100%) rename data/{scripts/maps/Route121.inc => maps/Route121/scripts.inc} (100%) rename data/maps/{events/Route121_SafariZoneEntrance.inc => Route121_SafariZoneEntrance/events.inc} (100%) rename data/{scripts/maps/Route121_SafariZoneEntrance.inc => maps/Route121_SafariZoneEntrance/scripts.inc} (100%) rename data/maps/{events/Route122.inc => Route122/events.inc} (100%) rename data/{scripts/maps/Route122.inc => maps/Route122/scripts.inc} (100%) rename data/maps/{events/Route123.inc => Route123/events.inc} (100%) rename data/{scripts/maps/Route123.inc => maps/Route123/scripts.inc} (100%) rename data/maps/{events/Route123_BerryMastersHouse.inc => Route123_BerryMastersHouse/events.inc} (100%) rename data/{scripts/maps/Route123_BerryMastersHouse.inc => maps/Route123_BerryMastersHouse/scripts.inc} (100%) rename data/maps/{events/Route124.inc => Route124/events.inc} (100%) rename data/{scripts/maps/Route124.inc => maps/Route124/scripts.inc} (100%) rename data/maps/{events/Route124_DivingTreasureHuntersHouse.inc => Route124_DivingTreasureHuntersHouse/events.inc} (100%) rename data/{scripts/maps/Route124_DivingTreasureHuntersHouse.inc => maps/Route124_DivingTreasureHuntersHouse/scripts.inc} (100%) rename data/maps/{events/Route125.inc => Route125/events.inc} (100%) rename data/{scripts/maps/Route125.inc => maps/Route125/scripts.inc} (100%) rename data/maps/{events/Route126.inc => Route126/events.inc} (100%) rename data/{scripts/maps/Route126.inc => maps/Route126/scripts.inc} (100%) rename data/maps/{events/Route127.inc => Route127/events.inc} (100%) rename data/{scripts/maps/Route127.inc => maps/Route127/scripts.inc} (100%) rename data/maps/{events/Route128.inc => Route128/events.inc} (100%) rename data/{scripts/maps/Route128.inc => maps/Route128/scripts.inc} (100%) rename data/maps/{events/Route129.inc => Route129/events.inc} (100%) rename data/{scripts/maps/Route129.inc => maps/Route129/scripts.inc} (100%) rename data/maps/{events/Route130.inc => Route130/events.inc} (100%) rename data/{scripts/maps/Route130.inc => maps/Route130/scripts.inc} (100%) rename data/maps/{events/Route131.inc => Route131/events.inc} (100%) rename data/{scripts/maps/Route131.inc => maps/Route131/scripts.inc} (100%) rename data/maps/{events/Route132.inc => Route132/events.inc} (100%) rename data/{scripts/maps/Route132.inc => maps/Route132/scripts.inc} (100%) rename data/maps/{events/Route133.inc => Route133/events.inc} (100%) rename data/{scripts/maps/Route133.inc => maps/Route133/scripts.inc} (100%) rename data/maps/{events/Route134.inc => Route134/events.inc} (100%) rename data/{scripts/maps/Route134.inc => maps/Route134/scripts.inc} (100%) rename data/maps/{events/RustboroCity.inc => RustboroCity/events.inc} (100%) rename data/{scripts/maps/RustboroCity.inc => maps/RustboroCity/scripts.inc} (100%) rename data/maps/{events/RustboroCity_CuttersHouse.inc => RustboroCity_CuttersHouse/events.inc} (100%) rename data/{scripts/maps/RustboroCity_CuttersHouse.inc => maps/RustboroCity_CuttersHouse/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_1F.inc => RustboroCity_DevonCorp_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_1F.inc => maps/RustboroCity_DevonCorp_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_2F.inc => RustboroCity_DevonCorp_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_2F.inc => maps/RustboroCity_DevonCorp_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_DevonCorp_3F.inc => RustboroCity_DevonCorp_3F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_DevonCorp_3F.inc => maps/RustboroCity_DevonCorp_3F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_1F.inc => RustboroCity_Flat1_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_1F.inc => maps/RustboroCity_Flat1_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat1_2F.inc => RustboroCity_Flat1_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat1_2F.inc => maps/RustboroCity_Flat1_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_1F.inc => RustboroCity_Flat2_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_1F.inc => maps/RustboroCity_Flat2_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_2F.inc => RustboroCity_Flat2_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_2F.inc => maps/RustboroCity_Flat2_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Flat2_3F.inc => RustboroCity_Flat2_3F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Flat2_3F.inc => maps/RustboroCity_Flat2_3F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Gym.inc => RustboroCity_Gym/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Gym.inc => maps/RustboroCity_Gym/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House1.inc => RustboroCity_House1/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House1.inc => maps/RustboroCity_House1/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House2.inc => RustboroCity_House2/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House2.inc => maps/RustboroCity_House2/scripts.inc} (100%) rename data/maps/{events/RustboroCity_House3.inc => RustboroCity_House3/events.inc} (100%) rename data/{scripts/maps/RustboroCity_House3.inc => maps/RustboroCity_House3/scripts.inc} (100%) rename data/maps/{events/RustboroCity_Mart.inc => RustboroCity_Mart/events.inc} (100%) rename data/{scripts/maps/RustboroCity_Mart.inc => maps/RustboroCity_Mart/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_1F.inc => RustboroCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_1F.inc => maps/RustboroCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonCenter_2F.inc => RustboroCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonCenter_2F.inc => maps/RustboroCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/RustboroCity_PokemonSchool.inc => RustboroCity_PokemonSchool/events.inc} (100%) rename data/{scripts/maps/RustboroCity_PokemonSchool.inc => maps/RustboroCity_PokemonSchool/scripts.inc} (100%) rename data/maps/{events/RusturfTunnel.inc => RusturfTunnel/events.inc} (100%) rename data/{scripts/maps/RusturfTunnel.inc => maps/RusturfTunnel/scripts.inc} (100%) rename data/maps/{events/SSTidalCorridor.inc => SSTidalCorridor/events.inc} (100%) rename data/{scripts/maps/SSTidalCorridor.inc => maps/SSTidalCorridor/scripts.inc} (100%) rename data/maps/{events/SSTidalLowerDeck.inc => SSTidalLowerDeck/events.inc} (100%) rename data/{scripts/maps/SSTidalLowerDeck.inc => maps/SSTidalLowerDeck/scripts.inc} (100%) rename data/maps/{events/SSTidalRooms.inc => SSTidalRooms/events.inc} (100%) rename data/{scripts/maps/SSTidalRooms.inc => maps/SSTidalRooms/scripts.inc} (100%) rename data/maps/{events/SafariZone_North.inc => SafariZone_North/events.inc} (100%) rename data/{scripts/maps/SafariZone_North.inc => maps/SafariZone_North/scripts.inc} (100%) rename data/maps/{events/SafariZone_Northeast.inc => SafariZone_Northeast/events.inc} (100%) rename data/{scripts/maps/SafariZone_Northeast.inc => maps/SafariZone_Northeast/scripts.inc} (100%) rename data/maps/{events/SafariZone_Northwest.inc => SafariZone_Northwest/events.inc} (100%) rename data/{scripts/maps/SafariZone_Northwest.inc => maps/SafariZone_Northwest/scripts.inc} (100%) rename data/maps/{events/SafariZone_RestHouse.inc => SafariZone_RestHouse/events.inc} (100%) rename data/{scripts/maps/SafariZone_RestHouse.inc => maps/SafariZone_RestHouse/scripts.inc} (100%) rename data/maps/{events/SafariZone_South.inc => SafariZone_South/events.inc} (100%) rename data/{scripts/maps/SafariZone_South.inc => maps/SafariZone_South/scripts.inc} (100%) rename data/maps/{events/SafariZone_Southeast.inc => SafariZone_Southeast/events.inc} (100%) rename data/{scripts/maps/SafariZone_Southeast.inc => maps/SafariZone_Southeast/scripts.inc} (100%) rename data/maps/{events/SafariZone_Southwest.inc => SafariZone_Southwest/events.inc} (100%) rename data/{scripts/maps/SafariZone_Southwest.inc => maps/SafariZone_Southwest/scripts.inc} (100%) rename data/maps/{events/ScorchedSlab.inc => ScorchedSlab/events.inc} (100%) rename data/{scripts/maps/ScorchedSlab.inc => maps/ScorchedSlab/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Entrance.inc => SeafloorCavern_Entrance/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Entrance.inc => maps/SeafloorCavern_Entrance/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room1.inc => SeafloorCavern_Room1/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room1.inc => maps/SeafloorCavern_Room1/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room2.inc => SeafloorCavern_Room2/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room2.inc => maps/SeafloorCavern_Room2/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room3.inc => SeafloorCavern_Room3/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room3.inc => maps/SeafloorCavern_Room3/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room4.inc => SeafloorCavern_Room4/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room4.inc => maps/SeafloorCavern_Room4/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room5.inc => SeafloorCavern_Room5/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room5.inc => maps/SeafloorCavern_Room5/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room6.inc => SeafloorCavern_Room6/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room6.inc => maps/SeafloorCavern_Room6/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room7.inc => SeafloorCavern_Room7/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room7.inc => maps/SeafloorCavern_Room7/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room8.inc => SeafloorCavern_Room8/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room8.inc => maps/SeafloorCavern_Room8/scripts.inc} (100%) rename data/maps/{events/SeafloorCavern_Room9.inc => SeafloorCavern_Room9/events.inc} (100%) rename data/{scripts/maps/SeafloorCavern_Room9.inc => maps/SeafloorCavern_Room9/scripts.inc} (100%) rename data/maps/{events/SealedChamber_InnerRoom.inc => SealedChamber_InnerRoom/events.inc} (100%) rename data/{scripts/maps/SealedChamber_InnerRoom.inc => maps/SealedChamber_InnerRoom/scripts.inc} (100%) rename data/maps/{events/SealedChamber_OuterRoom.inc => SealedChamber_OuterRoom/events.inc} (100%) rename data/{scripts/maps/SealedChamber_OuterRoom.inc => maps/SealedChamber_OuterRoom/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave1.inc => SecretBase_BlueCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave1.inc => maps/SecretBase_BlueCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave2.inc => SecretBase_BlueCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave2.inc => maps/SecretBase_BlueCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave3.inc => SecretBase_BlueCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave3.inc => maps/SecretBase_BlueCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_BlueCave4.inc => SecretBase_BlueCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_BlueCave4.inc => maps/SecretBase_BlueCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave1.inc => SecretBase_BrownCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave1.inc => maps/SecretBase_BrownCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave2.inc => SecretBase_BrownCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave2.inc => maps/SecretBase_BrownCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave3.inc => SecretBase_BrownCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave3.inc => maps/SecretBase_BrownCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_BrownCave4.inc => SecretBase_BrownCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_BrownCave4.inc => maps/SecretBase_BrownCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave1.inc => SecretBase_RedCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave1.inc => maps/SecretBase_RedCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave2.inc => SecretBase_RedCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave2.inc => maps/SecretBase_RedCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave3.inc => SecretBase_RedCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave3.inc => maps/SecretBase_RedCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_RedCave4.inc => SecretBase_RedCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_RedCave4.inc => maps/SecretBase_RedCave4/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub1.inc => SecretBase_Shrub1/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub1.inc => maps/SecretBase_Shrub1/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub2.inc => SecretBase_Shrub2/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub2.inc => maps/SecretBase_Shrub2/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub3.inc => SecretBase_Shrub3/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub3.inc => maps/SecretBase_Shrub3/scripts.inc} (100%) rename data/maps/{events/SecretBase_Shrub4.inc => SecretBase_Shrub4/events.inc} (100%) rename data/{scripts/maps/SecretBase_Shrub4.inc => maps/SecretBase_Shrub4/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree1.inc => SecretBase_Tree1/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree1.inc => maps/SecretBase_Tree1/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree2.inc => SecretBase_Tree2/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree2.inc => maps/SecretBase_Tree2/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree3.inc => SecretBase_Tree3/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree3.inc => maps/SecretBase_Tree3/scripts.inc} (100%) rename data/maps/{events/SecretBase_Tree4.inc => SecretBase_Tree4/events.inc} (100%) rename data/{scripts/maps/SecretBase_Tree4.inc => maps/SecretBase_Tree4/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave1.inc => SecretBase_YellowCave1/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave1.inc => maps/SecretBase_YellowCave1/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave2.inc => SecretBase_YellowCave2/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave2.inc => maps/SecretBase_YellowCave2/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave3.inc => SecretBase_YellowCave3/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave3.inc => maps/SecretBase_YellowCave3/scripts.inc} (100%) rename data/maps/{events/SecretBase_YellowCave4.inc => SecretBase_YellowCave4/events.inc} (100%) rename data/{scripts/maps/SecretBase_YellowCave4.inc => maps/SecretBase_YellowCave4/scripts.inc} (100%) rename data/maps/{events/ShoalCave_HighTideEntranceRoom.inc => ShoalCave_HighTideEntranceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideEntranceRoom.inc => maps/ShoalCave_HighTideEntranceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_HighTideInnerRoom.inc => ShoalCave_HighTideInnerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_HighTideInnerRoom.inc => maps/ShoalCave_HighTideInnerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideEntranceRoom.inc => ShoalCave_LowTideEntranceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideEntranceRoom.inc => maps/ShoalCave_LowTideEntranceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideIceRoom.inc => ShoalCave_LowTideIceRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideIceRoom.inc => maps/ShoalCave_LowTideIceRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideInnerRoom.inc => ShoalCave_LowTideInnerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideInnerRoom.inc => maps/ShoalCave_LowTideInnerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideLowerRoom.inc => ShoalCave_LowTideLowerRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideLowerRoom.inc => maps/ShoalCave_LowTideLowerRoom/scripts.inc} (100%) rename data/maps/{events/ShoalCave_LowTideStairsRoom.inc => ShoalCave_LowTideStairsRoom/events.inc} (100%) rename data/{scripts/maps/ShoalCave_LowTideStairsRoom.inc => maps/ShoalCave_LowTideStairsRoom/scripts.inc} (100%) rename data/maps/{events/SingleBattleColosseum.inc => SingleBattleColosseum/events.inc} (100%) rename data/{scripts/maps/SingleBattleColosseum.inc => maps/SingleBattleColosseum/scripts.inc} (100%) rename data/maps/{events/SkyPillar_1F.inc => SkyPillar_1F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_1F.inc => maps/SkyPillar_1F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_2F.inc => SkyPillar_2F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_2F.inc => maps/SkyPillar_2F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_3F.inc => SkyPillar_3F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_3F.inc => maps/SkyPillar_3F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_4F.inc => SkyPillar_4F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_4F.inc => maps/SkyPillar_4F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_5F.inc => SkyPillar_5F/events.inc} (100%) rename data/{scripts/maps/SkyPillar_5F.inc => maps/SkyPillar_5F/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Entrance.inc => SkyPillar_Entrance/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Entrance.inc => maps/SkyPillar_Entrance/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Outside.inc => SkyPillar_Outside/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Outside.inc => maps/SkyPillar_Outside/scripts.inc} (100%) rename data/maps/{events/SkyPillar_Top.inc => SkyPillar_Top/events.inc} (100%) rename data/{scripts/maps/SkyPillar_Top.inc => maps/SkyPillar_Top/scripts.inc} (100%) rename data/maps/{events/SlateportCity.inc => SlateportCity/events.inc} (100%) rename data/{scripts/maps/SlateportCity.inc => maps/SlateportCity/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentBattleRoom.inc => SlateportCity_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentBattleRoom.inc => maps/SlateportCity_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentCorridor.inc => SlateportCity_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentCorridor.inc => maps/SlateportCity_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/SlateportCity_BattleTentLobby.inc => SlateportCity_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/SlateportCity_BattleTentLobby.inc => maps/SlateportCity_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/SlateportCity_Harbor.inc => SlateportCity_Harbor/events.inc} (100%) rename data/{scripts/maps/SlateportCity_Harbor.inc => maps/SlateportCity_Harbor/scripts.inc} (100%) rename data/maps/{events/SlateportCity_House1.inc => SlateportCity_House1/events.inc} (100%) rename data/{scripts/maps/SlateportCity_House1.inc => maps/SlateportCity_House1/scripts.inc} (100%) rename data/maps/{events/SlateportCity_House2.inc => SlateportCity_House2/events.inc} (100%) rename data/{scripts/maps/SlateportCity_House2.inc => maps/SlateportCity_House2/scripts.inc} (100%) rename data/maps/{events/SlateportCity_Mart.inc => SlateportCity_Mart/events.inc} (100%) rename data/{scripts/maps/SlateportCity_Mart.inc => maps/SlateportCity_Mart/scripts.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_1F.inc => SlateportCity_OceanicMuseum_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_1F.inc => maps/SlateportCity_OceanicMuseum_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_OceanicMuseum_2F.inc => SlateportCity_OceanicMuseum_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_OceanicMuseum_2F.inc => maps/SlateportCity_OceanicMuseum_2F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_1F.inc => SlateportCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_1F.inc => maps/SlateportCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonCenter_2F.inc => SlateportCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonCenter_2F.inc => maps/SlateportCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_PokemonFanClub.inc => SlateportCity_PokemonFanClub/events.inc} (100%) rename data/{scripts/maps/SlateportCity_PokemonFanClub.inc => maps/SlateportCity_PokemonFanClub/scripts.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_1F.inc => SlateportCity_SternsShipyard_1F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_1F.inc => maps/SlateportCity_SternsShipyard_1F/scripts.inc} (100%) rename data/maps/{events/SlateportCity_SternsShipyard_2F.inc => SlateportCity_SternsShipyard_2F/events.inc} (100%) rename data/{scripts/maps/SlateportCity_SternsShipyard_2F.inc => maps/SlateportCity_SternsShipyard_2F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity.inc => SootopolisCity/events.inc} (100%) rename data/{scripts/maps/SootopolisCity.inc => maps/SootopolisCity/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_1F.inc => SootopolisCity_Gym_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_1F.inc => maps/SootopolisCity_Gym_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Gym_B1F.inc => SootopolisCity_Gym_B1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Gym_B1F.inc => maps/SootopolisCity_Gym_B1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House1.inc => SootopolisCity_House1/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House1.inc => maps/SootopolisCity_House1/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House2.inc => SootopolisCity_House2/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House2.inc => maps/SootopolisCity_House2/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House3.inc => SootopolisCity_House3/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House3.inc => maps/SootopolisCity_House3/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House4.inc => SootopolisCity_House4/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House4.inc => maps/SootopolisCity_House4/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House5.inc => SootopolisCity_House5/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House5.inc => maps/SootopolisCity_House5/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House6.inc => SootopolisCity_House6/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House6.inc => maps/SootopolisCity_House6/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_House7.inc => SootopolisCity_House7/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_House7.inc => maps/SootopolisCity_House7/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_LotadAndSeedotHouse.inc => SootopolisCity_LotadAndSeedotHouse/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc => maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_Mart.inc => SootopolisCity_Mart/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_Mart.inc => maps/SootopolisCity_Mart/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_MysteryEventsHouse_1F.inc => SootopolisCity_MysteryEventsHouse_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc => maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_MysteryEventsHouse_B1F.inc => SootopolisCity_MysteryEventsHouse_B1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc => maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_1F.inc => SootopolisCity_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_1F.inc => maps/SootopolisCity_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/SootopolisCity_PokemonCenter_2F.inc => SootopolisCity_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/SootopolisCity_PokemonCenter_2F.inc => maps/SootopolisCity_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/SouthernIsland_Exterior.inc => SouthernIsland_Exterior/events.inc} (100%) rename data/{scripts/maps/SouthernIsland_Exterior.inc => maps/SouthernIsland_Exterior/scripts.inc} (100%) rename data/maps/{events/SouthernIsland_Interior.inc => SouthernIsland_Interior/events.inc} (100%) rename data/{scripts/maps/SouthernIsland_Interior.inc => maps/SouthernIsland_Interior/scripts.inc} (100%) rename data/maps/{events/TerraCave_End.inc => TerraCave_End/events.inc} (100%) rename data/{scripts/maps/TerraCave_End.inc => maps/TerraCave_End/scripts.inc} (100%) rename data/maps/{events/TerraCave_Entrance.inc => TerraCave_Entrance/events.inc} (100%) rename data/{scripts/maps/TerraCave_Entrance.inc => maps/TerraCave_Entrance/scripts.inc} (100%) rename data/maps/{events/TradeCenter.inc => TradeCenter/events.inc} (100%) rename data/{scripts/maps/TradeCenter.inc => maps/TradeCenter/scripts.inc} (100%) rename data/maps/{events/TrainerHill_1F.inc => TrainerHill_1F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_1F.inc => maps/TrainerHill_1F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_2F.inc => TrainerHill_2F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_2F.inc => maps/TrainerHill_2F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_3F.inc => TrainerHill_3F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_3F.inc => maps/TrainerHill_3F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_4F.inc => TrainerHill_4F/events.inc} (100%) rename data/{scripts/maps/TrainerHill_4F.inc => maps/TrainerHill_4F/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Elevator.inc => TrainerHill_Elevator/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Elevator.inc => maps/TrainerHill_Elevator/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Entrance.inc => TrainerHill_Entrance/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Entrance.inc => maps/TrainerHill_Entrance/scripts.inc} (100%) rename data/maps/{events/TrainerHill_Roof.inc => TrainerHill_Roof/events.inc} (100%) rename data/{scripts/maps/TrainerHill_Roof.inc => maps/TrainerHill_Roof/scripts.inc} (100%) rename data/maps/{events/Underwater1.inc => Underwater1/events.inc} (100%) rename data/{scripts/maps/Underwater1.inc => maps/Underwater1/scripts.inc} (100%) rename data/maps/{events/Underwater2.inc => Underwater2/events.inc} (100%) rename data/{scripts/maps/Underwater2.inc => maps/Underwater2/scripts.inc} (100%) rename data/maps/{events/Underwater3.inc => Underwater3/events.inc} (100%) rename data/{scripts/maps/Underwater3.inc => maps/Underwater3/scripts.inc} (100%) rename data/maps/{events/Underwater4.inc => Underwater4/events.inc} (100%) rename data/{scripts/maps/Underwater4.inc => maps/Underwater4/scripts.inc} (100%) rename data/maps/{events/Underwater5.inc => Underwater5/events.inc} (100%) rename data/{scripts/maps/Underwater5.inc => maps/Underwater5/scripts.inc} (100%) rename data/maps/{events/Underwater6.inc => Underwater6/events.inc} (100%) rename data/{scripts/maps/Underwater6.inc => maps/Underwater6/scripts.inc} (100%) rename data/maps/{events/Underwater7.inc => Underwater7/events.inc} (100%) rename data/{scripts/maps/Underwater7.inc => maps/Underwater7/scripts.inc} (100%) rename data/maps/{events/Underwater_MarineCave.inc => Underwater_MarineCave/events.inc} (100%) rename data/{scripts/maps/Underwater_MarineCave.inc => maps/Underwater_MarineCave/scripts.inc} (100%) rename data/maps/{events/Underwater_Route134.inc => Underwater_Route134/events.inc} (100%) rename data/{scripts/maps/Underwater_Route134.inc => maps/Underwater_Route134/scripts.inc} (100%) rename data/maps/{events/Underwater_SeafloorCavern.inc => Underwater_SeafloorCavern/events.inc} (100%) rename data/{scripts/maps/Underwater_SeafloorCavern.inc => maps/Underwater_SeafloorCavern/scripts.inc} (100%) rename data/maps/{events/Underwater_SealedChamber.inc => Underwater_SealedChamber/events.inc} (100%) rename data/{scripts/maps/Underwater_SealedChamber.inc => maps/Underwater_SealedChamber/scripts.inc} (100%) rename data/maps/{events/Underwater_SootopolisCity.inc => Underwater_SootopolisCity/events.inc} (100%) rename data/{scripts/maps/Underwater_SootopolisCity.inc => maps/Underwater_SootopolisCity/scripts.inc} (100%) rename data/maps/{events/UnionRoom.inc => UnionRoom/events.inc} (100%) rename data/{scripts/maps/UnionRoom.inc => maps/UnionRoom/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_29.inc => UnknownMap_25_29/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_29.inc => maps/UnknownMap_25_29/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_30.inc => UnknownMap_25_30/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_30.inc => maps/UnknownMap_25_30/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_31.inc => UnknownMap_25_31/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_31.inc => maps/UnknownMap_25_31/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_32.inc => UnknownMap_25_32/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_32.inc => maps/UnknownMap_25_32/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_33.inc => UnknownMap_25_33/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_33.inc => maps/UnknownMap_25_33/scripts.inc} (100%) rename data/maps/{events/UnknownMap_25_34.inc => UnknownMap_25_34/events.inc} (100%) rename data/{scripts/maps/UnknownMap_25_34.inc => maps/UnknownMap_25_34/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown.inc => VerdanturfTown/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown.inc => maps/VerdanturfTown/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentBattleRoom.inc => VerdanturfTown_BattleTentBattleRoom/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc => maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentCorridor.inc => VerdanturfTown_BattleTentCorridor/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentCorridor.inc => maps/VerdanturfTown_BattleTentCorridor/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_BattleTentLobby.inc => VerdanturfTown_BattleTentLobby/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_BattleTentLobby.inc => maps/VerdanturfTown_BattleTentLobby/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_FriendshipRatersHouse.inc => VerdanturfTown_FriendshipRatersHouse/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc => maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_House.inc => VerdanturfTown_House/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_House.inc => maps/VerdanturfTown_House/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_Mart.inc => VerdanturfTown_Mart/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_Mart.inc => maps/VerdanturfTown_Mart/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_1F.inc => VerdanturfTown_PokemonCenter_1F/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_1F.inc => maps/VerdanturfTown_PokemonCenter_1F/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_PokemonCenter_2F.inc => VerdanturfTown_PokemonCenter_2F/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_PokemonCenter_2F.inc => maps/VerdanturfTown_PokemonCenter_2F/scripts.inc} (100%) rename data/maps/{events/VerdanturfTown_WandasHouse.inc => VerdanturfTown_WandasHouse/events.inc} (100%) rename data/{scripts/maps/VerdanturfTown_WandasHouse.inc => maps/VerdanturfTown_WandasHouse/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_1F.inc => VictoryRoad_1F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_1F.inc => maps/VictoryRoad_1F/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_B1F.inc => VictoryRoad_B1F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_B1F.inc => maps/VictoryRoad_B1F/scripts.inc} (100%) rename data/maps/{events/VictoryRoad_B2F.inc => VictoryRoad_B2F/events.inc} (100%) rename data/{scripts/maps/VictoryRoad_B2F.inc => maps/VictoryRoad_B2F/scripts.inc} (100%) diff --git a/data/event_scripts.s b/data/event_scripts.s index e18dec8360..4ad0ad60dd 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -59,376 +59,376 @@ gStdScripts_End:: @ 81DC2CC map_script 2, PetalburgCity_MapScript2_1DC31C .byte 0 - .include "data/scripts/maps/PetalburgCity.inc" - .include "data/scripts/maps/SlateportCity.inc" - .include "data/scripts/maps/MauvilleCity.inc" - .include "data/scripts/maps/RustboroCity.inc" - .include "data/scripts/maps/FortreeCity.inc" - .include "data/scripts/maps/LilycoveCity.inc" - .include "data/scripts/maps/MossdeepCity.inc" - .include "data/scripts/maps/SootopolisCity.inc" - .include "data/scripts/maps/EverGrandeCity.inc" - .include "data/scripts/maps/LittlerootTown.inc" - .include "data/scripts/maps/OldaleTown.inc" - .include "data/scripts/maps/DewfordTown.inc" - .include "data/scripts/maps/LavaridgeTown.inc" - .include "data/scripts/maps/FallarborTown.inc" - .include "data/scripts/maps/VerdanturfTown.inc" - .include "data/scripts/maps/PacifidlogTown.inc" - .include "data/scripts/maps/Route101.inc" - .include "data/scripts/maps/Route102.inc" - .include "data/scripts/maps/Route103.inc" - .include "data/scripts/maps/Route104.inc" - .include "data/scripts/maps/Route105.inc" - .include "data/scripts/maps/Route106.inc" - .include "data/scripts/maps/Route107.inc" - .include "data/scripts/maps/Route108.inc" - .include "data/scripts/maps/Route109.inc" - .include "data/scripts/maps/Route110.inc" - .include "data/scripts/maps/Route111.inc" - .include "data/scripts/maps/Route112.inc" - .include "data/scripts/maps/Route113.inc" - .include "data/scripts/maps/Route114.inc" - .include "data/scripts/maps/Route115.inc" - .include "data/scripts/maps/Route116.inc" - .include "data/scripts/maps/Route117.inc" - .include "data/scripts/maps/Route118.inc" - .include "data/scripts/maps/Route119.inc" - .include "data/scripts/maps/Route120.inc" - .include "data/scripts/maps/Route121.inc" - .include "data/scripts/maps/Route122.inc" - .include "data/scripts/maps/Route123.inc" - .include "data/scripts/maps/Route124.inc" - .include "data/scripts/maps/Route125.inc" - .include "data/scripts/maps/Route126.inc" - .include "data/scripts/maps/Route127.inc" - .include "data/scripts/maps/Route128.inc" - .include "data/scripts/maps/Route129.inc" - .include "data/scripts/maps/Route130.inc" - .include "data/scripts/maps/Route131.inc" - .include "data/scripts/maps/Route132.inc" - .include "data/scripts/maps/Route133.inc" - .include "data/scripts/maps/Route134.inc" - .include "data/scripts/maps/Underwater1.inc" - .include "data/scripts/maps/Underwater2.inc" - .include "data/scripts/maps/Underwater3.inc" - .include "data/scripts/maps/Underwater4.inc" - .include "data/scripts/maps/Underwater5.inc" - .include "data/scripts/maps/Underwater6.inc" - .include "data/scripts/maps/Underwater7.inc" - .include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc" - .include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc" - .include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc" - .include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc" - .include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/scripts/maps/OldaleTown_House1.inc" - .include "data/scripts/maps/OldaleTown_House2.inc" - .include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/OldaleTown_Mart.inc" - .include "data/scripts/maps/DewfordTown_House1.inc" - .include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/DewfordTown_Gym.inc" - .include "data/scripts/maps/DewfordTown_Hall.inc" - .include "data/scripts/maps/DewfordTown_House2.inc" - .include "data/scripts/maps/LavaridgeTown_HerbShop.inc" - .include "data/scripts/maps/LavaridgeTown_Gym_1F.inc" - .include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc" - .include "data/scripts/maps/LavaridgeTown_House.inc" - .include "data/scripts/maps/LavaridgeTown_Mart.inc" - .include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/FallarborTown_Mart.inc" - .include "data/scripts/maps/FallarborTown_BattleTentLobby.inc" - .include "data/scripts/maps/FallarborTown_BattleTentCorridor.inc" - .include "data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc" - .include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/FallarborTown_House1.inc" - .include "data/scripts/maps/FallarborTown_House2.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentLobby.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc" - .include "data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/scripts/maps/VerdanturfTown_Mart.inc" - .include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/VerdanturfTown_WandasHouse.inc" - .include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/scripts/maps/VerdanturfTown_House.inc" - .include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/scripts/maps/PacifidlogTown_House1.inc" - .include "data/scripts/maps/PacifidlogTown_House2.inc" - .include "data/scripts/maps/PacifidlogTown_House3.inc" - .include "data/scripts/maps/PacifidlogTown_House4.inc" - .include "data/scripts/maps/PacifidlogTown_House5.inc" - .include "data/scripts/maps/PetalburgCity_WallysHouse.inc" - .include "data/scripts/maps/PetalburgCity_Gym.inc" - .include "data/scripts/maps/PetalburgCity_House1.inc" - .include "data/scripts/maps/PetalburgCity_House2.inc" - .include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/PetalburgCity_Mart.inc" - .include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc" - .include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc" - .include "data/scripts/maps/SlateportCity_BattleTentLobby.inc" - .include "data/scripts/maps/SlateportCity_BattleTentCorridor.inc" - .include "data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc" - .include "data/scripts/maps/SlateportCity_House1.inc" - .include "data/scripts/maps/SlateportCity_PokemonFanClub.inc" - .include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc" - .include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc" - .include "data/scripts/maps/SlateportCity_Harbor.inc" - .include "data/scripts/maps/SlateportCity_House2.inc" - .include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/SlateportCity_Mart.inc" - .include "data/scripts/maps/MauvilleCity_Gym.inc" - .include "data/scripts/maps/MauvilleCity_BikeShop.inc" - .include "data/scripts/maps/MauvilleCity_House1.inc" - .include "data/scripts/maps/MauvilleCity_GameCorner.inc" - .include "data/scripts/maps/MauvilleCity_House2.inc" - .include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/MauvilleCity_Mart.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc" - .include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc" - .include "data/scripts/maps/RustboroCity_Gym.inc" - .include "data/scripts/maps/RustboroCity_PokemonSchool.inc" - .include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/RustboroCity_Mart.inc" - .include "data/scripts/maps/RustboroCity_Flat1_1F.inc" - .include "data/scripts/maps/RustboroCity_Flat1_2F.inc" - .include "data/scripts/maps/RustboroCity_House1.inc" - .include "data/scripts/maps/RustboroCity_CuttersHouse.inc" - .include "data/scripts/maps/RustboroCity_House2.inc" - .include "data/scripts/maps/RustboroCity_Flat2_1F.inc" - .include "data/scripts/maps/RustboroCity_Flat2_2F.inc" - .include "data/scripts/maps/RustboroCity_Flat2_3F.inc" - .include "data/scripts/maps/RustboroCity_House3.inc" - .include "data/scripts/maps/FortreeCity_House1.inc" - .include "data/scripts/maps/FortreeCity_Gym.inc" - .include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/FortreeCity_Mart.inc" - .include "data/scripts/maps/FortreeCity_House2.inc" - .include "data/scripts/maps/FortreeCity_House3.inc" - .include "data/scripts/maps/FortreeCity_House4.inc" - .include "data/scripts/maps/FortreeCity_House5.inc" - .include "data/scripts/maps/FortreeCity_DecorationShop.inc" - .include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/scripts/maps/LilycoveCity_ContestLobby.inc" - .include "data/scripts/maps/LilycoveCity_ContestHall.inc" - .include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/LilycoveCity_UnusedMart.inc" - .include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/scripts/maps/LilycoveCity_Harbor.inc" - .include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc" - .include "data/scripts/maps/LilycoveCity_House1.inc" - .include "data/scripts/maps/LilycoveCity_House2.inc" - .include "data/scripts/maps/LilycoveCity_House3.inc" - .include "data/scripts/maps/LilycoveCity_House4.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/scripts/maps/MossdeepCity_Gym.inc" - .include "data/scripts/maps/MossdeepCity_House1.inc" - .include "data/scripts/maps/MossdeepCity_House2.inc" - .include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/MossdeepCity_Mart.inc" - .include "data/scripts/maps/MossdeepCity_House3.inc" - .include "data/scripts/maps/MossdeepCity_StevensHouse.inc" - .include "data/scripts/maps/MossdeepCity_House4.inc" - .include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc" - .include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc" - .include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc" - .include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc" - .include "data/scripts/maps/SootopolisCity_Gym_1F.inc" - .include "data/scripts/maps/SootopolisCity_Gym_B1F.inc" - .include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/SootopolisCity_Mart.inc" - .include "data/scripts/maps/SootopolisCity_House1.inc" - .include "data/scripts/maps/SootopolisCity_House2.inc" - .include "data/scripts/maps/SootopolisCity_House3.inc" - .include "data/scripts/maps/SootopolisCity_House4.inc" - .include "data/scripts/maps/SootopolisCity_House5.inc" - .include "data/scripts/maps/SootopolisCity_House6.inc" - .include "data/scripts/maps/SootopolisCity_House7.inc" - .include "data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc" - .include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc" - .include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc" - .include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc" - .include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc" - .include "data/scripts/maps/EverGrandeCity_Hall1.inc" - .include "data/scripts/maps/EverGrandeCity_Hall2.inc" - .include "data/scripts/maps/EverGrandeCity_Hall3.inc" - .include "data/scripts/maps/EverGrandeCity_Hall4.inc" - .include "data/scripts/maps/EverGrandeCity_Hall5.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/scripts/maps/EverGrandeCity_HallOfFame.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/scripts/maps/Route104_MrBrineysHouse.inc" - .include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc" - .include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc" - .include "data/scripts/maps/Route111_OldLadysRestStop.inc" - .include "data/scripts/maps/Route112_CableCarStation.inc" - .include "data/scripts/maps/MtChimney_CableCarStation.inc" - .include "data/scripts/maps/Route114_FossilManiacsHouse.inc" - .include "data/scripts/maps/Route114_FossilManiacsTunnel.inc" - .include "data/scripts/maps/Route114_LanettesHouse.inc" - .include "data/scripts/maps/Route116_TunnelersRestHouse.inc" - .include "data/scripts/maps/Route117_PokemonDayCare.inc" - .include "data/scripts/maps/Route121_SafariZoneEntrance.inc" - .include "data/scripts/maps/MeteorFalls_1F_1R.inc" - .include "data/scripts/maps/MeteorFalls_1F_2R.inc" - .include "data/scripts/maps/MeteorFalls_B1F_1R.inc" - .include "data/scripts/maps/MeteorFalls_B1F_2R.inc" - .include "data/scripts/maps/RusturfTunnel.inc" - .include "data/scripts/maps/Underwater_SootopolisCity.inc" - .include "data/scripts/maps/DesertRuins.inc" - .include "data/scripts/maps/GraniteCave_1F.inc" - .include "data/scripts/maps/GraniteCave_B1F.inc" - .include "data/scripts/maps/GraniteCave_B2F.inc" - .include "data/scripts/maps/GraniteCave_StevensRoom.inc" - .include "data/scripts/maps/PetalburgWoods.inc" - .include "data/scripts/maps/MtChimney.inc" - .include "data/scripts/maps/JaggedPass.inc" - .include "data/scripts/maps/FieryPath.inc" - .include "data/scripts/maps/MtPyre_1F.inc" - .include "data/scripts/maps/MtPyre_2F.inc" - .include "data/scripts/maps/MtPyre_3F.inc" - .include "data/scripts/maps/MtPyre_4F.inc" - .include "data/scripts/maps/MtPyre_5F.inc" - .include "data/scripts/maps/MtPyre_6F.inc" - .include "data/scripts/maps/MtPyre_Exterior.inc" - .include "data/scripts/maps/MtPyre_Summit.inc" - .include "data/scripts/maps/AquaHideout_1F.inc" - .include "data/scripts/maps/AquaHideout_B1F.inc" - .include "data/scripts/maps/AquaHideout_B2F.inc" - .include "data/scripts/maps/Underwater_SeafloorCavern.inc" - .include "data/scripts/maps/SeafloorCavern_Entrance.inc" - .include "data/scripts/maps/SeafloorCavern_Room1.inc" - .include "data/scripts/maps/SeafloorCavern_Room2.inc" - .include "data/scripts/maps/SeafloorCavern_Room3.inc" - .include "data/scripts/maps/SeafloorCavern_Room4.inc" - .include "data/scripts/maps/SeafloorCavern_Room5.inc" - .include "data/scripts/maps/SeafloorCavern_Room6.inc" - .include "data/scripts/maps/SeafloorCavern_Room7.inc" - .include "data/scripts/maps/SeafloorCavern_Room8.inc" - .include "data/scripts/maps/SeafloorCavern_Room9.inc" - .include "data/scripts/maps/CaveOfOrigin_Entrance.inc" - .include "data/scripts/maps/CaveOfOrigin_1F.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/scripts/maps/CaveOfOrigin_B1F.inc" - .include "data/scripts/maps/VictoryRoad_1F.inc" - .include "data/scripts/maps/VictoryRoad_B1F.inc" - .include "data/scripts/maps/VictoryRoad_B2F.inc" - .include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc" - .include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc" - .include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc" - .include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc" - .include "data/scripts/maps/NewMauville_Entrance.inc" - .include "data/scripts/maps/NewMauville_Inside.inc" - .include "data/scripts/maps/AbandonedShip_Deck.inc" - .include "data/scripts/maps/AbandonedShip_Corridors_1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms_1F.inc" - .include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Underwater1.inc" - .include "data/scripts/maps/AbandonedShip_Room_B1F.inc" - .include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc" - .include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc" - .include "data/scripts/maps/AbandonedShip_Underwater2.inc" - .include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc" - .include "data/scripts/maps/IslandCave.inc" - .include "data/scripts/maps/AncientTomb.inc" - .include "data/scripts/maps/Underwater_Route134.inc" - .include "data/scripts/maps/Underwater_SealedChamber.inc" - .include "data/scripts/maps/SealedChamber_OuterRoom.inc" - .include "data/scripts/maps/SealedChamber_InnerRoom.inc" - .include "data/scripts/maps/ScorchedSlab.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap1.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap2.inc" - .include "data/scripts/maps/AquaHideout_UnusedRubyMap3.inc" - .include "data/scripts/maps/SkyPillar_Entrance.inc" - .include "data/scripts/maps/SkyPillar_Outside.inc" - .include "data/scripts/maps/SkyPillar_1F.inc" - .include "data/scripts/maps/SkyPillar_2F.inc" - .include "data/scripts/maps/SkyPillar_3F.inc" - .include "data/scripts/maps/SkyPillar_4F.inc" - .include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc" - .include "data/scripts/maps/SkyPillar_5F.inc" - .include "data/scripts/maps/SkyPillar_Top.inc" - .include "data/scripts/maps/MagmaHideout_1F.inc" - .include "data/scripts/maps/MagmaHideout_2F_1R.inc" - .include "data/scripts/maps/MagmaHideout_2F_2R.inc" - .include "data/scripts/maps/MagmaHideout_3F_1R.inc" - .include "data/scripts/maps/MagmaHideout_3F_2R.inc" - .include "data/scripts/maps/MagmaHideout_4F.inc" - .include "data/scripts/maps/MagmaHideout_3F_3R.inc" - .include "data/scripts/maps/MagmaHideout_2F_3R.inc" - .include "data/scripts/maps/MirageTower_1F.inc" - .include "data/scripts/maps/MirageTower_2F.inc" - .include "data/scripts/maps/MirageTower_3F.inc" - .include "data/scripts/maps/MirageTower_4F.inc" - .include "data/scripts/maps/DesertUnderpass.inc" - .include "data/scripts/maps/ArtisanCave_B1F.inc" - .include "data/scripts/maps/ArtisanCave_1F.inc" - .include "data/scripts/maps/Underwater_MarineCave.inc" - .include "data/scripts/maps/MarineCave_Entrance.inc" - .include "data/scripts/maps/MarineCave_End.inc" - .include "data/scripts/maps/TerraCave_Entrance.inc" - .include "data/scripts/maps/TerraCave_End.inc" - .include "data/scripts/maps/AlteringCave.inc" - .include "data/scripts/maps/MeteorFalls_StevensCave.inc" - .include "data/scripts/maps/SecretBase_BlueCave1.inc" - .include "data/scripts/maps/SecretBase_BlueCave2.inc" - .include "data/scripts/maps/SecretBase_BlueCave3.inc" - .include "data/scripts/maps/SecretBase_BlueCave4.inc" - .include "data/scripts/maps/SecretBase_BrownCave1.inc" - .include "data/scripts/maps/SecretBase_BrownCave2.inc" - .include "data/scripts/maps/SecretBase_BrownCave3.inc" - .include "data/scripts/maps/SecretBase_BrownCave4.inc" - .include "data/scripts/maps/SecretBase_RedCave1.inc" - .include "data/scripts/maps/SecretBase_RedCave2.inc" - .include "data/scripts/maps/SecretBase_RedCave3.inc" - .include "data/scripts/maps/SecretBase_RedCave4.inc" - .include "data/scripts/maps/SecretBase_Shrub1.inc" - .include "data/scripts/maps/SecretBase_Shrub2.inc" - .include "data/scripts/maps/SecretBase_Shrub3.inc" - .include "data/scripts/maps/SecretBase_Shrub4.inc" - .include "data/scripts/maps/SecretBase_Tree1.inc" - .include "data/scripts/maps/SecretBase_Tree2.inc" - .include "data/scripts/maps/SecretBase_Tree3.inc" - .include "data/scripts/maps/SecretBase_Tree4.inc" - .include "data/scripts/maps/SecretBase_YellowCave1.inc" - .include "data/scripts/maps/SecretBase_YellowCave2.inc" - .include "data/scripts/maps/SecretBase_YellowCave3.inc" - .include "data/scripts/maps/SecretBase_YellowCave4.inc" + .include "data/maps/PetalburgCity/scripts.inc" + .include "data/maps/SlateportCity/scripts.inc" + .include "data/maps/MauvilleCity/scripts.inc" + .include "data/maps/RustboroCity/scripts.inc" + .include "data/maps/FortreeCity/scripts.inc" + .include "data/maps/LilycoveCity/scripts.inc" + .include "data/maps/MossdeepCity/scripts.inc" + .include "data/maps/SootopolisCity/scripts.inc" + .include "data/maps/EverGrandeCity/scripts.inc" + .include "data/maps/LittlerootTown/scripts.inc" + .include "data/maps/OldaleTown/scripts.inc" + .include "data/maps/DewfordTown/scripts.inc" + .include "data/maps/LavaridgeTown/scripts.inc" + .include "data/maps/FallarborTown/scripts.inc" + .include "data/maps/VerdanturfTown/scripts.inc" + .include "data/maps/PacifidlogTown/scripts.inc" + .include "data/maps/Route101/scripts.inc" + .include "data/maps/Route102/scripts.inc" + .include "data/maps/Route103/scripts.inc" + .include "data/maps/Route104/scripts.inc" + .include "data/maps/Route105/scripts.inc" + .include "data/maps/Route106/scripts.inc" + .include "data/maps/Route107/scripts.inc" + .include "data/maps/Route108/scripts.inc" + .include "data/maps/Route109/scripts.inc" + .include "data/maps/Route110/scripts.inc" + .include "data/maps/Route111/scripts.inc" + .include "data/maps/Route112/scripts.inc" + .include "data/maps/Route113/scripts.inc" + .include "data/maps/Route114/scripts.inc" + .include "data/maps/Route115/scripts.inc" + .include "data/maps/Route116/scripts.inc" + .include "data/maps/Route117/scripts.inc" + .include "data/maps/Route118/scripts.inc" + .include "data/maps/Route119/scripts.inc" + .include "data/maps/Route120/scripts.inc" + .include "data/maps/Route121/scripts.inc" + .include "data/maps/Route122/scripts.inc" + .include "data/maps/Route123/scripts.inc" + .include "data/maps/Route124/scripts.inc" + .include "data/maps/Route125/scripts.inc" + .include "data/maps/Route126/scripts.inc" + .include "data/maps/Route127/scripts.inc" + .include "data/maps/Route128/scripts.inc" + .include "data/maps/Route129/scripts.inc" + .include "data/maps/Route130/scripts.inc" + .include "data/maps/Route131/scripts.inc" + .include "data/maps/Route132/scripts.inc" + .include "data/maps/Route133/scripts.inc" + .include "data/maps/Route134/scripts.inc" + .include "data/maps/Underwater1/scripts.inc" + .include "data/maps/Underwater2/scripts.inc" + .include "data/maps/Underwater3/scripts.inc" + .include "data/maps/Underwater4/scripts.inc" + .include "data/maps/Underwater5/scripts.inc" + .include "data/maps/Underwater6/scripts.inc" + .include "data/maps/Underwater7/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc" + .include "data/maps/OldaleTown_House1/scripts.inc" + .include "data/maps/OldaleTown_House2/scripts.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/OldaleTown_Mart/scripts.inc" + .include "data/maps/DewfordTown_House1/scripts.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/DewfordTown_Gym/scripts.inc" + .include "data/maps/DewfordTown_Hall/scripts.inc" + .include "data/maps/DewfordTown_House2/scripts.inc" + .include "data/maps/LavaridgeTown_HerbShop/scripts.inc" + .include "data/maps/LavaridgeTown_Gym_1F/scripts.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc" + .include "data/maps/LavaridgeTown_House/scripts.inc" + .include "data/maps/LavaridgeTown_Mart/scripts.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/FallarborTown_Mart/scripts.inc" + .include "data/maps/FallarborTown_BattleTentLobby/scripts.inc" + .include "data/maps/FallarborTown_BattleTentCorridor/scripts.inc" + .include "data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/FallarborTown_House1/scripts.inc" + .include "data/maps/FallarborTown_House2/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentLobby/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc" + .include "data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc" + .include "data/maps/VerdanturfTown_Mart/scripts.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/VerdanturfTown_WandasHouse/scripts.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc" + .include "data/maps/VerdanturfTown_House/scripts.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc" + .include "data/maps/PacifidlogTown_House1/scripts.inc" + .include "data/maps/PacifidlogTown_House2/scripts.inc" + .include "data/maps/PacifidlogTown_House3/scripts.inc" + .include "data/maps/PacifidlogTown_House4/scripts.inc" + .include "data/maps/PacifidlogTown_House5/scripts.inc" + .include "data/maps/PetalburgCity_WallysHouse/scripts.inc" + .include "data/maps/PetalburgCity_Gym/scripts.inc" + .include "data/maps/PetalburgCity_House1/scripts.inc" + .include "data/maps/PetalburgCity_House2/scripts.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/PetalburgCity_Mart/scripts.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc" + .include "data/maps/SlateportCity_BattleTentLobby/scripts.inc" + .include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc" + .include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc" + .include "data/maps/SlateportCity_House1/scripts.inc" + .include "data/maps/SlateportCity_PokemonFanClub/scripts.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc" + .include "data/maps/SlateportCity_Harbor/scripts.inc" + .include "data/maps/SlateportCity_House2/scripts.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/SlateportCity_Mart/scripts.inc" + .include "data/maps/MauvilleCity_Gym/scripts.inc" + .include "data/maps/MauvilleCity_BikeShop/scripts.inc" + .include "data/maps/MauvilleCity_House1/scripts.inc" + .include "data/maps/MauvilleCity_GameCorner/scripts.inc" + .include "data/maps/MauvilleCity_House2/scripts.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/MauvilleCity_Mart/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc" + .include "data/maps/RustboroCity_Gym/scripts.inc" + .include "data/maps/RustboroCity_PokemonSchool/scripts.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/RustboroCity_Mart/scripts.inc" + .include "data/maps/RustboroCity_Flat1_1F/scripts.inc" + .include "data/maps/RustboroCity_Flat1_2F/scripts.inc" + .include "data/maps/RustboroCity_House1/scripts.inc" + .include "data/maps/RustboroCity_CuttersHouse/scripts.inc" + .include "data/maps/RustboroCity_House2/scripts.inc" + .include "data/maps/RustboroCity_Flat2_1F/scripts.inc" + .include "data/maps/RustboroCity_Flat2_2F/scripts.inc" + .include "data/maps/RustboroCity_Flat2_3F/scripts.inc" + .include "data/maps/RustboroCity_House3/scripts.inc" + .include "data/maps/FortreeCity_House1/scripts.inc" + .include "data/maps/FortreeCity_Gym/scripts.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/FortreeCity_Mart/scripts.inc" + .include "data/maps/FortreeCity_House2/scripts.inc" + .include "data/maps/FortreeCity_House3/scripts.inc" + .include "data/maps/FortreeCity_House4/scripts.inc" + .include "data/maps/FortreeCity_House5/scripts.inc" + .include "data/maps/FortreeCity_DecorationShop/scripts.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc" + .include "data/maps/LilycoveCity_ContestLobby/scripts.inc" + .include "data/maps/LilycoveCity_ContestHall/scripts.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/LilycoveCity_UnusedMart/scripts.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc" + .include "data/maps/LilycoveCity_Harbor/scripts.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc" + .include "data/maps/LilycoveCity_House1/scripts.inc" + .include "data/maps/LilycoveCity_House2/scripts.inc" + .include "data/maps/LilycoveCity_House3/scripts.inc" + .include "data/maps/LilycoveCity_House4/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc" + .include "data/maps/MossdeepCity_Gym/scripts.inc" + .include "data/maps/MossdeepCity_House1/scripts.inc" + .include "data/maps/MossdeepCity_House2/scripts.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/MossdeepCity_Mart/scripts.inc" + .include "data/maps/MossdeepCity_House3/scripts.inc" + .include "data/maps/MossdeepCity_StevensHouse/scripts.inc" + .include "data/maps/MossdeepCity_House4/scripts.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc" + .include "data/maps/SootopolisCity_Gym_1F/scripts.inc" + .include "data/maps/SootopolisCity_Gym_B1F/scripts.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/SootopolisCity_Mart/scripts.inc" + .include "data/maps/SootopolisCity_House1/scripts.inc" + .include "data/maps/SootopolisCity_House2/scripts.inc" + .include "data/maps/SootopolisCity_House3/scripts.inc" + .include "data/maps/SootopolisCity_House4/scripts.inc" + .include "data/maps/SootopolisCity_House5/scripts.inc" + .include "data/maps/SootopolisCity_House6/scripts.inc" + .include "data/maps/SootopolisCity_House7/scripts.inc" + .include "data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc" + .include "data/maps/EverGrandeCity_Hall1/scripts.inc" + .include "data/maps/EverGrandeCity_Hall2/scripts.inc" + .include "data/maps/EverGrandeCity_Hall3/scripts.inc" + .include "data/maps/EverGrandeCity_Hall4/scripts.inc" + .include "data/maps/EverGrandeCity_Hall5/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc" + .include "data/maps/EverGrandeCity_HallOfFame/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc" + .include "data/maps/Route104_MrBrineysHouse/scripts.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc" + .include "data/maps/Route111_OldLadysRestStop/scripts.inc" + .include "data/maps/Route112_CableCarStation/scripts.inc" + .include "data/maps/MtChimney_CableCarStation/scripts.inc" + .include "data/maps/Route114_FossilManiacsHouse/scripts.inc" + .include "data/maps/Route114_FossilManiacsTunnel/scripts.inc" + .include "data/maps/Route114_LanettesHouse/scripts.inc" + .include "data/maps/Route116_TunnelersRestHouse/scripts.inc" + .include "data/maps/Route117_PokemonDayCare/scripts.inc" + .include "data/maps/Route121_SafariZoneEntrance/scripts.inc" + .include "data/maps/MeteorFalls_1F_1R/scripts.inc" + .include "data/maps/MeteorFalls_1F_2R/scripts.inc" + .include "data/maps/MeteorFalls_B1F_1R/scripts.inc" + .include "data/maps/MeteorFalls_B1F_2R/scripts.inc" + .include "data/maps/RusturfTunnel/scripts.inc" + .include "data/maps/Underwater_SootopolisCity/scripts.inc" + .include "data/maps/DesertRuins/scripts.inc" + .include "data/maps/GraniteCave_1F/scripts.inc" + .include "data/maps/GraniteCave_B1F/scripts.inc" + .include "data/maps/GraniteCave_B2F/scripts.inc" + .include "data/maps/GraniteCave_StevensRoom/scripts.inc" + .include "data/maps/PetalburgWoods/scripts.inc" + .include "data/maps/MtChimney/scripts.inc" + .include "data/maps/JaggedPass/scripts.inc" + .include "data/maps/FieryPath/scripts.inc" + .include "data/maps/MtPyre_1F/scripts.inc" + .include "data/maps/MtPyre_2F/scripts.inc" + .include "data/maps/MtPyre_3F/scripts.inc" + .include "data/maps/MtPyre_4F/scripts.inc" + .include "data/maps/MtPyre_5F/scripts.inc" + .include "data/maps/MtPyre_6F/scripts.inc" + .include "data/maps/MtPyre_Exterior/scripts.inc" + .include "data/maps/MtPyre_Summit/scripts.inc" + .include "data/maps/AquaHideout_1F/scripts.inc" + .include "data/maps/AquaHideout_B1F/scripts.inc" + .include "data/maps/AquaHideout_B2F/scripts.inc" + .include "data/maps/Underwater_SeafloorCavern/scripts.inc" + .include "data/maps/SeafloorCavern_Entrance/scripts.inc" + .include "data/maps/SeafloorCavern_Room1/scripts.inc" + .include "data/maps/SeafloorCavern_Room2/scripts.inc" + .include "data/maps/SeafloorCavern_Room3/scripts.inc" + .include "data/maps/SeafloorCavern_Room4/scripts.inc" + .include "data/maps/SeafloorCavern_Room5/scripts.inc" + .include "data/maps/SeafloorCavern_Room6/scripts.inc" + .include "data/maps/SeafloorCavern_Room7/scripts.inc" + .include "data/maps/SeafloorCavern_Room8/scripts.inc" + .include "data/maps/SeafloorCavern_Room9/scripts.inc" + .include "data/maps/CaveOfOrigin_Entrance/scripts.inc" + .include "data/maps/CaveOfOrigin_1F/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc" + .include "data/maps/CaveOfOrigin_B1F/scripts.inc" + .include "data/maps/VictoryRoad_1F/scripts.inc" + .include "data/maps/VictoryRoad_B1F/scripts.inc" + .include "data/maps/VictoryRoad_B2F/scripts.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc" + .include "data/maps/NewMauville_Entrance/scripts.inc" + .include "data/maps/NewMauville_Inside/scripts.inc" + .include "data/maps/AbandonedShip_Deck/scripts.inc" + .include "data/maps/AbandonedShip_Corridors_1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms_1F/scripts.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Underwater1/scripts.inc" + .include "data/maps/AbandonedShip_Room_B1F/scripts.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc" + .include "data/maps/AbandonedShip_Underwater2/scripts.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc" + .include "data/maps/IslandCave/scripts.inc" + .include "data/maps/AncientTomb/scripts.inc" + .include "data/maps/Underwater_Route134/scripts.inc" + .include "data/maps/Underwater_SealedChamber/scripts.inc" + .include "data/maps/SealedChamber_OuterRoom/scripts.inc" + .include "data/maps/SealedChamber_InnerRoom/scripts.inc" + .include "data/maps/ScorchedSlab/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap1/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap2/scripts.inc" + .include "data/maps/AquaHideout_UnusedRubyMap3/scripts.inc" + .include "data/maps/SkyPillar_Entrance/scripts.inc" + .include "data/maps/SkyPillar_Outside/scripts.inc" + .include "data/maps/SkyPillar_1F/scripts.inc" + .include "data/maps/SkyPillar_2F/scripts.inc" + .include "data/maps/SkyPillar_3F/scripts.inc" + .include "data/maps/SkyPillar_4F/scripts.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc" + .include "data/maps/SkyPillar_5F/scripts.inc" + .include "data/maps/SkyPillar_Top/scripts.inc" + .include "data/maps/MagmaHideout_1F/scripts.inc" + .include "data/maps/MagmaHideout_2F_1R/scripts.inc" + .include "data/maps/MagmaHideout_2F_2R/scripts.inc" + .include "data/maps/MagmaHideout_3F_1R/scripts.inc" + .include "data/maps/MagmaHideout_3F_2R/scripts.inc" + .include "data/maps/MagmaHideout_4F/scripts.inc" + .include "data/maps/MagmaHideout_3F_3R/scripts.inc" + .include "data/maps/MagmaHideout_2F_3R/scripts.inc" + .include "data/maps/MirageTower_1F/scripts.inc" + .include "data/maps/MirageTower_2F/scripts.inc" + .include "data/maps/MirageTower_3F/scripts.inc" + .include "data/maps/MirageTower_4F/scripts.inc" + .include "data/maps/DesertUnderpass/scripts.inc" + .include "data/maps/ArtisanCave_B1F/scripts.inc" + .include "data/maps/ArtisanCave_1F/scripts.inc" + .include "data/maps/Underwater_MarineCave/scripts.inc" + .include "data/maps/MarineCave_Entrance/scripts.inc" + .include "data/maps/MarineCave_End/scripts.inc" + .include "data/maps/TerraCave_Entrance/scripts.inc" + .include "data/maps/TerraCave_End/scripts.inc" + .include "data/maps/AlteringCave/scripts.inc" + .include "data/maps/MeteorFalls_StevensCave/scripts.inc" + .include "data/maps/SecretBase_BlueCave1/scripts.inc" + .include "data/maps/SecretBase_BlueCave2/scripts.inc" + .include "data/maps/SecretBase_BlueCave3/scripts.inc" + .include "data/maps/SecretBase_BlueCave4/scripts.inc" + .include "data/maps/SecretBase_BrownCave1/scripts.inc" + .include "data/maps/SecretBase_BrownCave2/scripts.inc" + .include "data/maps/SecretBase_BrownCave3/scripts.inc" + .include "data/maps/SecretBase_BrownCave4/scripts.inc" + .include "data/maps/SecretBase_RedCave1/scripts.inc" + .include "data/maps/SecretBase_RedCave2/scripts.inc" + .include "data/maps/SecretBase_RedCave3/scripts.inc" + .include "data/maps/SecretBase_RedCave4/scripts.inc" + .include "data/maps/SecretBase_Shrub1/scripts.inc" + .include "data/maps/SecretBase_Shrub2/scripts.inc" + .include "data/maps/SecretBase_Shrub3/scripts.inc" + .include "data/maps/SecretBase_Shrub4/scripts.inc" + .include "data/maps/SecretBase_Tree1/scripts.inc" + .include "data/maps/SecretBase_Tree2/scripts.inc" + .include "data/maps/SecretBase_Tree3/scripts.inc" + .include "data/maps/SecretBase_Tree4/scripts.inc" + .include "data/maps/SecretBase_YellowCave1/scripts.inc" + .include "data/maps/SecretBase_YellowCave2/scripts.inc" + .include "data/maps/SecretBase_YellowCave3/scripts.inc" + .include "data/maps/SecretBase_YellowCave4/scripts.inc" gUnknown_0823B4BB:: @ 823B4BB lockall @@ -627,154 +627,154 @@ gText_23B73E:: @ 823B73E SecretBase_RedCave1_Text_23B759: @ 823B759 .string "Want to make your SECRET BASE here?$" - .include "data/scripts/maps/SingleBattleColosseum.inc" - .include "data/scripts/maps/TradeCenter.inc" - .include "data/scripts/maps/RecordCorner.inc" - .include "data/scripts/maps/DoubleBattleColosseum.inc" - .include "data/scripts/maps/LinkContestRoom1.inc" - .include "data/scripts/maps/LinkContestRoom2.inc" - .include "data/scripts/maps/LinkContestRoom3.inc" - .include "data/scripts/maps/LinkContestRoom4.inc" - .include "data/scripts/maps/LinkContestRoom5.inc" - .include "data/scripts/maps/LinkContestRoom6.inc" - .include "data/scripts/maps/UnknownMap_25_29.inc" - .include "data/scripts/maps/UnknownMap_25_30.inc" - .include "data/scripts/maps/UnknownMap_25_31.inc" - .include "data/scripts/maps/UnknownMap_25_32.inc" - .include "data/scripts/maps/UnknownMap_25_33.inc" - .include "data/scripts/maps/UnknownMap_25_34.inc" - .include "data/scripts/maps/InsideOfTruck.inc" - .include "data/scripts/maps/SSTidalCorridor.inc" - .include "data/scripts/maps/SSTidalLowerDeck.inc" - .include "data/scripts/maps/SSTidalRooms.inc" - .include "data/scripts/maps/BattlePyramidSquare01.inc" - .include "data/scripts/maps/BattlePyramidSquare02.inc" - .include "data/scripts/maps/BattlePyramidSquare03.inc" - .include "data/scripts/maps/BattlePyramidSquare04.inc" - .include "data/scripts/maps/BattlePyramidSquare05.inc" - .include "data/scripts/maps/BattlePyramidSquare06.inc" - .include "data/scripts/maps/BattlePyramidSquare07.inc" - .include "data/scripts/maps/BattlePyramidSquare08.inc" - .include "data/scripts/maps/BattlePyramidSquare09.inc" - .include "data/scripts/maps/BattlePyramidSquare10.inc" - .include "data/scripts/maps/BattlePyramidSquare11.inc" - .include "data/scripts/maps/BattlePyramidSquare12.inc" - .include "data/scripts/maps/BattlePyramidSquare13.inc" - .include "data/scripts/maps/BattlePyramidSquare14.inc" - .include "data/scripts/maps/BattlePyramidSquare15.inc" - .include "data/scripts/maps/BattlePyramidSquare16.inc" - .include "data/scripts/maps/UnionRoom.inc" - .include "data/scripts/maps/SafariZone_Northwest.inc" - .include "data/scripts/maps/SafariZone_North.inc" - .include "data/scripts/maps/SafariZone_Southwest.inc" - .include "data/scripts/maps/SafariZone_South.inc" - .include "data/scripts/maps/BattleFrontier_OutsideWest.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerElevator.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/scripts/maps/SouthernIsland_Exterior.inc" - .include "data/scripts/maps/SouthernIsland_Interior.inc" - .include "data/scripts/maps/SafariZone_RestHouse.inc" - .include "data/scripts/maps/SafariZone_Northeast.inc" - .include "data/scripts/maps/SafariZone_Southeast.inc" - .include "data/scripts/maps/BattleFrontier_OutsideEast.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/scripts/maps/BattleFrontier_BattlePyramidTop.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeLobby.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/scripts/maps/BattleFrontier_RankingHall.inc" - .include "data/scripts/maps/BattleFrontier_Lounge1.inc" - .include "data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/scripts/maps/BattleFrontier_Lounge2.inc" - .include "data/scripts/maps/BattleFrontier_Lounge3.inc" - .include "data/scripts/maps/BattleFrontier_Lounge4.inc" - .include "data/scripts/maps/BattleFrontier_ScottsHouse.inc" - .include "data/scripts/maps/BattleFrontier_Lounge5.inc" - .include "data/scripts/maps/BattleFrontier_Lounge6.inc" - .include "data/scripts/maps/BattleFrontier_Lounge7.inc" - .include "data/scripts/maps/BattleFrontier_ReceptionGate.inc" - .include "data/scripts/maps/BattleFrontier_Lounge8.inc" - .include "data/scripts/maps/BattleFrontier_Lounge9.inc" - .include "data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc" - .include "data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc" - .include "data/scripts/maps/BattleFrontier_Mart.inc" - .include "data/scripts/maps/FarawayIsland_Entrance.inc" - .include "data/scripts/maps/FarawayIsland_Interior.inc" - .include "data/scripts/maps/BirthIsland_Exterior.inc" - .include "data/scripts/maps/BirthIsland_Harbor.inc" - .include "data/scripts/maps/TrainerHill_Entrance.inc" - .include "data/scripts/maps/TrainerHill_1F.inc" - .include "data/scripts/maps/TrainerHill_2F.inc" - .include "data/scripts/maps/TrainerHill_3F.inc" - .include "data/scripts/maps/TrainerHill_4F.inc" - .include "data/scripts/maps/TrainerHill_Roof.inc" - .include "data/scripts/maps/NavelRock_Exterior.inc" - .include "data/scripts/maps/NavelRock_Harbor.inc" - .include "data/scripts/maps/NavelRock_Entrance.inc" - .include "data/scripts/maps/NavelRock_B1F.inc" - .include "data/scripts/maps/NavelRock_Fork.inc" - .include "data/scripts/maps/NavelRock_Up1.inc" - .include "data/scripts/maps/NavelRock_Up2.inc" - .include "data/scripts/maps/NavelRock_Up3.inc" - .include "data/scripts/maps/NavelRock_Up4.inc" - .include "data/scripts/maps/NavelRock_Top.inc" - .include "data/scripts/maps/NavelRock_Down01.inc" - .include "data/scripts/maps/NavelRock_Down02.inc" - .include "data/scripts/maps/NavelRock_Down03.inc" - .include "data/scripts/maps/NavelRock_Down04.inc" - .include "data/scripts/maps/NavelRock_Down05.inc" - .include "data/scripts/maps/NavelRock_Down06.inc" - .include "data/scripts/maps/NavelRock_Down07.inc" - .include "data/scripts/maps/NavelRock_Down08.inc" - .include "data/scripts/maps/NavelRock_Down09.inc" - .include "data/scripts/maps/NavelRock_Down10.inc" - .include "data/scripts/maps/NavelRock_Down11.inc" - .include "data/scripts/maps/NavelRock_Bottom.inc" - .include "data/scripts/maps/TrainerHill_Elevator.inc" - .include "data/scripts/maps/Route104_Prototype.inc" - .include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/scripts/maps/Route109_SeashoreHouse.inc" - .include "data/scripts/maps/Route110_TrickHouseEntrance.inc" - .include "data/scripts/maps/Route110_TrickHouseEnd.inc" - .include "data/scripts/maps/Route110_TrickHouseCorridor.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle1.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle2.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle3.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle4.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle5.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle6.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle7.inc" - .include "data/scripts/maps/Route110_TrickHousePuzzle8.inc" - .include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/scripts/maps/Route113_GlassWorkshop.inc" - .include "data/scripts/maps/Route123_BerryMastersHouse.inc" - .include "data/scripts/maps/Route119_WeatherInstitute_1F.inc" - .include "data/scripts/maps/Route119_WeatherInstitute_2F.inc" - .include "data/scripts/maps/Route119_House.inc" - .include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/SingleBattleColosseum/scripts.inc" + .include "data/maps/TradeCenter/scripts.inc" + .include "data/maps/RecordCorner/scripts.inc" + .include "data/maps/DoubleBattleColosseum/scripts.inc" + .include "data/maps/LinkContestRoom1/scripts.inc" + .include "data/maps/LinkContestRoom2/scripts.inc" + .include "data/maps/LinkContestRoom3/scripts.inc" + .include "data/maps/LinkContestRoom4/scripts.inc" + .include "data/maps/LinkContestRoom5/scripts.inc" + .include "data/maps/LinkContestRoom6/scripts.inc" + .include "data/maps/UnknownMap_25_29/scripts.inc" + .include "data/maps/UnknownMap_25_30/scripts.inc" + .include "data/maps/UnknownMap_25_31/scripts.inc" + .include "data/maps/UnknownMap_25_32/scripts.inc" + .include "data/maps/UnknownMap_25_33/scripts.inc" + .include "data/maps/UnknownMap_25_34/scripts.inc" + .include "data/maps/InsideOfTruck/scripts.inc" + .include "data/maps/SSTidalCorridor/scripts.inc" + .include "data/maps/SSTidalLowerDeck/scripts.inc" + .include "data/maps/SSTidalRooms/scripts.inc" + .include "data/maps/BattlePyramidSquare01/scripts.inc" + .include "data/maps/BattlePyramidSquare02/scripts.inc" + .include "data/maps/BattlePyramidSquare03/scripts.inc" + .include "data/maps/BattlePyramidSquare04/scripts.inc" + .include "data/maps/BattlePyramidSquare05/scripts.inc" + .include "data/maps/BattlePyramidSquare06/scripts.inc" + .include "data/maps/BattlePyramidSquare07/scripts.inc" + .include "data/maps/BattlePyramidSquare08/scripts.inc" + .include "data/maps/BattlePyramidSquare09/scripts.inc" + .include "data/maps/BattlePyramidSquare10/scripts.inc" + .include "data/maps/BattlePyramidSquare11/scripts.inc" + .include "data/maps/BattlePyramidSquare12/scripts.inc" + .include "data/maps/BattlePyramidSquare13/scripts.inc" + .include "data/maps/BattlePyramidSquare14/scripts.inc" + .include "data/maps/BattlePyramidSquare15/scripts.inc" + .include "data/maps/BattlePyramidSquare16/scripts.inc" + .include "data/maps/UnionRoom/scripts.inc" + .include "data/maps/SafariZone_Northwest/scripts.inc" + .include "data/maps/SafariZone_North/scripts.inc" + .include "data/maps/SafariZone_Southwest/scripts.inc" + .include "data/maps/SafariZone_South/scripts.inc" + .include "data/maps/BattleFrontier_OutsideWest/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerElevator/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc" + .include "data/maps/SouthernIsland_Exterior/scripts.inc" + .include "data/maps/SouthernIsland_Interior/scripts.inc" + .include "data/maps/SafariZone_RestHouse/scripts.inc" + .include "data/maps/SafariZone_Northeast/scripts.inc" + .include "data/maps/SafariZone_Southeast/scripts.inc" + .include "data/maps/BattleFrontier_OutsideEast/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc" + .include "data/maps/BattleFrontier_BattlePyramidTop/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeLobby/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc" + .include "data/maps/BattleFrontier_RankingHall/scripts.inc" + .include "data/maps/BattleFrontier_Lounge1/scripts.inc" + .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc" + .include "data/maps/BattleFrontier_Lounge2/scripts.inc" + .include "data/maps/BattleFrontier_Lounge3/scripts.inc" + .include "data/maps/BattleFrontier_Lounge4/scripts.inc" + .include "data/maps/BattleFrontier_ScottsHouse/scripts.inc" + .include "data/maps/BattleFrontier_Lounge5/scripts.inc" + .include "data/maps/BattleFrontier_Lounge6/scripts.inc" + .include "data/maps/BattleFrontier_Lounge7/scripts.inc" + .include "data/maps/BattleFrontier_ReceptionGate/scripts.inc" + .include "data/maps/BattleFrontier_Lounge8/scripts.inc" + .include "data/maps/BattleFrontier_Lounge9/scripts.inc" + .include "data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc" + .include "data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc" + .include "data/maps/BattleFrontier_Mart/scripts.inc" + .include "data/maps/FarawayIsland_Entrance/scripts.inc" + .include "data/maps/FarawayIsland_Interior/scripts.inc" + .include "data/maps/BirthIsland_Exterior/scripts.inc" + .include "data/maps/BirthIsland_Harbor/scripts.inc" + .include "data/maps/TrainerHill_Entrance/scripts.inc" + .include "data/maps/TrainerHill_1F/scripts.inc" + .include "data/maps/TrainerHill_2F/scripts.inc" + .include "data/maps/TrainerHill_3F/scripts.inc" + .include "data/maps/TrainerHill_4F/scripts.inc" + .include "data/maps/TrainerHill_Roof/scripts.inc" + .include "data/maps/NavelRock_Exterior/scripts.inc" + .include "data/maps/NavelRock_Harbor/scripts.inc" + .include "data/maps/NavelRock_Entrance/scripts.inc" + .include "data/maps/NavelRock_B1F/scripts.inc" + .include "data/maps/NavelRock_Fork/scripts.inc" + .include "data/maps/NavelRock_Up1/scripts.inc" + .include "data/maps/NavelRock_Up2/scripts.inc" + .include "data/maps/NavelRock_Up3/scripts.inc" + .include "data/maps/NavelRock_Up4/scripts.inc" + .include "data/maps/NavelRock_Top/scripts.inc" + .include "data/maps/NavelRock_Down01/scripts.inc" + .include "data/maps/NavelRock_Down02/scripts.inc" + .include "data/maps/NavelRock_Down03/scripts.inc" + .include "data/maps/NavelRock_Down04/scripts.inc" + .include "data/maps/NavelRock_Down05/scripts.inc" + .include "data/maps/NavelRock_Down06/scripts.inc" + .include "data/maps/NavelRock_Down07/scripts.inc" + .include "data/maps/NavelRock_Down08/scripts.inc" + .include "data/maps/NavelRock_Down09/scripts.inc" + .include "data/maps/NavelRock_Down10/scripts.inc" + .include "data/maps/NavelRock_Down11/scripts.inc" + .include "data/maps/NavelRock_Bottom/scripts.inc" + .include "data/maps/TrainerHill_Elevator/scripts.inc" + .include "data/maps/Route104_Prototype/scripts.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc" + .include "data/maps/Route109_SeashoreHouse/scripts.inc" + .include "data/maps/Route110_TrickHouseEntrance/scripts.inc" + .include "data/maps/Route110_TrickHouseEnd/scripts.inc" + .include "data/maps/Route110_TrickHouseCorridor/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle1/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle2/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle3/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle4/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle5/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle6/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle7/scripts.inc" + .include "data/maps/Route110_TrickHousePuzzle8/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc" + .include "data/maps/Route113_GlassWorkshop/scripts.inc" + .include "data/maps/Route123_BerryMastersHouse/scripts.inc" + .include "data/maps/Route119_WeatherInstitute_1F/scripts.inc" + .include "data/maps/Route119_WeatherInstitute_2F/scripts.inc" + .include "data/maps/Route119_House/scripts.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc" Std_2: @ 8271315 lock diff --git a/data/map_events.s b/data/map_events.s index 31b4b00d23..aca9978e48 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -8,522 +8,522 @@ .section .rodata - .include "data/maps/events/PetalburgCity.inc" - .include "data/maps/events/SlateportCity.inc" - .include "data/maps/events/MauvilleCity.inc" - .include "data/maps/events/RustboroCity.inc" - .include "data/maps/events/FortreeCity.inc" - .include "data/maps/events/LilycoveCity.inc" - .include "data/maps/events/MossdeepCity.inc" - .include "data/maps/events/SootopolisCity.inc" - .include "data/maps/events/EverGrandeCity.inc" - .include "data/maps/events/LittlerootTown.inc" - .include "data/maps/events/OldaleTown.inc" - .include "data/maps/events/DewfordTown.inc" - .include "data/maps/events/LavaridgeTown.inc" - .include "data/maps/events/FallarborTown.inc" - .include "data/maps/events/VerdanturfTown.inc" - .include "data/maps/events/PacifidlogTown.inc" - .include "data/maps/events/Route101.inc" - .include "data/maps/events/Route102.inc" - .include "data/maps/events/Route103.inc" - .include "data/maps/events/Route104.inc" - .include "data/maps/events/Route105.inc" - .include "data/maps/events/Route106.inc" - .include "data/maps/events/Route107.inc" - .include "data/maps/events/Route108.inc" - .include "data/maps/events/Route109.inc" - .include "data/maps/events/Route110.inc" - .include "data/maps/events/Route111.inc" - .include "data/maps/events/Route112.inc" - .include "data/maps/events/Route113.inc" - .include "data/maps/events/Route114.inc" - .include "data/maps/events/Route115.inc" - .include "data/maps/events/Route116.inc" - .include "data/maps/events/Route117.inc" - .include "data/maps/events/Route118.inc" - .include "data/maps/events/Route119.inc" - .include "data/maps/events/Route120.inc" - .include "data/maps/events/Route121.inc" - .include "data/maps/events/Route122.inc" - .include "data/maps/events/Route123.inc" - .include "data/maps/events/Route124.inc" - .include "data/maps/events/Route125.inc" - .include "data/maps/events/Route126.inc" - .include "data/maps/events/Route127.inc" - .include "data/maps/events/Route128.inc" - .include "data/maps/events/Route129.inc" - .include "data/maps/events/Route130.inc" - .include "data/maps/events/Route131.inc" - .include "data/maps/events/Route132.inc" - .include "data/maps/events/Route133.inc" - .include "data/maps/events/Route134.inc" - .include "data/maps/events/Underwater1.inc" - .include "data/maps/events/Underwater2.inc" - .include "data/maps/events/Underwater3.inc" - .include "data/maps/events/Underwater4.inc" - .include "data/maps/events/Underwater5.inc" - .include "data/maps/events/Underwater6.inc" - .include "data/maps/events/Underwater7.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_1F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_2F.inc" - .include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/maps/events/OldaleTown_House1.inc" - .include "data/maps/events/OldaleTown_House2.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_1F.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_2F.inc" - .include "data/maps/events/OldaleTown_Mart.inc" - .include "data/maps/events/DewfordTown_House1.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_1F.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_2F.inc" - .include "data/maps/events/DewfordTown_Gym.inc" - .include "data/maps/events/DewfordTown_Hall.inc" - .include "data/maps/events/DewfordTown_House2.inc" - .include "data/maps/events/LavaridgeTown_HerbShop.inc" - .include "data/maps/events/LavaridgeTown_Gym_1F.inc" - .include "data/maps/events/LavaridgeTown_Gym_B1F.inc" - .include "data/maps/events/LavaridgeTown_House.inc" - .include "data/maps/events/LavaridgeTown_Mart.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_Mart.inc" - .include "data/maps/events/FallarborTown_BattleTentLobby.inc" - .include "data/maps/events/FallarborTown_BattleTentCorridor.inc" - .include "data/maps/events/FallarborTown_BattleTentBattleRoom.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_1F.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_House1.inc" - .include "data/maps/events/FallarborTown_House2.inc" - .include "data/maps/events/VerdanturfTown_BattleTentLobby.inc" - .include "data/maps/events/VerdanturfTown_BattleTentCorridor.inc" - .include "data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc" - .include "data/maps/events/VerdanturfTown_Mart.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/maps/events/VerdanturfTown_WandasHouse.inc" - .include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/maps/events/VerdanturfTown_House.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/maps/events/PacifidlogTown_House1.inc" - .include "data/maps/events/PacifidlogTown_House2.inc" - .include "data/maps/events/PacifidlogTown_House3.inc" - .include "data/maps/events/PacifidlogTown_House4.inc" - .include "data/maps/events/PacifidlogTown_House5.inc" - .include "data/maps/events/PetalburgCity_WallysHouse.inc" - .include "data/maps/events/PetalburgCity_Gym.inc" - .include "data/maps/events/PetalburgCity_House1.inc" - .include "data/maps/events/PetalburgCity_House2.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc" - .include "data/maps/events/PetalburgCity_Mart.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_1F.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_2F.inc" - .include "data/maps/events/SlateportCity_BattleTentLobby.inc" - .include "data/maps/events/SlateportCity_BattleTentCorridor.inc" - .include "data/maps/events/SlateportCity_BattleTentBattleRoom.inc" - .include "data/maps/events/SlateportCity_House1.inc" - .include "data/maps/events/SlateportCity_PokemonFanClub.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc" - .include "data/maps/events/SlateportCity_Harbor.inc" - .include "data/maps/events/SlateportCity_House2.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_1F.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_2F.inc" - .include "data/maps/events/SlateportCity_Mart.inc" - .include "data/maps/events/MauvilleCity_Gym.inc" - .include "data/maps/events/MauvilleCity_BikeShop.inc" - .include "data/maps/events/MauvilleCity_House1.inc" - .include "data/maps/events/MauvilleCity_GameCorner.inc" - .include "data/maps/events/MauvilleCity_House2.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc" - .include "data/maps/events/MauvilleCity_Mart.inc" - .include "data/maps/events/RustboroCity_DevonCorp_1F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_2F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_3F.inc" - .include "data/maps/events/RustboroCity_Gym.inc" - .include "data/maps/events/RustboroCity_PokemonSchool.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_1F.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_2F.inc" - .include "data/maps/events/RustboroCity_Mart.inc" - .include "data/maps/events/RustboroCity_Flat1_1F.inc" - .include "data/maps/events/RustboroCity_Flat1_2F.inc" - .include "data/maps/events/RustboroCity_House1.inc" - .include "data/maps/events/RustboroCity_CuttersHouse.inc" - .include "data/maps/events/RustboroCity_House2.inc" - .include "data/maps/events/RustboroCity_Flat2_1F.inc" - .include "data/maps/events/RustboroCity_Flat2_2F.inc" - .include "data/maps/events/RustboroCity_Flat2_3F.inc" - .include "data/maps/events/RustboroCity_House3.inc" - .include "data/maps/events/FortreeCity_House1.inc" - .include "data/maps/events/FortreeCity_Gym.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_1F.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_2F.inc" - .include "data/maps/events/FortreeCity_Mart.inc" - .include "data/maps/events/FortreeCity_House2.inc" - .include "data/maps/events/FortreeCity_House3.inc" - .include "data/maps/events/FortreeCity_House4.inc" - .include "data/maps/events/FortreeCity_House5.inc" - .include "data/maps/events/FortreeCity_DecorationShop.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/maps/events/LilycoveCity_ContestLobby.inc" - .include "data/maps/events/LilycoveCity_ContestHall.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc" - .include "data/maps/events/LilycoveCity_UnusedMart.inc" - .include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/maps/events/LilycoveCity_Harbor.inc" - .include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc" - .include "data/maps/events/LilycoveCity_House1.inc" - .include "data/maps/events/LilycoveCity_House2.inc" - .include "data/maps/events/LilycoveCity_House3.inc" - .include "data/maps/events/LilycoveCity_House4.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/maps/events/MossdeepCity_Gym.inc" - .include "data/maps/events/MossdeepCity_House1.inc" - .include "data/maps/events/MossdeepCity_House2.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc" - .include "data/maps/events/MossdeepCity_Mart.inc" - .include "data/maps/events/MossdeepCity_House3.inc" - .include "data/maps/events/MossdeepCity_StevensHouse.inc" - .include "data/maps/events/MossdeepCity_House4.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_1F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_B1F.inc" - .include "data/maps/events/SootopolisCity_Gym_1F.inc" - .include "data/maps/events/SootopolisCity_Gym_B1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc" - .include "data/maps/events/SootopolisCity_Mart.inc" - .include "data/maps/events/SootopolisCity_House1.inc" - .include "data/maps/events/SootopolisCity_House2.inc" - .include "data/maps/events/SootopolisCity_House3.inc" - .include "data/maps/events/SootopolisCity_House4.inc" - .include "data/maps/events/SootopolisCity_House5.inc" - .include "data/maps/events/SootopolisCity_House6.inc" - .include "data/maps/events/SootopolisCity_House7.inc" - .include "data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc" - .include "data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc" - .include "data/maps/events/EverGrandeCity_SidneysRoom.inc" - .include "data/maps/events/EverGrandeCity_PhoebesRoom.inc" - .include "data/maps/events/EverGrandeCity_GlaciasRoom.inc" - .include "data/maps/events/EverGrandeCity_DrakesRoom.inc" - .include "data/maps/events/EverGrandeCity_ChampionsRoom.inc" - .include "data/maps/events/EverGrandeCity_Hall1.inc" - .include "data/maps/events/EverGrandeCity_Hall2.inc" - .include "data/maps/events/EverGrandeCity_Hall3.inc" - .include "data/maps/events/EverGrandeCity_Hall4.inc" - .include "data/maps/events/EverGrandeCity_Hall5.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_1F.inc" - .include "data/maps/events/EverGrandeCity_HallOfFame.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague_2F.inc" - .include "data/maps/events/Route104_MrBrineysHouse.inc" - .include "data/maps/events/Route104_PrettyPetalFlowerShop.inc" - .include "data/maps/events/Route111_WinstrateFamilysHouse.inc" - .include "data/maps/events/Route111_OldLadysRestStop.inc" - .include "data/maps/events/Route112_CableCarStation.inc" - .include "data/maps/events/MtChimney_CableCarStation.inc" - .include "data/maps/events/Route114_FossilManiacsHouse.inc" - .include "data/maps/events/Route114_FossilManiacsTunnel.inc" - .include "data/maps/events/Route114_LanettesHouse.inc" - .include "data/maps/events/Route116_TunnelersRestHouse.inc" - .include "data/maps/events/Route117_PokemonDayCare.inc" - .include "data/maps/events/Route121_SafariZoneEntrance.inc" - .include "data/maps/events/MeteorFalls_1F_1R.inc" - .include "data/maps/events/MeteorFalls_1F_2R.inc" - .include "data/maps/events/MeteorFalls_B1F_1R.inc" - .include "data/maps/events/MeteorFalls_B1F_2R.inc" - .include "data/maps/events/RusturfTunnel.inc" - .include "data/maps/events/Underwater_SootopolisCity.inc" - .include "data/maps/events/DesertRuins.inc" - .include "data/maps/events/GraniteCave_1F.inc" - .include "data/maps/events/GraniteCave_B1F.inc" - .include "data/maps/events/GraniteCave_B2F.inc" - .include "data/maps/events/GraniteCave_StevensRoom.inc" - .include "data/maps/events/PetalburgWoods.inc" - .include "data/maps/events/MtChimney.inc" - .include "data/maps/events/JaggedPass.inc" - .include "data/maps/events/FieryPath.inc" - .include "data/maps/events/MtPyre_1F.inc" - .include "data/maps/events/MtPyre_2F.inc" - .include "data/maps/events/MtPyre_3F.inc" - .include "data/maps/events/MtPyre_4F.inc" - .include "data/maps/events/MtPyre_5F.inc" - .include "data/maps/events/MtPyre_6F.inc" - .include "data/maps/events/MtPyre_Exterior.inc" - .include "data/maps/events/MtPyre_Summit.inc" - .include "data/maps/events/AquaHideout_1F.inc" - .include "data/maps/events/AquaHideout_B1F.inc" - .include "data/maps/events/AquaHideout_B2F.inc" - .include "data/maps/events/Underwater_SeafloorCavern.inc" - .include "data/maps/events/SeafloorCavern_Entrance.inc" - .include "data/maps/events/SeafloorCavern_Room1.inc" - .include "data/maps/events/SeafloorCavern_Room2.inc" - .include "data/maps/events/SeafloorCavern_Room3.inc" - .include "data/maps/events/SeafloorCavern_Room4.inc" - .include "data/maps/events/SeafloorCavern_Room5.inc" - .include "data/maps/events/SeafloorCavern_Room6.inc" - .include "data/maps/events/SeafloorCavern_Room7.inc" - .include "data/maps/events/SeafloorCavern_Room8.inc" - .include "data/maps/events/SeafloorCavern_Room9.inc" - .include "data/maps/events/CaveOfOrigin_Entrance.inc" - .include "data/maps/events/CaveOfOrigin_1F.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc" - .include "data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc" - .include "data/maps/events/CaveOfOrigin_B1F.inc" - .include "data/maps/events/VictoryRoad_1F.inc" - .include "data/maps/events/VictoryRoad_B1F.inc" - .include "data/maps/events/VictoryRoad_B2F.inc" - .include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_LowTideInnerRoom.inc" - .include "data/maps/events/ShoalCave_LowTideStairsRoom.inc" - .include "data/maps/events/ShoalCave_LowTideLowerRoom.inc" - .include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_HighTideInnerRoom.inc" - .include "data/maps/events/NewMauville_Entrance.inc" - .include "data/maps/events/NewMauville_Inside.inc" - .include "data/maps/events/AbandonedShip_Deck.inc" - .include "data/maps/events/AbandonedShip_Corridors_1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_1F.inc" - .include "data/maps/events/AbandonedShip_Corridors_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_B1F.inc" - .include "data/maps/events/AbandonedShip_Underwater1.inc" - .include "data/maps/events/AbandonedShip_Room_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_1F.inc" - .include "data/maps/events/AbandonedShip_CaptainsOffice.inc" - .include "data/maps/events/AbandonedShip_Underwater2.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc" - .include "data/maps/events/IslandCave.inc" - .include "data/maps/events/AncientTomb.inc" - .include "data/maps/events/Underwater_Route134.inc" - .include "data/maps/events/Underwater_SealedChamber.inc" - .include "data/maps/events/SealedChamber_OuterRoom.inc" - .include "data/maps/events/SealedChamber_InnerRoom.inc" - .include "data/maps/events/ScorchedSlab.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap1.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap2.inc" - .include "data/maps/events/AquaHideout_UnusedRubyMap3.inc" - .include "data/maps/events/SkyPillar_Entrance.inc" - .include "data/maps/events/SkyPillar_Outside.inc" - .include "data/maps/events/SkyPillar_1F.inc" - .include "data/maps/events/SkyPillar_2F.inc" - .include "data/maps/events/SkyPillar_3F.inc" - .include "data/maps/events/SkyPillar_4F.inc" - .include "data/maps/events/ShoalCave_LowTideIceRoom.inc" - .include "data/maps/events/SkyPillar_5F.inc" - .include "data/maps/events/SkyPillar_Top.inc" - .include "data/maps/events/MagmaHideout_1F.inc" - .include "data/maps/events/MagmaHideout_2F_1R.inc" - .include "data/maps/events/MagmaHideout_2F_2R.inc" - .include "data/maps/events/MagmaHideout_3F_1R.inc" - .include "data/maps/events/MagmaHideout_3F_2R.inc" - .include "data/maps/events/MagmaHideout_4F.inc" - .include "data/maps/events/MagmaHideout_3F_3R.inc" - .include "data/maps/events/MagmaHideout_2F_3R.inc" - .include "data/maps/events/MirageTower_1F.inc" - .include "data/maps/events/MirageTower_2F.inc" - .include "data/maps/events/MirageTower_3F.inc" - .include "data/maps/events/MirageTower_4F.inc" - .include "data/maps/events/DesertUnderpass.inc" - .include "data/maps/events/ArtisanCave_B1F.inc" - .include "data/maps/events/ArtisanCave_1F.inc" - .include "data/maps/events/Underwater_MarineCave.inc" - .include "data/maps/events/MarineCave_Entrance.inc" - .include "data/maps/events/MarineCave_End.inc" - .include "data/maps/events/TerraCave_Entrance.inc" - .include "data/maps/events/TerraCave_End.inc" - .include "data/maps/events/AlteringCave.inc" - .include "data/maps/events/MeteorFalls_StevensCave.inc" - .include "data/maps/events/SecretBase_RedCave1.inc" - .include "data/maps/events/SecretBase_BrownCave1.inc" - .include "data/maps/events/SecretBase_BlueCave1.inc" - .include "data/maps/events/SecretBase_YellowCave1.inc" - .include "data/maps/events/SecretBase_Tree1.inc" - .include "data/maps/events/SecretBase_Shrub1.inc" - .include "data/maps/events/SecretBase_RedCave2.inc" - .include "data/maps/events/SecretBase_BrownCave2.inc" - .include "data/maps/events/SecretBase_BlueCave2.inc" - .include "data/maps/events/SecretBase_YellowCave2.inc" - .include "data/maps/events/SecretBase_Tree2.inc" - .include "data/maps/events/SecretBase_Shrub2.inc" - .include "data/maps/events/SecretBase_RedCave3.inc" - .include "data/maps/events/SecretBase_BrownCave3.inc" - .include "data/maps/events/SecretBase_BlueCave3.inc" - .include "data/maps/events/SecretBase_YellowCave3.inc" - .include "data/maps/events/SecretBase_Tree3.inc" - .include "data/maps/events/SecretBase_Shrub3.inc" - .include "data/maps/events/SecretBase_RedCave4.inc" - .include "data/maps/events/SecretBase_BrownCave4.inc" - .include "data/maps/events/SecretBase_BlueCave4.inc" - .include "data/maps/events/SecretBase_YellowCave4.inc" - .include "data/maps/events/SecretBase_Tree4.inc" - .include "data/maps/events/SecretBase_Shrub4.inc" - .include "data/maps/events/SingleBattleColosseum.inc" - .include "data/maps/events/TradeCenter.inc" - .include "data/maps/events/RecordCorner.inc" - .include "data/maps/events/DoubleBattleColosseum.inc" - .include "data/maps/events/LinkContestRoom1.inc" - .include "data/maps/events/LinkContestRoom2.inc" - .include "data/maps/events/LinkContestRoom3.inc" - .include "data/maps/events/LinkContestRoom4.inc" - .include "data/maps/events/LinkContestRoom5.inc" - .include "data/maps/events/LinkContestRoom6.inc" - .include "data/maps/events/UnknownMap_25_29.inc" - .include "data/maps/events/UnknownMap_25_30.inc" - .include "data/maps/events/UnknownMap_25_31.inc" - .include "data/maps/events/UnknownMap_25_32.inc" - .include "data/maps/events/UnknownMap_25_33.inc" - .include "data/maps/events/UnknownMap_25_34.inc" - .include "data/maps/events/InsideOfTruck.inc" - .include "data/maps/events/SSTidalCorridor.inc" - .include "data/maps/events/SSTidalLowerDeck.inc" - .include "data/maps/events/SSTidalRooms.inc" - .include "data/maps/events/BattlePyramidSquare01.inc" - .include "data/maps/events/BattlePyramidSquare02.inc" - .include "data/maps/events/BattlePyramidSquare03.inc" - .include "data/maps/events/BattlePyramidSquare04.inc" - .include "data/maps/events/BattlePyramidSquare05.inc" - .include "data/maps/events/BattlePyramidSquare06.inc" - .include "data/maps/events/BattlePyramidSquare07.inc" - .include "data/maps/events/BattlePyramidSquare08.inc" - .include "data/maps/events/BattlePyramidSquare09.inc" - .include "data/maps/events/BattlePyramidSquare10.inc" - .include "data/maps/events/BattlePyramidSquare11.inc" - .include "data/maps/events/BattlePyramidSquare12.inc" - .include "data/maps/events/BattlePyramidSquare13.inc" - .include "data/maps/events/BattlePyramidSquare14.inc" - .include "data/maps/events/BattlePyramidSquare15.inc" - .include "data/maps/events/BattlePyramidSquare16.inc" - .include "data/maps/events/UnionRoom.inc" - .include "data/maps/events/SafariZone_Northwest.inc" - .include "data/maps/events/SafariZone_North.inc" - .include "data/maps/events/SafariZone_Southwest.inc" - .include "data/maps/events/SafariZone_South.inc" - .include "data/maps/events/BattleFrontier_OutsideWest.inc" - .include "data/maps/events/BattleFrontier_BattleTowerLobby.inc" - .include "data/maps/events/BattleFrontier_BattleTowerElevator.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc" - .include "data/maps/events/SouthernIsland_Exterior.inc" - .include "data/maps/events/SouthernIsland_Interior.inc" - .include "data/maps/events/SafariZone_RestHouse.inc" - .include "data/maps/events/SafariZone_Northeast.inc" - .include "data/maps/events/SafariZone_Southeast.inc" - .include "data/maps/events/BattleFrontier_OutsideEast.inc" - .include "data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleTowerCorridor2.inc" - .include "data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc" - .include "data/maps/events/BattleFrontier_BattleDomeLobby.inc" - .include "data/maps/events/BattleFrontier_BattleDomeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc" - .include "data/maps/events/BattleFrontier_BattlePyramidTop.inc" - .include "data/maps/events/BattleFrontier_BattleArenaLobby.inc" - .include "data/maps/events/BattleFrontier_BattleArenaCorridor.inc" - .include "data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryLobby.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeLobby.inc" - .include "data/maps/events/BattleFrontier_BattlePikeCorridor.inc" - .include "data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc" - .include "data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc" - .include "data/maps/events/BattleFrontier_RankingHall.inc" - .include "data/maps/events/BattleFrontier_Lounge1.inc" - .include "data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc" - .include "data/maps/events/BattleFrontier_Lounge2.inc" - .include "data/maps/events/BattleFrontier_Lounge3.inc" - .include "data/maps/events/BattleFrontier_Lounge4.inc" - .include "data/maps/events/BattleFrontier_ScottsHouse.inc" - .include "data/maps/events/BattleFrontier_Lounge5.inc" - .include "data/maps/events/BattleFrontier_Lounge6.inc" - .include "data/maps/events/BattleFrontier_Lounge7.inc" - .include "data/maps/events/BattleFrontier_ReceptionGate.inc" - .include "data/maps/events/BattleFrontier_Lounge8.inc" - .include "data/maps/events/BattleFrontier_Lounge9.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_1F.inc" - .include "data/maps/events/BattleFrontier_PokemonCenter_2F.inc" - .include "data/maps/events/BattleFrontier_Mart.inc" - .include "data/maps/events/FarawayIsland_Entrance.inc" - .include "data/maps/events/FarawayIsland_Interior.inc" - .include "data/maps/events/BirthIsland_Exterior.inc" - .include "data/maps/events/BirthIsland_Harbor.inc" - .include "data/maps/events/TrainerHill_Entrance.inc" - .include "data/maps/events/TrainerHill_1F.inc" - .include "data/maps/events/TrainerHill_2F.inc" - .include "data/maps/events/TrainerHill_3F.inc" - .include "data/maps/events/TrainerHill_4F.inc" - .include "data/maps/events/TrainerHill_Roof.inc" - .include "data/maps/events/NavelRock_Exterior.inc" - .include "data/maps/events/NavelRock_Harbor.inc" - .include "data/maps/events/NavelRock_Entrance.inc" - .include "data/maps/events/NavelRock_B1F.inc" - .include "data/maps/events/NavelRock_Fork.inc" - .include "data/maps/events/NavelRock_Up1.inc" - .include "data/maps/events/NavelRock_Up2.inc" - .include "data/maps/events/NavelRock_Up3.inc" - .include "data/maps/events/NavelRock_Up4.inc" - .include "data/maps/events/NavelRock_Top.inc" - .include "data/maps/events/NavelRock_Down01.inc" - .include "data/maps/events/NavelRock_Down02.inc" - .include "data/maps/events/NavelRock_Down03.inc" - .include "data/maps/events/NavelRock_Down04.inc" - .include "data/maps/events/NavelRock_Down05.inc" - .include "data/maps/events/NavelRock_Down06.inc" - .include "data/maps/events/NavelRock_Down07.inc" - .include "data/maps/events/NavelRock_Down08.inc" - .include "data/maps/events/NavelRock_Down09.inc" - .include "data/maps/events/NavelRock_Down10.inc" - .include "data/maps/events/NavelRock_Down11.inc" - .include "data/maps/events/NavelRock_Bottom.inc" - .include "data/maps/events/TrainerHill_Elevator.inc" - .include "data/maps/events/Route104_Prototype.inc" - .include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/maps/events/Route109_SeashoreHouse.inc" - .include "data/maps/events/Route110_TrickHouseEntrance.inc" - .include "data/maps/events/Route110_TrickHouseEnd.inc" - .include "data/maps/events/Route110_TrickHouseCorridor.inc" - .include "data/maps/events/Route110_TrickHousePuzzle1.inc" - .include "data/maps/events/Route110_TrickHousePuzzle2.inc" - .include "data/maps/events/Route110_TrickHousePuzzle3.inc" - .include "data/maps/events/Route110_TrickHousePuzzle4.inc" - .include "data/maps/events/Route110_TrickHousePuzzle5.inc" - .include "data/maps/events/Route110_TrickHousePuzzle6.inc" - .include "data/maps/events/Route110_TrickHousePuzzle7.inc" - .include "data/maps/events/Route110_TrickHousePuzzle8.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc" - .include "data/maps/events/Route113_GlassWorkshop.inc" - .include "data/maps/events/Route123_BerryMastersHouse.inc" - .include "data/maps/events/Route119_WeatherInstitute_1F.inc" - .include "data/maps/events/Route119_WeatherInstitute_2F.inc" - .include "data/maps/events/Route119_House.inc" - .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/PetalburgCity/events.inc" + .include "data/maps/SlateportCity/events.inc" + .include "data/maps/MauvilleCity/events.inc" + .include "data/maps/RustboroCity/events.inc" + .include "data/maps/FortreeCity/events.inc" + .include "data/maps/LilycoveCity/events.inc" + .include "data/maps/MossdeepCity/events.inc" + .include "data/maps/SootopolisCity/events.inc" + .include "data/maps/EverGrandeCity/events.inc" + .include "data/maps/LittlerootTown/events.inc" + .include "data/maps/OldaleTown/events.inc" + .include "data/maps/DewfordTown/events.inc" + .include "data/maps/LavaridgeTown/events.inc" + .include "data/maps/FallarborTown/events.inc" + .include "data/maps/VerdanturfTown/events.inc" + .include "data/maps/PacifidlogTown/events.inc" + .include "data/maps/Route101/events.inc" + .include "data/maps/Route102/events.inc" + .include "data/maps/Route103/events.inc" + .include "data/maps/Route104/events.inc" + .include "data/maps/Route105/events.inc" + .include "data/maps/Route106/events.inc" + .include "data/maps/Route107/events.inc" + .include "data/maps/Route108/events.inc" + .include "data/maps/Route109/events.inc" + .include "data/maps/Route110/events.inc" + .include "data/maps/Route111/events.inc" + .include "data/maps/Route112/events.inc" + .include "data/maps/Route113/events.inc" + .include "data/maps/Route114/events.inc" + .include "data/maps/Route115/events.inc" + .include "data/maps/Route116/events.inc" + .include "data/maps/Route117/events.inc" + .include "data/maps/Route118/events.inc" + .include "data/maps/Route119/events.inc" + .include "data/maps/Route120/events.inc" + .include "data/maps/Route121/events.inc" + .include "data/maps/Route122/events.inc" + .include "data/maps/Route123/events.inc" + .include "data/maps/Route124/events.inc" + .include "data/maps/Route125/events.inc" + .include "data/maps/Route126/events.inc" + .include "data/maps/Route127/events.inc" + .include "data/maps/Route128/events.inc" + .include "data/maps/Route129/events.inc" + .include "data/maps/Route130/events.inc" + .include "data/maps/Route131/events.inc" + .include "data/maps/Route132/events.inc" + .include "data/maps/Route133/events.inc" + .include "data/maps/Route134/events.inc" + .include "data/maps/Underwater1/events.inc" + .include "data/maps/Underwater2/events.inc" + .include "data/maps/Underwater3/events.inc" + .include "data/maps/Underwater4/events.inc" + .include "data/maps/Underwater5/events.inc" + .include "data/maps/Underwater6/events.inc" + .include "data/maps/Underwater7/events.inc" + .include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc" + .include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc" + .include "data/maps/LittlerootTown_MaysHouse_1F/events.inc" + .include "data/maps/LittlerootTown_MaysHouse_2F/events.inc" + .include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc" + .include "data/maps/OldaleTown_House1/events.inc" + .include "data/maps/OldaleTown_House2/events.inc" + .include "data/maps/OldaleTown_PokemonCenter_1F/events.inc" + .include "data/maps/OldaleTown_PokemonCenter_2F/events.inc" + .include "data/maps/OldaleTown_Mart/events.inc" + .include "data/maps/DewfordTown_House1/events.inc" + .include "data/maps/DewfordTown_PokemonCenter_1F/events.inc" + .include "data/maps/DewfordTown_PokemonCenter_2F/events.inc" + .include "data/maps/DewfordTown_Gym/events.inc" + .include "data/maps/DewfordTown_Hall/events.inc" + .include "data/maps/DewfordTown_House2/events.inc" + .include "data/maps/LavaridgeTown_HerbShop/events.inc" + .include "data/maps/LavaridgeTown_Gym_1F/events.inc" + .include "data/maps/LavaridgeTown_Gym_B1F/events.inc" + .include "data/maps/LavaridgeTown_House/events.inc" + .include "data/maps/LavaridgeTown_Mart/events.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc" + .include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc" + .include "data/maps/FallarborTown_Mart/events.inc" + .include "data/maps/FallarborTown_BattleTentLobby/events.inc" + .include "data/maps/FallarborTown_BattleTentCorridor/events.inc" + .include "data/maps/FallarborTown_BattleTentBattleRoom/events.inc" + .include "data/maps/FallarborTown_PokemonCenter_1F/events.inc" + .include "data/maps/FallarborTown_PokemonCenter_2F/events.inc" + .include "data/maps/FallarborTown_House1/events.inc" + .include "data/maps/FallarborTown_House2/events.inc" + .include "data/maps/VerdanturfTown_BattleTentLobby/events.inc" + .include "data/maps/VerdanturfTown_BattleTentCorridor/events.inc" + .include "data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc" + .include "data/maps/VerdanturfTown_Mart/events.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc" + .include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc" + .include "data/maps/VerdanturfTown_WandasHouse/events.inc" + .include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc" + .include "data/maps/VerdanturfTown_House/events.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc" + .include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc" + .include "data/maps/PacifidlogTown_House1/events.inc" + .include "data/maps/PacifidlogTown_House2/events.inc" + .include "data/maps/PacifidlogTown_House3/events.inc" + .include "data/maps/PacifidlogTown_House4/events.inc" + .include "data/maps/PacifidlogTown_House5/events.inc" + .include "data/maps/PetalburgCity_WallysHouse/events.inc" + .include "data/maps/PetalburgCity_Gym/events.inc" + .include "data/maps/PetalburgCity_House1/events.inc" + .include "data/maps/PetalburgCity_House2/events.inc" + .include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc" + .include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc" + .include "data/maps/PetalburgCity_Mart/events.inc" + .include "data/maps/SlateportCity_SternsShipyard_1F/events.inc" + .include "data/maps/SlateportCity_SternsShipyard_2F/events.inc" + .include "data/maps/SlateportCity_BattleTentLobby/events.inc" + .include "data/maps/SlateportCity_BattleTentCorridor/events.inc" + .include "data/maps/SlateportCity_BattleTentBattleRoom/events.inc" + .include "data/maps/SlateportCity_House1/events.inc" + .include "data/maps/SlateportCity_PokemonFanClub/events.inc" + .include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc" + .include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc" + .include "data/maps/SlateportCity_Harbor/events.inc" + .include "data/maps/SlateportCity_House2/events.inc" + .include "data/maps/SlateportCity_PokemonCenter_1F/events.inc" + .include "data/maps/SlateportCity_PokemonCenter_2F/events.inc" + .include "data/maps/SlateportCity_Mart/events.inc" + .include "data/maps/MauvilleCity_Gym/events.inc" + .include "data/maps/MauvilleCity_BikeShop/events.inc" + .include "data/maps/MauvilleCity_House1/events.inc" + .include "data/maps/MauvilleCity_GameCorner/events.inc" + .include "data/maps/MauvilleCity_House2/events.inc" + .include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc" + .include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc" + .include "data/maps/MauvilleCity_Mart/events.inc" + .include "data/maps/RustboroCity_DevonCorp_1F/events.inc" + .include "data/maps/RustboroCity_DevonCorp_2F/events.inc" + .include "data/maps/RustboroCity_DevonCorp_3F/events.inc" + .include "data/maps/RustboroCity_Gym/events.inc" + .include "data/maps/RustboroCity_PokemonSchool/events.inc" + .include "data/maps/RustboroCity_PokemonCenter_1F/events.inc" + .include "data/maps/RustboroCity_PokemonCenter_2F/events.inc" + .include "data/maps/RustboroCity_Mart/events.inc" + .include "data/maps/RustboroCity_Flat1_1F/events.inc" + .include "data/maps/RustboroCity_Flat1_2F/events.inc" + .include "data/maps/RustboroCity_House1/events.inc" + .include "data/maps/RustboroCity_CuttersHouse/events.inc" + .include "data/maps/RustboroCity_House2/events.inc" + .include "data/maps/RustboroCity_Flat2_1F/events.inc" + .include "data/maps/RustboroCity_Flat2_2F/events.inc" + .include "data/maps/RustboroCity_Flat2_3F/events.inc" + .include "data/maps/RustboroCity_House3/events.inc" + .include "data/maps/FortreeCity_House1/events.inc" + .include "data/maps/FortreeCity_Gym/events.inc" + .include "data/maps/FortreeCity_PokemonCenter_1F/events.inc" + .include "data/maps/FortreeCity_PokemonCenter_2F/events.inc" + .include "data/maps/FortreeCity_Mart/events.inc" + .include "data/maps/FortreeCity_House2/events.inc" + .include "data/maps/FortreeCity_House3/events.inc" + .include "data/maps/FortreeCity_House4/events.inc" + .include "data/maps/FortreeCity_House5/events.inc" + .include "data/maps/FortreeCity_DecorationShop/events.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc" + .include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc" + .include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc" + .include "data/maps/LilycoveCity_ContestLobby/events.inc" + .include "data/maps/LilycoveCity_ContestHall/events.inc" + .include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc" + .include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc" + .include "data/maps/LilycoveCity_UnusedMart/events.inc" + .include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc" + .include "data/maps/LilycoveCity_Harbor/events.inc" + .include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc" + .include "data/maps/LilycoveCity_House1/events.inc" + .include "data/maps/LilycoveCity_House2/events.inc" + .include "data/maps/LilycoveCity_House3/events.inc" + .include "data/maps/LilycoveCity_House4/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc" + .include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc" + .include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc" + .include "data/maps/MossdeepCity_Gym/events.inc" + .include "data/maps/MossdeepCity_House1/events.inc" + .include "data/maps/MossdeepCity_House2/events.inc" + .include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc" + .include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc" + .include "data/maps/MossdeepCity_Mart/events.inc" + .include "data/maps/MossdeepCity_House3/events.inc" + .include "data/maps/MossdeepCity_StevensHouse/events.inc" + .include "data/maps/MossdeepCity_House4/events.inc" + .include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc" + .include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc" + .include "data/maps/MossdeepCity_GameCorner_1F/events.inc" + .include "data/maps/MossdeepCity_GameCorner_B1F/events.inc" + .include "data/maps/SootopolisCity_Gym_1F/events.inc" + .include "data/maps/SootopolisCity_Gym_B1F/events.inc" + .include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc" + .include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc" + .include "data/maps/SootopolisCity_Mart/events.inc" + .include "data/maps/SootopolisCity_House1/events.inc" + .include "data/maps/SootopolisCity_House2/events.inc" + .include "data/maps/SootopolisCity_House3/events.inc" + .include "data/maps/SootopolisCity_House4/events.inc" + .include "data/maps/SootopolisCity_House5/events.inc" + .include "data/maps/SootopolisCity_House6/events.inc" + .include "data/maps/SootopolisCity_House7/events.inc" + .include "data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc" + .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc" + .include "data/maps/EverGrandeCity_SidneysRoom/events.inc" + .include "data/maps/EverGrandeCity_PhoebesRoom/events.inc" + .include "data/maps/EverGrandeCity_GlaciasRoom/events.inc" + .include "data/maps/EverGrandeCity_DrakesRoom/events.inc" + .include "data/maps/EverGrandeCity_ChampionsRoom/events.inc" + .include "data/maps/EverGrandeCity_Hall1/events.inc" + .include "data/maps/EverGrandeCity_Hall2/events.inc" + .include "data/maps/EverGrandeCity_Hall3/events.inc" + .include "data/maps/EverGrandeCity_Hall4/events.inc" + .include "data/maps/EverGrandeCity_Hall5/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_1F/events.inc" + .include "data/maps/EverGrandeCity_HallOfFame/events.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc" + .include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague_2F/events.inc" + .include "data/maps/Route104_MrBrineysHouse/events.inc" + .include "data/maps/Route104_PrettyPetalFlowerShop/events.inc" + .include "data/maps/Route111_WinstrateFamilysHouse/events.inc" + .include "data/maps/Route111_OldLadysRestStop/events.inc" + .include "data/maps/Route112_CableCarStation/events.inc" + .include "data/maps/MtChimney_CableCarStation/events.inc" + .include "data/maps/Route114_FossilManiacsHouse/events.inc" + .include "data/maps/Route114_FossilManiacsTunnel/events.inc" + .include "data/maps/Route114_LanettesHouse/events.inc" + .include "data/maps/Route116_TunnelersRestHouse/events.inc" + .include "data/maps/Route117_PokemonDayCare/events.inc" + .include "data/maps/Route121_SafariZoneEntrance/events.inc" + .include "data/maps/MeteorFalls_1F_1R/events.inc" + .include "data/maps/MeteorFalls_1F_2R/events.inc" + .include "data/maps/MeteorFalls_B1F_1R/events.inc" + .include "data/maps/MeteorFalls_B1F_2R/events.inc" + .include "data/maps/RusturfTunnel/events.inc" + .include "data/maps/Underwater_SootopolisCity/events.inc" + .include "data/maps/DesertRuins/events.inc" + .include "data/maps/GraniteCave_1F/events.inc" + .include "data/maps/GraniteCave_B1F/events.inc" + .include "data/maps/GraniteCave_B2F/events.inc" + .include "data/maps/GraniteCave_StevensRoom/events.inc" + .include "data/maps/PetalburgWoods/events.inc" + .include "data/maps/MtChimney/events.inc" + .include "data/maps/JaggedPass/events.inc" + .include "data/maps/FieryPath/events.inc" + .include "data/maps/MtPyre_1F/events.inc" + .include "data/maps/MtPyre_2F/events.inc" + .include "data/maps/MtPyre_3F/events.inc" + .include "data/maps/MtPyre_4F/events.inc" + .include "data/maps/MtPyre_5F/events.inc" + .include "data/maps/MtPyre_6F/events.inc" + .include "data/maps/MtPyre_Exterior/events.inc" + .include "data/maps/MtPyre_Summit/events.inc" + .include "data/maps/AquaHideout_1F/events.inc" + .include "data/maps/AquaHideout_B1F/events.inc" + .include "data/maps/AquaHideout_B2F/events.inc" + .include "data/maps/Underwater_SeafloorCavern/events.inc" + .include "data/maps/SeafloorCavern_Entrance/events.inc" + .include "data/maps/SeafloorCavern_Room1/events.inc" + .include "data/maps/SeafloorCavern_Room2/events.inc" + .include "data/maps/SeafloorCavern_Room3/events.inc" + .include "data/maps/SeafloorCavern_Room4/events.inc" + .include "data/maps/SeafloorCavern_Room5/events.inc" + .include "data/maps/SeafloorCavern_Room6/events.inc" + .include "data/maps/SeafloorCavern_Room7/events.inc" + .include "data/maps/SeafloorCavern_Room8/events.inc" + .include "data/maps/SeafloorCavern_Room9/events.inc" + .include "data/maps/CaveOfOrigin_Entrance/events.inc" + .include "data/maps/CaveOfOrigin_1F/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc" + .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc" + .include "data/maps/CaveOfOrigin_B1F/events.inc" + .include "data/maps/VictoryRoad_1F/events.inc" + .include "data/maps/VictoryRoad_B1F/events.inc" + .include "data/maps/VictoryRoad_B2F/events.inc" + .include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc" + .include "data/maps/ShoalCave_LowTideInnerRoom/events.inc" + .include "data/maps/ShoalCave_LowTideStairsRoom/events.inc" + .include "data/maps/ShoalCave_LowTideLowerRoom/events.inc" + .include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc" + .include "data/maps/ShoalCave_HighTideInnerRoom/events.inc" + .include "data/maps/NewMauville_Entrance/events.inc" + .include "data/maps/NewMauville_Inside/events.inc" + .include "data/maps/AbandonedShip_Deck/events.inc" + .include "data/maps/AbandonedShip_Corridors_1F/events.inc" + .include "data/maps/AbandonedShip_Rooms_1F/events.inc" + .include "data/maps/AbandonedShip_Corridors_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms2_B1F/events.inc" + .include "data/maps/AbandonedShip_Underwater1/events.inc" + .include "data/maps/AbandonedShip_Room_B1F/events.inc" + .include "data/maps/AbandonedShip_Rooms2_1F/events.inc" + .include "data/maps/AbandonedShip_CaptainsOffice/events.inc" + .include "data/maps/AbandonedShip_Underwater2/events.inc" + .include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc" + .include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc" + .include "data/maps/IslandCave/events.inc" + .include "data/maps/AncientTomb/events.inc" + .include "data/maps/Underwater_Route134/events.inc" + .include "data/maps/Underwater_SealedChamber/events.inc" + .include "data/maps/SealedChamber_OuterRoom/events.inc" + .include "data/maps/SealedChamber_InnerRoom/events.inc" + .include "data/maps/ScorchedSlab/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap1/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap2/events.inc" + .include "data/maps/AquaHideout_UnusedRubyMap3/events.inc" + .include "data/maps/SkyPillar_Entrance/events.inc" + .include "data/maps/SkyPillar_Outside/events.inc" + .include "data/maps/SkyPillar_1F/events.inc" + .include "data/maps/SkyPillar_2F/events.inc" + .include "data/maps/SkyPillar_3F/events.inc" + .include "data/maps/SkyPillar_4F/events.inc" + .include "data/maps/ShoalCave_LowTideIceRoom/events.inc" + .include "data/maps/SkyPillar_5F/events.inc" + .include "data/maps/SkyPillar_Top/events.inc" + .include "data/maps/MagmaHideout_1F/events.inc" + .include "data/maps/MagmaHideout_2F_1R/events.inc" + .include "data/maps/MagmaHideout_2F_2R/events.inc" + .include "data/maps/MagmaHideout_3F_1R/events.inc" + .include "data/maps/MagmaHideout_3F_2R/events.inc" + .include "data/maps/MagmaHideout_4F/events.inc" + .include "data/maps/MagmaHideout_3F_3R/events.inc" + .include "data/maps/MagmaHideout_2F_3R/events.inc" + .include "data/maps/MirageTower_1F/events.inc" + .include "data/maps/MirageTower_2F/events.inc" + .include "data/maps/MirageTower_3F/events.inc" + .include "data/maps/MirageTower_4F/events.inc" + .include "data/maps/DesertUnderpass/events.inc" + .include "data/maps/ArtisanCave_B1F/events.inc" + .include "data/maps/ArtisanCave_1F/events.inc" + .include "data/maps/Underwater_MarineCave/events.inc" + .include "data/maps/MarineCave_Entrance/events.inc" + .include "data/maps/MarineCave_End/events.inc" + .include "data/maps/TerraCave_Entrance/events.inc" + .include "data/maps/TerraCave_End/events.inc" + .include "data/maps/AlteringCave/events.inc" + .include "data/maps/MeteorFalls_StevensCave/events.inc" + .include "data/maps/SecretBase_RedCave1/events.inc" + .include "data/maps/SecretBase_BrownCave1/events.inc" + .include "data/maps/SecretBase_BlueCave1/events.inc" + .include "data/maps/SecretBase_YellowCave1/events.inc" + .include "data/maps/SecretBase_Tree1/events.inc" + .include "data/maps/SecretBase_Shrub1/events.inc" + .include "data/maps/SecretBase_RedCave2/events.inc" + .include "data/maps/SecretBase_BrownCave2/events.inc" + .include "data/maps/SecretBase_BlueCave2/events.inc" + .include "data/maps/SecretBase_YellowCave2/events.inc" + .include "data/maps/SecretBase_Tree2/events.inc" + .include "data/maps/SecretBase_Shrub2/events.inc" + .include "data/maps/SecretBase_RedCave3/events.inc" + .include "data/maps/SecretBase_BrownCave3/events.inc" + .include "data/maps/SecretBase_BlueCave3/events.inc" + .include "data/maps/SecretBase_YellowCave3/events.inc" + .include "data/maps/SecretBase_Tree3/events.inc" + .include "data/maps/SecretBase_Shrub3/events.inc" + .include "data/maps/SecretBase_RedCave4/events.inc" + .include "data/maps/SecretBase_BrownCave4/events.inc" + .include "data/maps/SecretBase_BlueCave4/events.inc" + .include "data/maps/SecretBase_YellowCave4/events.inc" + .include "data/maps/SecretBase_Tree4/events.inc" + .include "data/maps/SecretBase_Shrub4/events.inc" + .include "data/maps/SingleBattleColosseum/events.inc" + .include "data/maps/TradeCenter/events.inc" + .include "data/maps/RecordCorner/events.inc" + .include "data/maps/DoubleBattleColosseum/events.inc" + .include "data/maps/LinkContestRoom1/events.inc" + .include "data/maps/LinkContestRoom2/events.inc" + .include "data/maps/LinkContestRoom3/events.inc" + .include "data/maps/LinkContestRoom4/events.inc" + .include "data/maps/LinkContestRoom5/events.inc" + .include "data/maps/LinkContestRoom6/events.inc" + .include "data/maps/UnknownMap_25_29/events.inc" + .include "data/maps/UnknownMap_25_30/events.inc" + .include "data/maps/UnknownMap_25_31/events.inc" + .include "data/maps/UnknownMap_25_32/events.inc" + .include "data/maps/UnknownMap_25_33/events.inc" + .include "data/maps/UnknownMap_25_34/events.inc" + .include "data/maps/InsideOfTruck/events.inc" + .include "data/maps/SSTidalCorridor/events.inc" + .include "data/maps/SSTidalLowerDeck/events.inc" + .include "data/maps/SSTidalRooms/events.inc" + .include "data/maps/BattlePyramidSquare01/events.inc" + .include "data/maps/BattlePyramidSquare02/events.inc" + .include "data/maps/BattlePyramidSquare03/events.inc" + .include "data/maps/BattlePyramidSquare04/events.inc" + .include "data/maps/BattlePyramidSquare05/events.inc" + .include "data/maps/BattlePyramidSquare06/events.inc" + .include "data/maps/BattlePyramidSquare07/events.inc" + .include "data/maps/BattlePyramidSquare08/events.inc" + .include "data/maps/BattlePyramidSquare09/events.inc" + .include "data/maps/BattlePyramidSquare10/events.inc" + .include "data/maps/BattlePyramidSquare11/events.inc" + .include "data/maps/BattlePyramidSquare12/events.inc" + .include "data/maps/BattlePyramidSquare13/events.inc" + .include "data/maps/BattlePyramidSquare14/events.inc" + .include "data/maps/BattlePyramidSquare15/events.inc" + .include "data/maps/BattlePyramidSquare16/events.inc" + .include "data/maps/UnionRoom/events.inc" + .include "data/maps/SafariZone_Northwest/events.inc" + .include "data/maps/SafariZone_North/events.inc" + .include "data/maps/SafariZone_Southwest/events.inc" + .include "data/maps/SafariZone_South/events.inc" + .include "data/maps/BattleFrontier_OutsideWest/events.inc" + .include "data/maps/BattleFrontier_BattleTowerLobby/events.inc" + .include "data/maps/BattleFrontier_BattleTowerElevator/events.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc" + .include "data/maps/SouthernIsland_Exterior/events.inc" + .include "data/maps/SouthernIsland_Interior/events.inc" + .include "data/maps/SafariZone_RestHouse/events.inc" + .include "data/maps/SafariZone_Northeast/events.inc" + .include "data/maps/SafariZone_Southeast/events.inc" + .include "data/maps/BattleFrontier_OutsideEast/events.inc" + .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleTowerCorridor2/events.inc" + .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc" + .include "data/maps/BattleFrontier_BattleDomeLobby/events.inc" + .include "data/maps/BattleFrontier_BattleDomeCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceCorridor/events.inc" + .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc" + .include "data/maps/BattleFrontier_BattlePyramidTop/events.inc" + .include "data/maps/BattleFrontier_BattleArenaLobby/events.inc" + .include "data/maps/BattleFrontier_BattleArenaCorridor/events.inc" + .include "data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryLobby/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePikeLobby/events.inc" + .include "data/maps/BattleFrontier_BattlePikeCorridor/events.inc" + .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc" + .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc" + .include "data/maps/BattleFrontier_RankingHall/events.inc" + .include "data/maps/BattleFrontier_Lounge1/events.inc" + .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc" + .include "data/maps/BattleFrontier_Lounge2/events.inc" + .include "data/maps/BattleFrontier_Lounge3/events.inc" + .include "data/maps/BattleFrontier_Lounge4/events.inc" + .include "data/maps/BattleFrontier_ScottsHouse/events.inc" + .include "data/maps/BattleFrontier_Lounge5/events.inc" + .include "data/maps/BattleFrontier_Lounge6/events.inc" + .include "data/maps/BattleFrontier_Lounge7/events.inc" + .include "data/maps/BattleFrontier_ReceptionGate/events.inc" + .include "data/maps/BattleFrontier_Lounge8/events.inc" + .include "data/maps/BattleFrontier_Lounge9/events.inc" + .include "data/maps/BattleFrontier_PokemonCenter_1F/events.inc" + .include "data/maps/BattleFrontier_PokemonCenter_2F/events.inc" + .include "data/maps/BattleFrontier_Mart/events.inc" + .include "data/maps/FarawayIsland_Entrance/events.inc" + .include "data/maps/FarawayIsland_Interior/events.inc" + .include "data/maps/BirthIsland_Exterior/events.inc" + .include "data/maps/BirthIsland_Harbor/events.inc" + .include "data/maps/TrainerHill_Entrance/events.inc" + .include "data/maps/TrainerHill_1F/events.inc" + .include "data/maps/TrainerHill_2F/events.inc" + .include "data/maps/TrainerHill_3F/events.inc" + .include "data/maps/TrainerHill_4F/events.inc" + .include "data/maps/TrainerHill_Roof/events.inc" + .include "data/maps/NavelRock_Exterior/events.inc" + .include "data/maps/NavelRock_Harbor/events.inc" + .include "data/maps/NavelRock_Entrance/events.inc" + .include "data/maps/NavelRock_B1F/events.inc" + .include "data/maps/NavelRock_Fork/events.inc" + .include "data/maps/NavelRock_Up1/events.inc" + .include "data/maps/NavelRock_Up2/events.inc" + .include "data/maps/NavelRock_Up3/events.inc" + .include "data/maps/NavelRock_Up4/events.inc" + .include "data/maps/NavelRock_Top/events.inc" + .include "data/maps/NavelRock_Down01/events.inc" + .include "data/maps/NavelRock_Down02/events.inc" + .include "data/maps/NavelRock_Down03/events.inc" + .include "data/maps/NavelRock_Down04/events.inc" + .include "data/maps/NavelRock_Down05/events.inc" + .include "data/maps/NavelRock_Down06/events.inc" + .include "data/maps/NavelRock_Down07/events.inc" + .include "data/maps/NavelRock_Down08/events.inc" + .include "data/maps/NavelRock_Down09/events.inc" + .include "data/maps/NavelRock_Down10/events.inc" + .include "data/maps/NavelRock_Down11/events.inc" + .include "data/maps/NavelRock_Bottom/events.inc" + .include "data/maps/TrainerHill_Elevator/events.inc" + .include "data/maps/Route104_Prototype/events.inc" + .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc" + .include "data/maps/Route109_SeashoreHouse/events.inc" + .include "data/maps/Route110_TrickHouseEntrance/events.inc" + .include "data/maps/Route110_TrickHouseEnd/events.inc" + .include "data/maps/Route110_TrickHouseCorridor/events.inc" + .include "data/maps/Route110_TrickHousePuzzle1/events.inc" + .include "data/maps/Route110_TrickHousePuzzle2/events.inc" + .include "data/maps/Route110_TrickHousePuzzle3/events.inc" + .include "data/maps/Route110_TrickHousePuzzle4/events.inc" + .include "data/maps/Route110_TrickHousePuzzle5/events.inc" + .include "data/maps/Route110_TrickHousePuzzle6/events.inc" + .include "data/maps/Route110_TrickHousePuzzle7/events.inc" + .include "data/maps/Route110_TrickHousePuzzle8/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc" + .include "data/maps/Route113_GlassWorkshop/events.inc" + .include "data/maps/Route123_BerryMastersHouse/events.inc" + .include "data/maps/Route119_WeatherInstitute_1F/events.inc" + .include "data/maps/Route119_WeatherInstitute_2F/events.inc" + .include "data/maps/Route119_House/events.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc" diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/events.inc diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_CaptainsOffice.inc rename to data/maps/AbandonedShip_CaptainsOffice/scripts.inc diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_1F.inc rename to data/maps/AbandonedShip_Corridors_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Corridors_B1F.inc rename to data/maps/AbandonedShip_Corridors_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/events.inc diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Deck.inc rename to data/maps/AbandonedShip_Deck/scripts.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/events.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc rename to data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/events.inc diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc rename to data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Room_B1F.inc rename to data/maps/AbandonedShip_Room_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_1F.inc rename to data/maps/AbandonedShip_Rooms2_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms2_B1F.inc rename to data/maps/AbandonedShip_Rooms2_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_1F.inc rename to data/maps/AbandonedShip_Rooms_1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/events.inc diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Rooms_B1F.inc rename to data/maps/AbandonedShip_Rooms_B1F/scripts.inc diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/events.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater1.inc rename to data/maps/AbandonedShip_Underwater1/scripts.inc diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc similarity index 100% rename from data/maps/events/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/events.inc diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/AbandonedShip_Underwater2.inc rename to data/maps/AbandonedShip_Underwater2/scripts.inc diff --git a/data/maps/events/AlteringCave.inc b/data/maps/AlteringCave/events.inc similarity index 100% rename from data/maps/events/AlteringCave.inc rename to data/maps/AlteringCave/events.inc diff --git a/data/scripts/maps/AlteringCave.inc b/data/maps/AlteringCave/scripts.inc similarity index 100% rename from data/scripts/maps/AlteringCave.inc rename to data/maps/AlteringCave/scripts.inc diff --git a/data/maps/events/AncientTomb.inc b/data/maps/AncientTomb/events.inc similarity index 100% rename from data/maps/events/AncientTomb.inc rename to data/maps/AncientTomb/events.inc diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc similarity index 100% rename from data/scripts/maps/AncientTomb.inc rename to data/maps/AncientTomb/scripts.inc diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/events.inc diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_1F.inc rename to data/maps/AquaHideout_1F/scripts.inc diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/events.inc diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B1F.inc rename to data/maps/AquaHideout_B1F/scripts.inc diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/events.inc similarity index 100% rename from data/maps/events/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/events.inc diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_B2F.inc rename to data/maps/AquaHideout_B2F/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap1.inc rename to data/maps/AquaHideout_UnusedRubyMap1/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap1.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap1.inc rename to data/maps/AquaHideout_UnusedRubyMap1/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap2.inc rename to data/maps/AquaHideout_UnusedRubyMap2/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap2.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap2.inc rename to data/maps/AquaHideout_UnusedRubyMap2/scripts.inc diff --git a/data/maps/events/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc similarity index 100% rename from data/maps/events/AquaHideout_UnusedRubyMap3.inc rename to data/maps/AquaHideout_UnusedRubyMap3/events.inc diff --git a/data/scripts/maps/AquaHideout_UnusedRubyMap3.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc similarity index 100% rename from data/scripts/maps/AquaHideout_UnusedRubyMap3.inc rename to data/maps/AquaHideout_UnusedRubyMap3/scripts.inc diff --git a/data/maps/events/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/events.inc similarity index 100% rename from data/maps/events/ArtisanCave_1F.inc rename to data/maps/ArtisanCave_1F/events.inc diff --git a/data/scripts/maps/ArtisanCave_1F.inc b/data/maps/ArtisanCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/ArtisanCave_1F.inc rename to data/maps/ArtisanCave_1F/scripts.inc diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/events.inc similarity index 100% rename from data/maps/events/ArtisanCave_B1F.inc rename to data/maps/ArtisanCave_B1F/events.inc diff --git a/data/scripts/maps/ArtisanCave_B1F.inc b/data/maps/ArtisanCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/ArtisanCave_B1F.inc rename to data/maps/ArtisanCave_B1F/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc rename to data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc rename to data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaCorridor.inc rename to data/maps/BattleFrontier_BattleArenaCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc rename to data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleArenaLobby.inc rename to data/maps/BattleFrontier_BattleArenaLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleArenaLobby.inc rename to data/maps/BattleFrontier_BattleArenaLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeCorridor.inc rename to data/maps/BattleFrontier_BattleDomeCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc rename to data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomeLobby.inc rename to data/maps/BattleFrontier_BattleDomeLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomeLobby.inc rename to data/maps/BattleFrontier_BattleDomeLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc rename to data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryLobby.inc rename to data/maps/BattleFrontier_BattleFactoryLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc rename to data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc rename to data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc rename to data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc rename to data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceCorridor.inc rename to data/maps/BattleFrontier_BattlePalaceCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc rename to data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePalaceLobby.inc rename to data/maps/BattleFrontier_BattlePalaceLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc rename to data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeCorridor.inc rename to data/maps/BattleFrontier_BattlePikeCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc rename to data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeLobby.inc rename to data/maps/BattleFrontier_BattlePikeLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeLobby.inc rename to data/maps/BattleFrontier_BattlePikeLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeRandomRoom3.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeRandomRoom3.inc rename to data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc rename to data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc rename to data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc rename to data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePointExchangeServiceCorner.inc rename to data/maps/BattleFrontier_BattlePointExchangeServiceCorner/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc rename to data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc rename to data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidLobby.inc rename to data/maps/BattleFrontier_BattlePyramidLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc rename to data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattlePyramidTop.inc rename to data/maps/BattleFrontier_BattlePyramidTop/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattlePyramidTop.inc rename to data/maps/BattleFrontier_BattlePyramidTop/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc rename to data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerCorridor.inc rename to data/maps/BattleFrontier_BattleTowerCorridor/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc rename to data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerCorridor2.inc rename to data/maps/BattleFrontier_BattleTowerCorridor2/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc rename to data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerElevator.inc rename to data/maps/BattleFrontier_BattleTowerElevator/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerElevator.inc rename to data/maps/BattleFrontier_BattleTowerElevator/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerLobby.inc rename to data/maps/BattleFrontier_BattleTowerLobby/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerLobby.inc rename to data/maps/BattleFrontier_BattleTowerLobby/scripts.inc diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc rename to data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge1.inc rename to data/maps/BattleFrontier_Lounge1/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge1.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge1.inc rename to data/maps/BattleFrontier_Lounge1/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge2.inc rename to data/maps/BattleFrontier_Lounge2/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge2.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge2.inc rename to data/maps/BattleFrontier_Lounge2/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge3.inc rename to data/maps/BattleFrontier_Lounge3/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge3.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge3.inc rename to data/maps/BattleFrontier_Lounge3/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge4.inc rename to data/maps/BattleFrontier_Lounge4/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge4.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge4.inc rename to data/maps/BattleFrontier_Lounge4/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge5.inc rename to data/maps/BattleFrontier_Lounge5/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge5.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge5.inc rename to data/maps/BattleFrontier_Lounge5/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge6.inc rename to data/maps/BattleFrontier_Lounge6/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge6.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge6.inc rename to data/maps/BattleFrontier_Lounge6/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge7.inc rename to data/maps/BattleFrontier_Lounge7/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge7.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge7.inc rename to data/maps/BattleFrontier_Lounge7/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge8.inc rename to data/maps/BattleFrontier_Lounge8/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge8.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge8.inc rename to data/maps/BattleFrontier_Lounge8/scripts.inc diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Lounge9.inc rename to data/maps/BattleFrontier_Lounge9/events.inc diff --git a/data/scripts/maps/BattleFrontier_Lounge9.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Lounge9.inc rename to data/maps/BattleFrontier_Lounge9/scripts.inc diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_Mart.inc rename to data/maps/BattleFrontier_Mart/events.inc diff --git a/data/scripts/maps/BattleFrontier_Mart.inc b/data/maps/BattleFrontier_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_Mart.inc rename to data/maps/BattleFrontier_Mart/scripts.inc diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_OutsideEast.inc rename to data/maps/BattleFrontier_OutsideEast/events.inc diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_OutsideEast.inc rename to data/maps/BattleFrontier_OutsideEast/scripts.inc diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_OutsideWest.inc rename to data/maps/BattleFrontier_OutsideWest/events.inc diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_OutsideWest.inc rename to data/maps/BattleFrontier_OutsideWest/scripts.inc diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_PokemonCenter_1F.inc rename to data/maps/BattleFrontier_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_PokemonCenter_1F.inc rename to data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_PokemonCenter_2F.inc rename to data/maps/BattleFrontier_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_PokemonCenter_2F.inc rename to data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_RankingHall.inc rename to data/maps/BattleFrontier_RankingHall/events.inc diff --git a/data/scripts/maps/BattleFrontier_RankingHall.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_RankingHall.inc rename to data/maps/BattleFrontier_RankingHall/scripts.inc diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_ReceptionGate.inc rename to data/maps/BattleFrontier_ReceptionGate/events.inc diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_ReceptionGate.inc rename to data/maps/BattleFrontier_ReceptionGate/scripts.inc diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc similarity index 100% rename from data/maps/events/BattleFrontier_ScottsHouse.inc rename to data/maps/BattleFrontier_ScottsHouse/events.inc diff --git a/data/scripts/maps/BattleFrontier_ScottsHouse.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/BattleFrontier_ScottsHouse.inc rename to data/maps/BattleFrontier_ScottsHouse/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare01.inc rename to data/maps/BattlePyramidSquare01/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare01.inc b/data/maps/BattlePyramidSquare01/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare01.inc rename to data/maps/BattlePyramidSquare01/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare02.inc rename to data/maps/BattlePyramidSquare02/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare02.inc b/data/maps/BattlePyramidSquare02/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare02.inc rename to data/maps/BattlePyramidSquare02/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare03.inc rename to data/maps/BattlePyramidSquare03/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare03.inc b/data/maps/BattlePyramidSquare03/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare03.inc rename to data/maps/BattlePyramidSquare03/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare04.inc rename to data/maps/BattlePyramidSquare04/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare04.inc b/data/maps/BattlePyramidSquare04/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare04.inc rename to data/maps/BattlePyramidSquare04/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare05.inc rename to data/maps/BattlePyramidSquare05/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare05.inc b/data/maps/BattlePyramidSquare05/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare05.inc rename to data/maps/BattlePyramidSquare05/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare06.inc rename to data/maps/BattlePyramidSquare06/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare06.inc b/data/maps/BattlePyramidSquare06/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare06.inc rename to data/maps/BattlePyramidSquare06/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare07.inc rename to data/maps/BattlePyramidSquare07/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare07.inc b/data/maps/BattlePyramidSquare07/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare07.inc rename to data/maps/BattlePyramidSquare07/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare08.inc rename to data/maps/BattlePyramidSquare08/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare08.inc b/data/maps/BattlePyramidSquare08/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare08.inc rename to data/maps/BattlePyramidSquare08/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare09.inc rename to data/maps/BattlePyramidSquare09/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare09.inc b/data/maps/BattlePyramidSquare09/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare09.inc rename to data/maps/BattlePyramidSquare09/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare10.inc rename to data/maps/BattlePyramidSquare10/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare10.inc b/data/maps/BattlePyramidSquare10/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare10.inc rename to data/maps/BattlePyramidSquare10/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare11.inc rename to data/maps/BattlePyramidSquare11/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare11.inc b/data/maps/BattlePyramidSquare11/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare11.inc rename to data/maps/BattlePyramidSquare11/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare12.inc rename to data/maps/BattlePyramidSquare12/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare12.inc b/data/maps/BattlePyramidSquare12/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare12.inc rename to data/maps/BattlePyramidSquare12/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare13.inc rename to data/maps/BattlePyramidSquare13/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare13.inc b/data/maps/BattlePyramidSquare13/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare13.inc rename to data/maps/BattlePyramidSquare13/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare14.inc rename to data/maps/BattlePyramidSquare14/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare14.inc b/data/maps/BattlePyramidSquare14/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare14.inc rename to data/maps/BattlePyramidSquare14/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare15.inc rename to data/maps/BattlePyramidSquare15/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare15.inc b/data/maps/BattlePyramidSquare15/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare15.inc rename to data/maps/BattlePyramidSquare15/scripts.inc diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/events.inc similarity index 100% rename from data/maps/events/BattlePyramidSquare16.inc rename to data/maps/BattlePyramidSquare16/events.inc diff --git a/data/scripts/maps/BattlePyramidSquare16.inc b/data/maps/BattlePyramidSquare16/scripts.inc similarity index 100% rename from data/scripts/maps/BattlePyramidSquare16.inc rename to data/maps/BattlePyramidSquare16/scripts.inc diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/BirthIsland_Exterior.inc rename to data/maps/BirthIsland_Exterior/events.inc diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/maps/BirthIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/BirthIsland_Exterior.inc rename to data/maps/BirthIsland_Exterior/scripts.inc diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/events.inc similarity index 100% rename from data/maps/events/BirthIsland_Harbor.inc rename to data/maps/BirthIsland_Harbor/events.inc diff --git a/data/scripts/maps/BirthIsland_Harbor.inc b/data/maps/BirthIsland_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/BirthIsland_Harbor.inc rename to data/maps/BirthIsland_Harbor/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_1F.inc rename to data/maps/CaveOfOrigin_1F/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_B1F.inc rename to data/maps/CaveOfOrigin_B1F/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_Entrance.inc rename to data/maps/CaveOfOrigin_Entrance/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap1.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap1.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap2.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap2.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc diff --git a/data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc similarity index 100% rename from data/maps/events/CaveOfOrigin_UnusedRubySapphireMap3.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc diff --git a/data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc similarity index 100% rename from data/scripts/maps/CaveOfOrigin_UnusedRubySapphireMap3.inc rename to data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc diff --git a/data/maps/events/DesertRuins.inc b/data/maps/DesertRuins/events.inc similarity index 100% rename from data/maps/events/DesertRuins.inc rename to data/maps/DesertRuins/events.inc diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc similarity index 100% rename from data/scripts/maps/DesertRuins.inc rename to data/maps/DesertRuins/scripts.inc diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/DesertUnderpass/events.inc similarity index 100% rename from data/maps/events/DesertUnderpass.inc rename to data/maps/DesertUnderpass/events.inc diff --git a/data/scripts/maps/DesertUnderpass.inc b/data/maps/DesertUnderpass/scripts.inc similarity index 100% rename from data/scripts/maps/DesertUnderpass.inc rename to data/maps/DesertUnderpass/scripts.inc diff --git a/data/maps/events/DewfordTown.inc b/data/maps/DewfordTown/events.inc similarity index 100% rename from data/maps/events/DewfordTown.inc rename to data/maps/DewfordTown/events.inc diff --git a/data/scripts/maps/DewfordTown.inc b/data/maps/DewfordTown/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown.inc rename to data/maps/DewfordTown/scripts.inc diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/events.inc diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Gym.inc rename to data/maps/DewfordTown_Gym/scripts.inc diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/events.inc similarity index 100% rename from data/maps/events/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/events.inc diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_Hall.inc rename to data/maps/DewfordTown_Hall/scripts.inc diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/events.inc diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House1.inc rename to data/maps/DewfordTown_House1/scripts.inc diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/events.inc similarity index 100% rename from data/maps/events/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/events.inc diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_House2.inc rename to data/maps/DewfordTown_House2/scripts.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_1F.inc rename to data/maps/DewfordTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/DewfordTown_PokemonCenter_2F.inc rename to data/maps/DewfordTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/events.inc diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/DoubleBattleColosseum.inc rename to data/maps/DoubleBattleColosseum/scripts.inc diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity.inc rename to data/maps/EverGrandeCity/events.inc diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity.inc rename to data/maps/EverGrandeCity/scripts.inc diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_ChampionsRoom.inc rename to data/maps/EverGrandeCity_ChampionsRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_DrakesRoom.inc rename to data/maps/EverGrandeCity_DrakesRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_GlaciasRoom.inc rename to data/maps/EverGrandeCity_GlaciasRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall1.inc rename to data/maps/EverGrandeCity_Hall1/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall1.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall1.inc rename to data/maps/EverGrandeCity_Hall1/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall2.inc rename to data/maps/EverGrandeCity_Hall2/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall2.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall2.inc rename to data/maps/EverGrandeCity_Hall2/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall3.inc rename to data/maps/EverGrandeCity_Hall3/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall3.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall3.inc rename to data/maps/EverGrandeCity_Hall3/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall4.inc rename to data/maps/EverGrandeCity_Hall4/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall4.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall4.inc rename to data/maps/EverGrandeCity_Hall4/scripts.inc diff --git a/data/maps/events/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_Hall5.inc rename to data/maps/EverGrandeCity_Hall5/events.inc diff --git a/data/scripts/maps/EverGrandeCity_Hall5.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_Hall5.inc rename to data/maps/EverGrandeCity_Hall5/scripts.inc diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/events.inc diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_HallOfFame.inc rename to data/maps/EverGrandeCity_HallOfFame/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PhoebesRoom.inc rename to data/maps/EverGrandeCity_PhoebesRoom/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc rename to data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc rename to data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague_1F.inc rename to data/maps/EverGrandeCity_PokemonLeague_1F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc rename to data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_PokemonLeague_2F.inc rename to data/maps/EverGrandeCity_PokemonLeague_2F/events.inc diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_PokemonLeague_2F.inc rename to data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc similarity index 100% rename from data/maps/events/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/events.inc diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc similarity index 100% rename from data/scripts/maps/EverGrandeCity_SidneysRoom.inc rename to data/maps/EverGrandeCity_SidneysRoom/scripts.inc diff --git a/data/maps/events/FallarborTown.inc b/data/maps/FallarborTown/events.inc similarity index 100% rename from data/maps/events/FallarborTown.inc rename to data/maps/FallarborTown/events.inc diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown.inc rename to data/maps/FallarborTown/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentBattleRoom.inc rename to data/maps/FallarborTown_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc rename to data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentCorridor.inc rename to data/maps/FallarborTown_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentCorridor.inc rename to data/maps/FallarborTown_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/FallarborTown_BattleTentLobby.inc rename to data/maps/FallarborTown_BattleTentLobby/events.inc diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_BattleTentLobby.inc rename to data/maps/FallarborTown_BattleTentLobby/scripts.inc diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/events.inc diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House1.inc rename to data/maps/FallarborTown_House1/scripts.inc diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/events.inc similarity index 100% rename from data/maps/events/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/events.inc diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_House2.inc rename to data/maps/FallarborTown_House2/scripts.inc diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/events.inc similarity index 100% rename from data/maps/events/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/events.inc diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_Mart.inc rename to data/maps/FallarborTown_Mart/scripts.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_1F.inc rename to data/maps/FallarborTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FallarborTown_PokemonCenter_2F.inc rename to data/maps/FallarborTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/events.inc similarity index 100% rename from data/maps/events/FarawayIsland_Entrance.inc rename to data/maps/FarawayIsland_Entrance/events.inc diff --git a/data/scripts/maps/FarawayIsland_Entrance.inc b/data/maps/FarawayIsland_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/FarawayIsland_Entrance.inc rename to data/maps/FarawayIsland_Entrance/scripts.inc diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/events.inc similarity index 100% rename from data/maps/events/FarawayIsland_Interior.inc rename to data/maps/FarawayIsland_Interior/events.inc diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/maps/FarawayIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/FarawayIsland_Interior.inc rename to data/maps/FarawayIsland_Interior/scripts.inc diff --git a/data/maps/events/FieryPath.inc b/data/maps/FieryPath/events.inc similarity index 100% rename from data/maps/events/FieryPath.inc rename to data/maps/FieryPath/events.inc diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc similarity index 100% rename from data/scripts/maps/FieryPath.inc rename to data/maps/FieryPath/scripts.inc diff --git a/data/maps/events/FortreeCity.inc b/data/maps/FortreeCity/events.inc similarity index 100% rename from data/maps/events/FortreeCity.inc rename to data/maps/FortreeCity/events.inc diff --git a/data/scripts/maps/FortreeCity.inc b/data/maps/FortreeCity/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity.inc rename to data/maps/FortreeCity/scripts.inc diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/events.inc similarity index 100% rename from data/maps/events/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/events.inc diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_DecorationShop.inc rename to data/maps/FortreeCity_DecorationShop/scripts.inc diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/events.inc diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Gym.inc rename to data/maps/FortreeCity_Gym/scripts.inc diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/events.inc diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House1.inc rename to data/maps/FortreeCity_House1/scripts.inc diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/events.inc diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House2.inc rename to data/maps/FortreeCity_House2/scripts.inc diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/events.inc diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House3.inc rename to data/maps/FortreeCity_House3/scripts.inc diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/events.inc diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House4.inc rename to data/maps/FortreeCity_House4/scripts.inc diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/events.inc similarity index 100% rename from data/maps/events/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/events.inc diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_House5.inc rename to data/maps/FortreeCity_House5/scripts.inc diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/events.inc similarity index 100% rename from data/maps/events/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/events.inc diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_Mart.inc rename to data/maps/FortreeCity_Mart/scripts.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_1F.inc rename to data/maps/FortreeCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/FortreeCity_PokemonCenter_2F.inc rename to data/maps/FortreeCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/events.inc diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_1F.inc rename to data/maps/GraniteCave_1F/scripts.inc diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/events.inc diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B1F.inc rename to data/maps/GraniteCave_B1F/scripts.inc diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/events.inc similarity index 100% rename from data/maps/events/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/events.inc diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_B2F.inc rename to data/maps/GraniteCave_B2F/scripts.inc diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/events.inc similarity index 100% rename from data/maps/events/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/events.inc diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc similarity index 100% rename from data/scripts/maps/GraniteCave_StevensRoom.inc rename to data/maps/GraniteCave_StevensRoom/scripts.inc diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/InsideOfTruck/events.inc similarity index 100% rename from data/maps/events/InsideOfTruck.inc rename to data/maps/InsideOfTruck/events.inc diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc similarity index 100% rename from data/scripts/maps/InsideOfTruck.inc rename to data/maps/InsideOfTruck/scripts.inc diff --git a/data/maps/events/IslandCave.inc b/data/maps/IslandCave/events.inc similarity index 100% rename from data/maps/events/IslandCave.inc rename to data/maps/IslandCave/events.inc diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc similarity index 100% rename from data/scripts/maps/IslandCave.inc rename to data/maps/IslandCave/scripts.inc diff --git a/data/maps/events/JaggedPass.inc b/data/maps/JaggedPass/events.inc similarity index 100% rename from data/maps/events/JaggedPass.inc rename to data/maps/JaggedPass/events.inc diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc similarity index 100% rename from data/scripts/maps/JaggedPass.inc rename to data/maps/JaggedPass/scripts.inc diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/LavaridgeTown/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown.inc rename to data/maps/LavaridgeTown/events.inc diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown.inc rename to data/maps/LavaridgeTown/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_1F.inc rename to data/maps/LavaridgeTown_Gym_1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Gym_B1F.inc rename to data/maps/LavaridgeTown_Gym_B1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/events.inc diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_HerbShop.inc rename to data/maps/LavaridgeTown_HerbShop/scripts.inc diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/events.inc diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_House.inc rename to data/maps/LavaridgeTown_House/scripts.inc diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/events.inc diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_Mart.inc rename to data/maps/LavaridgeTown_Mart/scripts.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc rename to data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc rename to data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/LilycoveCity/events.inc similarity index 100% rename from data/maps/events/LilycoveCity.inc rename to data/maps/LilycoveCity/events.inc diff --git a/data/scripts/maps/LilycoveCity.inc b/data/maps/LilycoveCity/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity.inc rename to data/maps/LilycoveCity/scripts.inc diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/events.inc diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestHall.inc rename to data/maps/LilycoveCity_ContestHall/scripts.inc diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/events.inc diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_ContestLobby.inc rename to data/maps/LilycoveCity_ContestLobby/scripts.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc rename to data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc rename to data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc rename to data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc rename to data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc rename to data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc rename to data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc rename to data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/events.inc diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc rename to data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/events.inc diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_Harbor.inc rename to data/maps/LilycoveCity_Harbor/scripts.inc diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/events.inc diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House1.inc rename to data/maps/LilycoveCity_House1/scripts.inc diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/events.inc diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House2.inc rename to data/maps/LilycoveCity_House2/scripts.inc diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/events.inc diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House3.inc rename to data/maps/LilycoveCity_House3/scripts.inc diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/events.inc diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_House4.inc rename to data/maps/LilycoveCity_House4/scripts.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc rename to data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/events.inc diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc rename to data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc rename to data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc rename to data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc rename to data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc similarity index 100% rename from data/maps/events/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/events.inc diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc similarity index 100% rename from data/scripts/maps/LilycoveCity_UnusedMart.inc rename to data/maps/LilycoveCity_UnusedMart/scripts.inc diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/events.inc diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom1.inc rename to data/maps/LinkContestRoom1/scripts.inc diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/events.inc diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom2.inc rename to data/maps/LinkContestRoom2/scripts.inc diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/events.inc diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom3.inc rename to data/maps/LinkContestRoom3/scripts.inc diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/events.inc diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom4.inc rename to data/maps/LinkContestRoom4/scripts.inc diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/events.inc diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom5.inc rename to data/maps/LinkContestRoom5/scripts.inc diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc similarity index 100% rename from data/maps/events/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/events.inc diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc similarity index 100% rename from data/scripts/maps/LinkContestRoom6.inc rename to data/maps/LinkContestRoom6/scripts.inc diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/LittlerootTown/events.inc similarity index 100% rename from data/maps/events/LittlerootTown.inc rename to data/maps/LittlerootTown/events.inc diff --git a/data/scripts/maps/LittlerootTown.inc b/data/maps/LittlerootTown/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown.inc rename to data/maps/LittlerootTown/scripts.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/events.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc rename to data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/events.inc diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc rename to data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/events.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_1F.inc rename to data/maps/LittlerootTown_MaysHouse_1F/scripts.inc diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/events.inc diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_MaysHouse_2F.inc rename to data/maps/LittlerootTown_MaysHouse_2F/scripts.inc diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc similarity index 100% rename from data/maps/events/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/events.inc diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc similarity index 100% rename from data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc rename to data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/events.inc diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_1F.inc rename to data/maps/MagmaHideout_1F/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_1R.inc rename to data/maps/MagmaHideout_2F_1R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_1R.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_1R.inc rename to data/maps/MagmaHideout_2F_1R/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_2R.inc rename to data/maps/MagmaHideout_2F_2R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_2R.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_2R.inc rename to data/maps/MagmaHideout_2F_2R/scripts.inc diff --git a/data/maps/events/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_2F_3R.inc rename to data/maps/MagmaHideout_2F_3R/events.inc diff --git a/data/scripts/maps/MagmaHideout_2F_3R.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_2F_3R.inc rename to data/maps/MagmaHideout_2F_3R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_1R.inc rename to data/maps/MagmaHideout_3F_1R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_1R.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_1R.inc rename to data/maps/MagmaHideout_3F_1R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_2R.inc rename to data/maps/MagmaHideout_3F_2R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_2R.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_2R.inc rename to data/maps/MagmaHideout_3F_2R/scripts.inc diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_3F_3R.inc rename to data/maps/MagmaHideout_3F_3R/events.inc diff --git a/data/scripts/maps/MagmaHideout_3F_3R.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_3F_3R.inc rename to data/maps/MagmaHideout_3F_3R/scripts.inc diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/events.inc similarity index 100% rename from data/maps/events/MagmaHideout_4F.inc rename to data/maps/MagmaHideout_4F/events.inc diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/maps/MagmaHideout_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MagmaHideout_4F.inc rename to data/maps/MagmaHideout_4F/scripts.inc diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/MarineCave_End/events.inc similarity index 100% rename from data/maps/events/MarineCave_End.inc rename to data/maps/MarineCave_End/events.inc diff --git a/data/scripts/maps/MarineCave_End.inc b/data/maps/MarineCave_End/scripts.inc similarity index 100% rename from data/scripts/maps/MarineCave_End.inc rename to data/maps/MarineCave_End/scripts.inc diff --git a/data/maps/events/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/events.inc similarity index 100% rename from data/maps/events/MarineCave_Entrance.inc rename to data/maps/MarineCave_Entrance/events.inc diff --git a/data/scripts/maps/MarineCave_Entrance.inc b/data/maps/MarineCave_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/MarineCave_Entrance.inc rename to data/maps/MarineCave_Entrance/scripts.inc diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/MauvilleCity/events.inc similarity index 100% rename from data/maps/events/MauvilleCity.inc rename to data/maps/MauvilleCity/events.inc diff --git a/data/scripts/maps/MauvilleCity.inc b/data/maps/MauvilleCity/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity.inc rename to data/maps/MauvilleCity/scripts.inc diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/events.inc diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_BikeShop.inc rename to data/maps/MauvilleCity_BikeShop/scripts.inc diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/events.inc diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_GameCorner.inc rename to data/maps/MauvilleCity_GameCorner/scripts.inc diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/events.inc diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Gym.inc rename to data/maps/MauvilleCity_Gym/scripts.inc diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/events.inc diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House1.inc rename to data/maps/MauvilleCity_House1/scripts.inc diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/events.inc diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_House2.inc rename to data/maps/MauvilleCity_House2/scripts.inc diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/events.inc diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_Mart.inc rename to data/maps/MauvilleCity_Mart/scripts.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc rename to data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc rename to data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/events.inc diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_1R.inc rename to data/maps/MeteorFalls_1F_1R/scripts.inc diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/events.inc diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_1F_2R.inc rename to data/maps/MeteorFalls_1F_2R/scripts.inc diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/events.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_1R.inc rename to data/maps/MeteorFalls_B1F_1R/scripts.inc diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/events.inc diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_B1F_2R.inc rename to data/maps/MeteorFalls_B1F_2R/scripts.inc diff --git a/data/maps/events/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/events.inc similarity index 100% rename from data/maps/events/MeteorFalls_StevensCave.inc rename to data/maps/MeteorFalls_StevensCave/events.inc diff --git a/data/scripts/maps/MeteorFalls_StevensCave.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc similarity index 100% rename from data/scripts/maps/MeteorFalls_StevensCave.inc rename to data/maps/MeteorFalls_StevensCave/scripts.inc diff --git a/data/maps/events/MirageTower_1F.inc b/data/maps/MirageTower_1F/events.inc similarity index 100% rename from data/maps/events/MirageTower_1F.inc rename to data/maps/MirageTower_1F/events.inc diff --git a/data/scripts/maps/MirageTower_1F.inc b/data/maps/MirageTower_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_1F.inc rename to data/maps/MirageTower_1F/scripts.inc diff --git a/data/maps/events/MirageTower_2F.inc b/data/maps/MirageTower_2F/events.inc similarity index 100% rename from data/maps/events/MirageTower_2F.inc rename to data/maps/MirageTower_2F/events.inc diff --git a/data/scripts/maps/MirageTower_2F.inc b/data/maps/MirageTower_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_2F.inc rename to data/maps/MirageTower_2F/scripts.inc diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/MirageTower_3F/events.inc similarity index 100% rename from data/maps/events/MirageTower_3F.inc rename to data/maps/MirageTower_3F/events.inc diff --git a/data/scripts/maps/MirageTower_3F.inc b/data/maps/MirageTower_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_3F.inc rename to data/maps/MirageTower_3F/scripts.inc diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/MirageTower_4F/events.inc similarity index 100% rename from data/maps/events/MirageTower_4F.inc rename to data/maps/MirageTower_4F/events.inc diff --git a/data/scripts/maps/MirageTower_4F.inc b/data/maps/MirageTower_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MirageTower_4F.inc rename to data/maps/MirageTower_4F/scripts.inc diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/MossdeepCity/events.inc similarity index 100% rename from data/maps/events/MossdeepCity.inc rename to data/maps/MossdeepCity/events.inc diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity.inc rename to data/maps/MossdeepCity/scripts.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_1F.inc rename to data/maps/MossdeepCity_GameCorner_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_GameCorner_B1F.inc rename to data/maps/MossdeepCity_GameCorner_B1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/events.inc diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Gym.inc rename to data/maps/MossdeepCity_Gym/scripts.inc diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/events.inc diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House1.inc rename to data/maps/MossdeepCity_House1/scripts.inc diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/events.inc diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House2.inc rename to data/maps/MossdeepCity_House2/scripts.inc diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/events.inc diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House3.inc rename to data/maps/MossdeepCity_House3/scripts.inc diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/events.inc diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_House4.inc rename to data/maps/MossdeepCity_House4/scripts.inc diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/events.inc diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_Mart.inc rename to data/maps/MossdeepCity_Mart/scripts.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc rename to data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc rename to data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/events.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc rename to data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/events.inc diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc rename to data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/events.inc similarity index 100% rename from data/maps/events/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/events.inc diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc similarity index 100% rename from data/scripts/maps/MossdeepCity_StevensHouse.inc rename to data/maps/MossdeepCity_StevensHouse/scripts.inc diff --git a/data/maps/events/MtChimney.inc b/data/maps/MtChimney/events.inc similarity index 100% rename from data/maps/events/MtChimney.inc rename to data/maps/MtChimney/events.inc diff --git a/data/scripts/maps/MtChimney.inc b/data/maps/MtChimney/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney.inc rename to data/maps/MtChimney/scripts.inc diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/events.inc similarity index 100% rename from data/maps/events/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/events.inc diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/MtChimney_CableCarStation.inc rename to data/maps/MtChimney_CableCarStation/scripts.inc diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/MtPyre_1F/events.inc similarity index 100% rename from data/maps/events/MtPyre_1F.inc rename to data/maps/MtPyre_1F/events.inc diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_1F.inc rename to data/maps/MtPyre_1F/scripts.inc diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/MtPyre_2F/events.inc similarity index 100% rename from data/maps/events/MtPyre_2F.inc rename to data/maps/MtPyre_2F/events.inc diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_2F.inc rename to data/maps/MtPyre_2F/scripts.inc diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/MtPyre_3F/events.inc similarity index 100% rename from data/maps/events/MtPyre_3F.inc rename to data/maps/MtPyre_3F/events.inc diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_3F.inc rename to data/maps/MtPyre_3F/scripts.inc diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/MtPyre_4F/events.inc similarity index 100% rename from data/maps/events/MtPyre_4F.inc rename to data/maps/MtPyre_4F/events.inc diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_4F.inc rename to data/maps/MtPyre_4F/scripts.inc diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/MtPyre_5F/events.inc similarity index 100% rename from data/maps/events/MtPyre_5F.inc rename to data/maps/MtPyre_5F/events.inc diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_5F.inc rename to data/maps/MtPyre_5F/scripts.inc diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/MtPyre_6F/events.inc similarity index 100% rename from data/maps/events/MtPyre_6F.inc rename to data/maps/MtPyre_6F/events.inc diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_6F.inc rename to data/maps/MtPyre_6F/scripts.inc diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/events.inc similarity index 100% rename from data/maps/events/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/events.inc diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Exterior.inc rename to data/maps/MtPyre_Exterior/scripts.inc diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/events.inc similarity index 100% rename from data/maps/events/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/events.inc diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/maps/MtPyre_Summit/scripts.inc similarity index 100% rename from data/scripts/maps/MtPyre_Summit.inc rename to data/maps/MtPyre_Summit/scripts.inc diff --git a/data/maps/events/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/events.inc similarity index 100% rename from data/maps/events/NavelRock_B1F.inc rename to data/maps/NavelRock_B1F/events.inc diff --git a/data/scripts/maps/NavelRock_B1F.inc b/data/maps/NavelRock_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_B1F.inc rename to data/maps/NavelRock_B1F/scripts.inc diff --git a/data/maps/events/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/events.inc similarity index 100% rename from data/maps/events/NavelRock_Bottom.inc rename to data/maps/NavelRock_Bottom/events.inc diff --git a/data/scripts/maps/NavelRock_Bottom.inc b/data/maps/NavelRock_Bottom/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Bottom.inc rename to data/maps/NavelRock_Bottom/scripts.inc diff --git a/data/maps/events/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down01.inc rename to data/maps/NavelRock_Down01/events.inc diff --git a/data/scripts/maps/NavelRock_Down01.inc b/data/maps/NavelRock_Down01/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down01.inc rename to data/maps/NavelRock_Down01/scripts.inc diff --git a/data/maps/events/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down02.inc rename to data/maps/NavelRock_Down02/events.inc diff --git a/data/scripts/maps/NavelRock_Down02.inc b/data/maps/NavelRock_Down02/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down02.inc rename to data/maps/NavelRock_Down02/scripts.inc diff --git a/data/maps/events/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down03.inc rename to data/maps/NavelRock_Down03/events.inc diff --git a/data/scripts/maps/NavelRock_Down03.inc b/data/maps/NavelRock_Down03/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down03.inc rename to data/maps/NavelRock_Down03/scripts.inc diff --git a/data/maps/events/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down04.inc rename to data/maps/NavelRock_Down04/events.inc diff --git a/data/scripts/maps/NavelRock_Down04.inc b/data/maps/NavelRock_Down04/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down04.inc rename to data/maps/NavelRock_Down04/scripts.inc diff --git a/data/maps/events/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down05.inc rename to data/maps/NavelRock_Down05/events.inc diff --git a/data/scripts/maps/NavelRock_Down05.inc b/data/maps/NavelRock_Down05/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down05.inc rename to data/maps/NavelRock_Down05/scripts.inc diff --git a/data/maps/events/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down06.inc rename to data/maps/NavelRock_Down06/events.inc diff --git a/data/scripts/maps/NavelRock_Down06.inc b/data/maps/NavelRock_Down06/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down06.inc rename to data/maps/NavelRock_Down06/scripts.inc diff --git a/data/maps/events/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down07.inc rename to data/maps/NavelRock_Down07/events.inc diff --git a/data/scripts/maps/NavelRock_Down07.inc b/data/maps/NavelRock_Down07/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down07.inc rename to data/maps/NavelRock_Down07/scripts.inc diff --git a/data/maps/events/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down08.inc rename to data/maps/NavelRock_Down08/events.inc diff --git a/data/scripts/maps/NavelRock_Down08.inc b/data/maps/NavelRock_Down08/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down08.inc rename to data/maps/NavelRock_Down08/scripts.inc diff --git a/data/maps/events/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down09.inc rename to data/maps/NavelRock_Down09/events.inc diff --git a/data/scripts/maps/NavelRock_Down09.inc b/data/maps/NavelRock_Down09/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down09.inc rename to data/maps/NavelRock_Down09/scripts.inc diff --git a/data/maps/events/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down10.inc rename to data/maps/NavelRock_Down10/events.inc diff --git a/data/scripts/maps/NavelRock_Down10.inc b/data/maps/NavelRock_Down10/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down10.inc rename to data/maps/NavelRock_Down10/scripts.inc diff --git a/data/maps/events/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/events.inc similarity index 100% rename from data/maps/events/NavelRock_Down11.inc rename to data/maps/NavelRock_Down11/events.inc diff --git a/data/scripts/maps/NavelRock_Down11.inc b/data/maps/NavelRock_Down11/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Down11.inc rename to data/maps/NavelRock_Down11/scripts.inc diff --git a/data/maps/events/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/events.inc similarity index 100% rename from data/maps/events/NavelRock_Entrance.inc rename to data/maps/NavelRock_Entrance/events.inc diff --git a/data/scripts/maps/NavelRock_Entrance.inc b/data/maps/NavelRock_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Entrance.inc rename to data/maps/NavelRock_Entrance/scripts.inc diff --git a/data/maps/events/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/events.inc similarity index 100% rename from data/maps/events/NavelRock_Exterior.inc rename to data/maps/NavelRock_Exterior/events.inc diff --git a/data/scripts/maps/NavelRock_Exterior.inc b/data/maps/NavelRock_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Exterior.inc rename to data/maps/NavelRock_Exterior/scripts.inc diff --git a/data/maps/events/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/events.inc similarity index 100% rename from data/maps/events/NavelRock_Fork.inc rename to data/maps/NavelRock_Fork/events.inc diff --git a/data/scripts/maps/NavelRock_Fork.inc b/data/maps/NavelRock_Fork/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Fork.inc rename to data/maps/NavelRock_Fork/scripts.inc diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/events.inc similarity index 100% rename from data/maps/events/NavelRock_Harbor.inc rename to data/maps/NavelRock_Harbor/events.inc diff --git a/data/scripts/maps/NavelRock_Harbor.inc b/data/maps/NavelRock_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Harbor.inc rename to data/maps/NavelRock_Harbor/scripts.inc diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/NavelRock_Top/events.inc similarity index 100% rename from data/maps/events/NavelRock_Top.inc rename to data/maps/NavelRock_Top/events.inc diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/maps/NavelRock_Top/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Top.inc rename to data/maps/NavelRock_Top/scripts.inc diff --git a/data/maps/events/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up1.inc rename to data/maps/NavelRock_Up1/events.inc diff --git a/data/scripts/maps/NavelRock_Up1.inc b/data/maps/NavelRock_Up1/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up1.inc rename to data/maps/NavelRock_Up1/scripts.inc diff --git a/data/maps/events/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up2.inc rename to data/maps/NavelRock_Up2/events.inc diff --git a/data/scripts/maps/NavelRock_Up2.inc b/data/maps/NavelRock_Up2/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up2.inc rename to data/maps/NavelRock_Up2/scripts.inc diff --git a/data/maps/events/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up3.inc rename to data/maps/NavelRock_Up3/events.inc diff --git a/data/scripts/maps/NavelRock_Up3.inc b/data/maps/NavelRock_Up3/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up3.inc rename to data/maps/NavelRock_Up3/scripts.inc diff --git a/data/maps/events/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/events.inc similarity index 100% rename from data/maps/events/NavelRock_Up4.inc rename to data/maps/NavelRock_Up4/events.inc diff --git a/data/scripts/maps/NavelRock_Up4.inc b/data/maps/NavelRock_Up4/scripts.inc similarity index 100% rename from data/scripts/maps/NavelRock_Up4.inc rename to data/maps/NavelRock_Up4/scripts.inc diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc similarity index 100% rename from data/maps/events/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/events.inc diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Entrance.inc rename to data/maps/NewMauville_Entrance/scripts.inc diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/events.inc similarity index 100% rename from data/maps/events/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/events.inc diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc similarity index 100% rename from data/scripts/maps/NewMauville_Inside.inc rename to data/maps/NewMauville_Inside/scripts.inc diff --git a/data/maps/events/OldaleTown.inc b/data/maps/OldaleTown/events.inc similarity index 100% rename from data/maps/events/OldaleTown.inc rename to data/maps/OldaleTown/events.inc diff --git a/data/scripts/maps/OldaleTown.inc b/data/maps/OldaleTown/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown.inc rename to data/maps/OldaleTown/scripts.inc diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/events.inc diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House1.inc rename to data/maps/OldaleTown_House1/scripts.inc diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/events.inc similarity index 100% rename from data/maps/events/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/events.inc diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_House2.inc rename to data/maps/OldaleTown_House2/scripts.inc diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/events.inc similarity index 100% rename from data/maps/events/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/events.inc diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_Mart.inc rename to data/maps/OldaleTown_Mart/scripts.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_1F.inc rename to data/maps/OldaleTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/OldaleTown_PokemonCenter_2F.inc rename to data/maps/OldaleTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/PacifidlogTown/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown.inc rename to data/maps/PacifidlogTown/events.inc diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown.inc rename to data/maps/PacifidlogTown/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House1.inc rename to data/maps/PacifidlogTown_House1/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House2.inc rename to data/maps/PacifidlogTown_House2/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House3.inc rename to data/maps/PacifidlogTown_House3/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House4.inc rename to data/maps/PacifidlogTown_House4/scripts.inc diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/events.inc diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_House5.inc rename to data/maps/PacifidlogTown_House5/scripts.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc rename to data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc rename to data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/PetalburgCity/events.inc similarity index 100% rename from data/maps/events/PetalburgCity.inc rename to data/maps/PetalburgCity/events.inc diff --git a/data/scripts/maps/PetalburgCity.inc b/data/maps/PetalburgCity/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity.inc rename to data/maps/PetalburgCity/scripts.inc diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/events.inc diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Gym.inc rename to data/maps/PetalburgCity_Gym/scripts.inc diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/events.inc diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House1.inc rename to data/maps/PetalburgCity_House1/scripts.inc diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/events.inc diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_House2.inc rename to data/maps/PetalburgCity_House2/scripts.inc diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/events.inc diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_Mart.inc rename to data/maps/PetalburgCity_Mart/scripts.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc rename to data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc rename to data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/events.inc similarity index 100% rename from data/maps/events/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/events.inc diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgCity_WallysHouse.inc rename to data/maps/PetalburgCity_WallysHouse/scripts.inc diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/PetalburgWoods/events.inc similarity index 100% rename from data/maps/events/PetalburgWoods.inc rename to data/maps/PetalburgWoods/events.inc diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/scripts.inc similarity index 100% rename from data/scripts/maps/PetalburgWoods.inc rename to data/maps/PetalburgWoods/scripts.inc diff --git a/data/maps/events/RecordCorner.inc b/data/maps/RecordCorner/events.inc similarity index 100% rename from data/maps/events/RecordCorner.inc rename to data/maps/RecordCorner/events.inc diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc similarity index 100% rename from data/scripts/maps/RecordCorner.inc rename to data/maps/RecordCorner/scripts.inc diff --git a/data/maps/events/Route101.inc b/data/maps/Route101/events.inc similarity index 100% rename from data/maps/events/Route101.inc rename to data/maps/Route101/events.inc diff --git a/data/scripts/maps/Route101.inc b/data/maps/Route101/scripts.inc similarity index 100% rename from data/scripts/maps/Route101.inc rename to data/maps/Route101/scripts.inc diff --git a/data/maps/events/Route102.inc b/data/maps/Route102/events.inc similarity index 100% rename from data/maps/events/Route102.inc rename to data/maps/Route102/events.inc diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc similarity index 100% rename from data/scripts/maps/Route102.inc rename to data/maps/Route102/scripts.inc diff --git a/data/maps/events/Route103.inc b/data/maps/Route103/events.inc similarity index 100% rename from data/maps/events/Route103.inc rename to data/maps/Route103/events.inc diff --git a/data/scripts/maps/Route103.inc b/data/maps/Route103/scripts.inc similarity index 100% rename from data/scripts/maps/Route103.inc rename to data/maps/Route103/scripts.inc diff --git a/data/maps/events/Route104.inc b/data/maps/Route104/events.inc similarity index 100% rename from data/maps/events/Route104.inc rename to data/maps/Route104/events.inc diff --git a/data/scripts/maps/Route104.inc b/data/maps/Route104/scripts.inc similarity index 100% rename from data/scripts/maps/Route104.inc rename to data/maps/Route104/scripts.inc diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/events.inc similarity index 100% rename from data/maps/events/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/events.inc diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_MrBrineysHouse.inc rename to data/maps/Route104_MrBrineysHouse/scripts.inc diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/events.inc diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrettyPetalFlowerShop.inc rename to data/maps/Route104_PrettyPetalFlowerShop/scripts.inc diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/Route104_Prototype/events.inc similarity index 100% rename from data/maps/events/Route104_Prototype.inc rename to data/maps/Route104_Prototype/events.inc diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_Prototype.inc rename to data/maps/Route104_Prototype/scripts.inc diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc similarity index 100% rename from data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc similarity index 100% rename from data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc rename to data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc diff --git a/data/maps/events/Route105.inc b/data/maps/Route105/events.inc similarity index 100% rename from data/maps/events/Route105.inc rename to data/maps/Route105/events.inc diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc similarity index 100% rename from data/scripts/maps/Route105.inc rename to data/maps/Route105/scripts.inc diff --git a/data/maps/events/Route106.inc b/data/maps/Route106/events.inc similarity index 100% rename from data/maps/events/Route106.inc rename to data/maps/Route106/events.inc diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc similarity index 100% rename from data/scripts/maps/Route106.inc rename to data/maps/Route106/scripts.inc diff --git a/data/maps/events/Route107.inc b/data/maps/Route107/events.inc similarity index 100% rename from data/maps/events/Route107.inc rename to data/maps/Route107/events.inc diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc similarity index 100% rename from data/scripts/maps/Route107.inc rename to data/maps/Route107/scripts.inc diff --git a/data/maps/events/Route108.inc b/data/maps/Route108/events.inc similarity index 100% rename from data/maps/events/Route108.inc rename to data/maps/Route108/events.inc diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc similarity index 100% rename from data/scripts/maps/Route108.inc rename to data/maps/Route108/scripts.inc diff --git a/data/maps/events/Route109.inc b/data/maps/Route109/events.inc similarity index 100% rename from data/maps/events/Route109.inc rename to data/maps/Route109/events.inc diff --git a/data/scripts/maps/Route109.inc b/data/maps/Route109/scripts.inc similarity index 100% rename from data/scripts/maps/Route109.inc rename to data/maps/Route109/scripts.inc diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/events.inc similarity index 100% rename from data/maps/events/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/events.inc diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route109_SeashoreHouse.inc rename to data/maps/Route109_SeashoreHouse/scripts.inc diff --git a/data/maps/events/Route110.inc b/data/maps/Route110/events.inc similarity index 100% rename from data/maps/events/Route110.inc rename to data/maps/Route110/events.inc diff --git a/data/scripts/maps/Route110.inc b/data/maps/Route110/scripts.inc similarity index 100% rename from data/scripts/maps/Route110.inc rename to data/maps/Route110/scripts.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc similarity index 100% rename from data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc rename to data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseCorridor.inc rename to data/maps/Route110_TrickHouseCorridor/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEnd.inc rename to data/maps/Route110_TrickHouseEnd/scripts.inc diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/events.inc diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHouseEntrance.inc rename to data/maps/Route110_TrickHouseEntrance/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle1.inc rename to data/maps/Route110_TrickHousePuzzle1/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle2.inc rename to data/maps/Route110_TrickHousePuzzle2/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle3.inc rename to data/maps/Route110_TrickHousePuzzle3/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle4.inc rename to data/maps/Route110_TrickHousePuzzle4/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle5.inc rename to data/maps/Route110_TrickHousePuzzle5/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle6.inc rename to data/maps/Route110_TrickHousePuzzle6/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle7.inc rename to data/maps/Route110_TrickHousePuzzle7/scripts.inc diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc similarity index 100% rename from data/maps/events/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/events.inc diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc similarity index 100% rename from data/scripts/maps/Route110_TrickHousePuzzle8.inc rename to data/maps/Route110_TrickHousePuzzle8/scripts.inc diff --git a/data/maps/events/Route111.inc b/data/maps/Route111/events.inc similarity index 100% rename from data/maps/events/Route111.inc rename to data/maps/Route111/events.inc diff --git a/data/scripts/maps/Route111.inc b/data/maps/Route111/scripts.inc similarity index 100% rename from data/scripts/maps/Route111.inc rename to data/maps/Route111/scripts.inc diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/events.inc similarity index 100% rename from data/maps/events/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/events.inc diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_OldLadysRestStop.inc rename to data/maps/Route111_OldLadysRestStop/scripts.inc diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc similarity index 100% rename from data/maps/events/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/events.inc diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route111_WinstrateFamilysHouse.inc rename to data/maps/Route111_WinstrateFamilysHouse/scripts.inc diff --git a/data/maps/events/Route112.inc b/data/maps/Route112/events.inc similarity index 100% rename from data/maps/events/Route112.inc rename to data/maps/Route112/events.inc diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc similarity index 100% rename from data/scripts/maps/Route112.inc rename to data/maps/Route112/scripts.inc diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/events.inc similarity index 100% rename from data/maps/events/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/events.inc diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/scripts.inc similarity index 100% rename from data/scripts/maps/Route112_CableCarStation.inc rename to data/maps/Route112_CableCarStation/scripts.inc diff --git a/data/maps/events/Route113.inc b/data/maps/Route113/events.inc similarity index 100% rename from data/maps/events/Route113.inc rename to data/maps/Route113/events.inc diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc similarity index 100% rename from data/scripts/maps/Route113.inc rename to data/maps/Route113/scripts.inc diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/events.inc similarity index 100% rename from data/maps/events/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/events.inc diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc similarity index 100% rename from data/scripts/maps/Route113_GlassWorkshop.inc rename to data/maps/Route113_GlassWorkshop/scripts.inc diff --git a/data/maps/events/Route114.inc b/data/maps/Route114/events.inc similarity index 100% rename from data/maps/events/Route114.inc rename to data/maps/Route114/events.inc diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc similarity index 100% rename from data/scripts/maps/Route114.inc rename to data/maps/Route114/scripts.inc diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/events.inc diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsHouse.inc rename to data/maps/Route114_FossilManiacsHouse/scripts.inc diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc similarity index 100% rename from data/maps/events/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/events.inc diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_FossilManiacsTunnel.inc rename to data/maps/Route114_FossilManiacsTunnel/scripts.inc diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/events.inc similarity index 100% rename from data/maps/events/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/events.inc diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route114_LanettesHouse.inc rename to data/maps/Route114_LanettesHouse/scripts.inc diff --git a/data/maps/events/Route115.inc b/data/maps/Route115/events.inc similarity index 100% rename from data/maps/events/Route115.inc rename to data/maps/Route115/events.inc diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc similarity index 100% rename from data/scripts/maps/Route115.inc rename to data/maps/Route115/scripts.inc diff --git a/data/maps/events/Route116.inc b/data/maps/Route116/events.inc similarity index 100% rename from data/maps/events/Route116.inc rename to data/maps/Route116/events.inc diff --git a/data/scripts/maps/Route116.inc b/data/maps/Route116/scripts.inc similarity index 100% rename from data/scripts/maps/Route116.inc rename to data/maps/Route116/scripts.inc diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/events.inc similarity index 100% rename from data/maps/events/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/events.inc diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route116_TunnelersRestHouse.inc rename to data/maps/Route116_TunnelersRestHouse/scripts.inc diff --git a/data/maps/events/Route117.inc b/data/maps/Route117/events.inc similarity index 100% rename from data/maps/events/Route117.inc rename to data/maps/Route117/events.inc diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc similarity index 100% rename from data/scripts/maps/Route117.inc rename to data/maps/Route117/scripts.inc diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/events.inc similarity index 100% rename from data/maps/events/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/events.inc diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc similarity index 100% rename from data/scripts/maps/Route117_PokemonDayCare.inc rename to data/maps/Route117_PokemonDayCare/scripts.inc diff --git a/data/maps/events/Route118.inc b/data/maps/Route118/events.inc similarity index 100% rename from data/maps/events/Route118.inc rename to data/maps/Route118/events.inc diff --git a/data/scripts/maps/Route118.inc b/data/maps/Route118/scripts.inc similarity index 100% rename from data/scripts/maps/Route118.inc rename to data/maps/Route118/scripts.inc diff --git a/data/maps/events/Route119.inc b/data/maps/Route119/events.inc similarity index 100% rename from data/maps/events/Route119.inc rename to data/maps/Route119/events.inc diff --git a/data/scripts/maps/Route119.inc b/data/maps/Route119/scripts.inc similarity index 100% rename from data/scripts/maps/Route119.inc rename to data/maps/Route119/scripts.inc diff --git a/data/maps/events/Route119_House.inc b/data/maps/Route119_House/events.inc similarity index 100% rename from data/maps/events/Route119_House.inc rename to data/maps/Route119_House/events.inc diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_House.inc rename to data/maps/Route119_House/scripts.inc diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/events.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_1F.inc rename to data/maps/Route119_WeatherInstitute_1F/scripts.inc diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc similarity index 100% rename from data/maps/events/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/events.inc diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc similarity index 100% rename from data/scripts/maps/Route119_WeatherInstitute_2F.inc rename to data/maps/Route119_WeatherInstitute_2F/scripts.inc diff --git a/data/maps/events/Route120.inc b/data/maps/Route120/events.inc similarity index 100% rename from data/maps/events/Route120.inc rename to data/maps/Route120/events.inc diff --git a/data/scripts/maps/Route120.inc b/data/maps/Route120/scripts.inc similarity index 100% rename from data/scripts/maps/Route120.inc rename to data/maps/Route120/scripts.inc diff --git a/data/maps/events/Route121.inc b/data/maps/Route121/events.inc similarity index 100% rename from data/maps/events/Route121.inc rename to data/maps/Route121/events.inc diff --git a/data/scripts/maps/Route121.inc b/data/maps/Route121/scripts.inc similarity index 100% rename from data/scripts/maps/Route121.inc rename to data/maps/Route121/scripts.inc diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/events.inc similarity index 100% rename from data/maps/events/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/events.inc diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc similarity index 100% rename from data/scripts/maps/Route121_SafariZoneEntrance.inc rename to data/maps/Route121_SafariZoneEntrance/scripts.inc diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc similarity index 100% rename from data/maps/events/Route122.inc rename to data/maps/Route122/events.inc diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc similarity index 100% rename from data/scripts/maps/Route122.inc rename to data/maps/Route122/scripts.inc diff --git a/data/maps/events/Route123.inc b/data/maps/Route123/events.inc similarity index 100% rename from data/maps/events/Route123.inc rename to data/maps/Route123/events.inc diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc similarity index 100% rename from data/scripts/maps/Route123.inc rename to data/maps/Route123/scripts.inc diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/events.inc similarity index 100% rename from data/maps/events/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/events.inc diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route123_BerryMastersHouse.inc rename to data/maps/Route123_BerryMastersHouse/scripts.inc diff --git a/data/maps/events/Route124.inc b/data/maps/Route124/events.inc similarity index 100% rename from data/maps/events/Route124.inc rename to data/maps/Route124/events.inc diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc similarity index 100% rename from data/scripts/maps/Route124.inc rename to data/maps/Route124/scripts.inc diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc similarity index 100% rename from data/maps/events/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/events.inc diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc rename to data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc diff --git a/data/maps/events/Route125.inc b/data/maps/Route125/events.inc similarity index 100% rename from data/maps/events/Route125.inc rename to data/maps/Route125/events.inc diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc similarity index 100% rename from data/scripts/maps/Route125.inc rename to data/maps/Route125/scripts.inc diff --git a/data/maps/events/Route126.inc b/data/maps/Route126/events.inc similarity index 100% rename from data/maps/events/Route126.inc rename to data/maps/Route126/events.inc diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc similarity index 100% rename from data/scripts/maps/Route126.inc rename to data/maps/Route126/scripts.inc diff --git a/data/maps/events/Route127.inc b/data/maps/Route127/events.inc similarity index 100% rename from data/maps/events/Route127.inc rename to data/maps/Route127/events.inc diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc similarity index 100% rename from data/scripts/maps/Route127.inc rename to data/maps/Route127/scripts.inc diff --git a/data/maps/events/Route128.inc b/data/maps/Route128/events.inc similarity index 100% rename from data/maps/events/Route128.inc rename to data/maps/Route128/events.inc diff --git a/data/scripts/maps/Route128.inc b/data/maps/Route128/scripts.inc similarity index 100% rename from data/scripts/maps/Route128.inc rename to data/maps/Route128/scripts.inc diff --git a/data/maps/events/Route129.inc b/data/maps/Route129/events.inc similarity index 100% rename from data/maps/events/Route129.inc rename to data/maps/Route129/events.inc diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc similarity index 100% rename from data/scripts/maps/Route129.inc rename to data/maps/Route129/scripts.inc diff --git a/data/maps/events/Route130.inc b/data/maps/Route130/events.inc similarity index 100% rename from data/maps/events/Route130.inc rename to data/maps/Route130/events.inc diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc similarity index 100% rename from data/scripts/maps/Route130.inc rename to data/maps/Route130/scripts.inc diff --git a/data/maps/events/Route131.inc b/data/maps/Route131/events.inc similarity index 100% rename from data/maps/events/Route131.inc rename to data/maps/Route131/events.inc diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc similarity index 100% rename from data/scripts/maps/Route131.inc rename to data/maps/Route131/scripts.inc diff --git a/data/maps/events/Route132.inc b/data/maps/Route132/events.inc similarity index 100% rename from data/maps/events/Route132.inc rename to data/maps/Route132/events.inc diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc similarity index 100% rename from data/scripts/maps/Route132.inc rename to data/maps/Route132/scripts.inc diff --git a/data/maps/events/Route133.inc b/data/maps/Route133/events.inc similarity index 100% rename from data/maps/events/Route133.inc rename to data/maps/Route133/events.inc diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc similarity index 100% rename from data/scripts/maps/Route133.inc rename to data/maps/Route133/scripts.inc diff --git a/data/maps/events/Route134.inc b/data/maps/Route134/events.inc similarity index 100% rename from data/maps/events/Route134.inc rename to data/maps/Route134/events.inc diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Route134.inc rename to data/maps/Route134/scripts.inc diff --git a/data/maps/events/RustboroCity.inc b/data/maps/RustboroCity/events.inc similarity index 100% rename from data/maps/events/RustboroCity.inc rename to data/maps/RustboroCity/events.inc diff --git a/data/scripts/maps/RustboroCity.inc b/data/maps/RustboroCity/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity.inc rename to data/maps/RustboroCity/scripts.inc diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/events.inc similarity index 100% rename from data/maps/events/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/events.inc diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_CuttersHouse.inc rename to data/maps/RustboroCity_CuttersHouse/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_1F.inc rename to data/maps/RustboroCity_DevonCorp_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_2F.inc rename to data/maps/RustboroCity_DevonCorp_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/events.inc diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_DevonCorp_3F.inc rename to data/maps/RustboroCity_DevonCorp_3F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_1F.inc rename to data/maps/RustboroCity_Flat1_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat1_2F.inc rename to data/maps/RustboroCity_Flat1_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_1F.inc rename to data/maps/RustboroCity_Flat2_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_2F.inc rename to data/maps/RustboroCity_Flat2_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/events.inc diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Flat2_3F.inc rename to data/maps/RustboroCity_Flat2_3F/scripts.inc diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/events.inc diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Gym.inc rename to data/maps/RustboroCity_Gym/scripts.inc diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/events.inc diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House1.inc rename to data/maps/RustboroCity_House1/scripts.inc diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/events.inc diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House2.inc rename to data/maps/RustboroCity_House2/scripts.inc diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/events.inc similarity index 100% rename from data/maps/events/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/events.inc diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_House3.inc rename to data/maps/RustboroCity_House3/scripts.inc diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/events.inc similarity index 100% rename from data/maps/events/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/events.inc diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_Mart.inc rename to data/maps/RustboroCity_Mart/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_1F.inc rename to data/maps/RustboroCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonCenter_2F.inc rename to data/maps/RustboroCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/events.inc similarity index 100% rename from data/maps/events/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/events.inc diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc similarity index 100% rename from data/scripts/maps/RustboroCity_PokemonSchool.inc rename to data/maps/RustboroCity_PokemonSchool/scripts.inc diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/RusturfTunnel/events.inc similarity index 100% rename from data/maps/events/RusturfTunnel.inc rename to data/maps/RusturfTunnel/events.inc diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/scripts.inc similarity index 100% rename from data/scripts/maps/RusturfTunnel.inc rename to data/maps/RusturfTunnel/scripts.inc diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/events.inc similarity index 100% rename from data/maps/events/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/events.inc diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalCorridor.inc rename to data/maps/SSTidalCorridor/scripts.inc diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/events.inc similarity index 100% rename from data/maps/events/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/events.inc diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalLowerDeck.inc rename to data/maps/SSTidalLowerDeck/scripts.inc diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/SSTidalRooms/events.inc similarity index 100% rename from data/maps/events/SSTidalRooms.inc rename to data/maps/SSTidalRooms/events.inc diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc similarity index 100% rename from data/scripts/maps/SSTidalRooms.inc rename to data/maps/SSTidalRooms/scripts.inc diff --git a/data/maps/events/SafariZone_North.inc b/data/maps/SafariZone_North/events.inc similarity index 100% rename from data/maps/events/SafariZone_North.inc rename to data/maps/SafariZone_North/events.inc diff --git a/data/scripts/maps/SafariZone_North.inc b/data/maps/SafariZone_North/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_North.inc rename to data/maps/SafariZone_North/scripts.inc diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/events.inc diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northeast.inc rename to data/maps/SafariZone_Northeast/scripts.inc diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/events.inc diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Northwest.inc rename to data/maps/SafariZone_Northwest/scripts.inc diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/events.inc similarity index 100% rename from data/maps/events/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/events.inc diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_RestHouse.inc rename to data/maps/SafariZone_RestHouse/scripts.inc diff --git a/data/maps/events/SafariZone_South.inc b/data/maps/SafariZone_South/events.inc similarity index 100% rename from data/maps/events/SafariZone_South.inc rename to data/maps/SafariZone_South/events.inc diff --git a/data/scripts/maps/SafariZone_South.inc b/data/maps/SafariZone_South/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_South.inc rename to data/maps/SafariZone_South/scripts.inc diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/events.inc diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/maps/SafariZone_Southeast/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southeast.inc rename to data/maps/SafariZone_Southeast/scripts.inc diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/events.inc similarity index 100% rename from data/maps/events/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/events.inc diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc similarity index 100% rename from data/scripts/maps/SafariZone_Southwest.inc rename to data/maps/SafariZone_Southwest/scripts.inc diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/ScorchedSlab/events.inc similarity index 100% rename from data/maps/events/ScorchedSlab.inc rename to data/maps/ScorchedSlab/events.inc diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc similarity index 100% rename from data/scripts/maps/ScorchedSlab.inc rename to data/maps/ScorchedSlab/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Entrance.inc rename to data/maps/SeafloorCavern_Entrance/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room1.inc rename to data/maps/SeafloorCavern_Room1/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room2.inc rename to data/maps/SeafloorCavern_Room2/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room3.inc rename to data/maps/SeafloorCavern_Room3/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room4.inc rename to data/maps/SeafloorCavern_Room4/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room5.inc rename to data/maps/SeafloorCavern_Room5/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room6.inc rename to data/maps/SeafloorCavern_Room6/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room7.inc rename to data/maps/SeafloorCavern_Room7/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room8.inc rename to data/maps/SeafloorCavern_Room8/scripts.inc diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/events.inc similarity index 100% rename from data/maps/events/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/events.inc diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/maps/SeafloorCavern_Room9/scripts.inc similarity index 100% rename from data/scripts/maps/SeafloorCavern_Room9.inc rename to data/maps/SeafloorCavern_Room9/scripts.inc diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/events.inc diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_InnerRoom.inc rename to data/maps/SealedChamber_InnerRoom/scripts.inc diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc similarity index 100% rename from data/maps/events/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/events.inc diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SealedChamber_OuterRoom.inc rename to data/maps/SealedChamber_OuterRoom/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave1.inc rename to data/maps/SecretBase_BlueCave1/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave2.inc rename to data/maps/SecretBase_BlueCave2/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave3.inc rename to data/maps/SecretBase_BlueCave3/scripts.inc diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/events.inc diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BlueCave4.inc rename to data/maps/SecretBase_BlueCave4/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave1.inc rename to data/maps/SecretBase_BrownCave1/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave2.inc rename to data/maps/SecretBase_BrownCave2/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave3.inc rename to data/maps/SecretBase_BrownCave3/scripts.inc diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/events.inc diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_BrownCave4.inc rename to data/maps/SecretBase_BrownCave4/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave1.inc rename to data/maps/SecretBase_RedCave1/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave2.inc rename to data/maps/SecretBase_RedCave2/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave3.inc rename to data/maps/SecretBase_RedCave3/scripts.inc diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/events.inc diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_RedCave4.inc rename to data/maps/SecretBase_RedCave4/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub1.inc rename to data/maps/SecretBase_Shrub1/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub2.inc rename to data/maps/SecretBase_Shrub2/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub3.inc rename to data/maps/SecretBase_Shrub3/scripts.inc diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/events.inc diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Shrub4.inc rename to data/maps/SecretBase_Shrub4/scripts.inc diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/events.inc diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree1.inc rename to data/maps/SecretBase_Tree1/scripts.inc diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/events.inc diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree2.inc rename to data/maps/SecretBase_Tree2/scripts.inc diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/events.inc diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree3.inc rename to data/maps/SecretBase_Tree3/scripts.inc diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/events.inc similarity index 100% rename from data/maps/events/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/events.inc diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_Tree4.inc rename to data/maps/SecretBase_Tree4/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave1.inc rename to data/maps/SecretBase_YellowCave1/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave2.inc rename to data/maps/SecretBase_YellowCave2/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave3.inc rename to data/maps/SecretBase_YellowCave3/scripts.inc diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/events.inc similarity index 100% rename from data/maps/events/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/events.inc diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc similarity index 100% rename from data/scripts/maps/SecretBase_YellowCave4.inc rename to data/maps/SecretBase_YellowCave4/scripts.inc diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc rename to data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_HighTideInnerRoom.inc rename to data/maps/ShoalCave_HighTideInnerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc rename to data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideIceRoom.inc rename to data/maps/ShoalCave_LowTideIceRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideInnerRoom.inc rename to data/maps/ShoalCave_LowTideInnerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideLowerRoom.inc rename to data/maps/ShoalCave_LowTideLowerRoom/scripts.inc diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc similarity index 100% rename from data/maps/events/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/events.inc diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc similarity index 100% rename from data/scripts/maps/ShoalCave_LowTideStairsRoom.inc rename to data/maps/ShoalCave_LowTideStairsRoom/scripts.inc diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/events.inc similarity index 100% rename from data/maps/events/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/events.inc diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc similarity index 100% rename from data/scripts/maps/SingleBattleColosseum.inc rename to data/maps/SingleBattleColosseum/scripts.inc diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/events.inc diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_1F.inc rename to data/maps/SkyPillar_1F/scripts.inc diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/events.inc diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_2F.inc rename to data/maps/SkyPillar_2F/scripts.inc diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/events.inc diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_3F.inc rename to data/maps/SkyPillar_3F/scripts.inc diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/events.inc diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_4F.inc rename to data/maps/SkyPillar_4F/scripts.inc diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc similarity index 100% rename from data/maps/events/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/events.inc diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_5F.inc rename to data/maps/SkyPillar_5F/scripts.inc diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/events.inc diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Entrance.inc rename to data/maps/SkyPillar_Entrance/scripts.inc diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/events.inc diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Outside.inc rename to data/maps/SkyPillar_Outside/scripts.inc diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/events.inc similarity index 100% rename from data/maps/events/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/events.inc diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc similarity index 100% rename from data/scripts/maps/SkyPillar_Top.inc rename to data/maps/SkyPillar_Top/scripts.inc diff --git a/data/maps/events/SlateportCity.inc b/data/maps/SlateportCity/events.inc similarity index 100% rename from data/maps/events/SlateportCity.inc rename to data/maps/SlateportCity/events.inc diff --git a/data/scripts/maps/SlateportCity.inc b/data/maps/SlateportCity/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity.inc rename to data/maps/SlateportCity/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentBattleRoom.inc rename to data/maps/SlateportCity_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc rename to data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentCorridor.inc rename to data/maps/SlateportCity_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentCorridor.inc rename to data/maps/SlateportCity_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/SlateportCity_BattleTentLobby.inc rename to data/maps/SlateportCity_BattleTentLobby/events.inc diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_BattleTentLobby.inc rename to data/maps/SlateportCity_BattleTentLobby/scripts.inc diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/events.inc diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Harbor.inc rename to data/maps/SlateportCity_Harbor/scripts.inc diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/events.inc diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House1.inc rename to data/maps/SlateportCity_House1/scripts.inc diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/events.inc similarity index 100% rename from data/maps/events/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/events.inc diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_House2.inc rename to data/maps/SlateportCity_House2/scripts.inc diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/events.inc similarity index 100% rename from data/maps/events/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/events.inc diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_Mart.inc rename to data/maps/SlateportCity_Mart/scripts.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc rename to data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc rename to data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_1F.inc rename to data/maps/SlateportCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonCenter_2F.inc rename to data/maps/SlateportCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc similarity index 100% rename from data/maps/events/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/events.inc diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_PokemonFanClub.inc rename to data/maps/SlateportCity_PokemonFanClub/scripts.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/events.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_1F.inc rename to data/maps/SlateportCity_SternsShipyard_1F/scripts.inc diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc similarity index 100% rename from data/maps/events/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/events.inc diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SlateportCity_SternsShipyard_2F.inc rename to data/maps/SlateportCity_SternsShipyard_2F/scripts.inc diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/SootopolisCity/events.inc similarity index 100% rename from data/maps/events/SootopolisCity.inc rename to data/maps/SootopolisCity/events.inc diff --git a/data/scripts/maps/SootopolisCity.inc b/data/maps/SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity.inc rename to data/maps/SootopolisCity/scripts.inc diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_1F.inc rename to data/maps/SootopolisCity_Gym_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Gym_B1F.inc rename to data/maps/SootopolisCity_Gym_B1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/events.inc diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House1.inc rename to data/maps/SootopolisCity_House1/scripts.inc diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/events.inc diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House2.inc rename to data/maps/SootopolisCity_House2/scripts.inc diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/events.inc diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House3.inc rename to data/maps/SootopolisCity_House3/scripts.inc diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/events.inc diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House4.inc rename to data/maps/SootopolisCity_House4/scripts.inc diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/events.inc diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House5.inc rename to data/maps/SootopolisCity_House5/scripts.inc diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/events.inc diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House6.inc rename to data/maps/SootopolisCity_House6/scripts.inc diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/events.inc diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_House7.inc rename to data/maps/SootopolisCity_House7/scripts.inc diff --git a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc rename to data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc diff --git a/data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_LotadAndSeedotHouse.inc rename to data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/events.inc diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_Mart.inc rename to data/maps/SootopolisCity_Mart/scripts.inc diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc rename to data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc rename to data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc rename to data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/events.inc diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Exterior.inc rename to data/maps/SouthernIsland_Exterior/scripts.inc diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/events.inc similarity index 100% rename from data/maps/events/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/events.inc diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/scripts.inc similarity index 100% rename from data/scripts/maps/SouthernIsland_Interior.inc rename to data/maps/SouthernIsland_Interior/scripts.inc diff --git a/data/maps/events/TerraCave_End.inc b/data/maps/TerraCave_End/events.inc similarity index 100% rename from data/maps/events/TerraCave_End.inc rename to data/maps/TerraCave_End/events.inc diff --git a/data/scripts/maps/TerraCave_End.inc b/data/maps/TerraCave_End/scripts.inc similarity index 100% rename from data/scripts/maps/TerraCave_End.inc rename to data/maps/TerraCave_End/scripts.inc diff --git a/data/maps/events/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/events.inc similarity index 100% rename from data/maps/events/TerraCave_Entrance.inc rename to data/maps/TerraCave_Entrance/events.inc diff --git a/data/scripts/maps/TerraCave_Entrance.inc b/data/maps/TerraCave_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/TerraCave_Entrance.inc rename to data/maps/TerraCave_Entrance/scripts.inc diff --git a/data/maps/events/TradeCenter.inc b/data/maps/TradeCenter/events.inc similarity index 100% rename from data/maps/events/TradeCenter.inc rename to data/maps/TradeCenter/events.inc diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc similarity index 100% rename from data/scripts/maps/TradeCenter.inc rename to data/maps/TradeCenter/scripts.inc diff --git a/data/maps/events/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_1F.inc rename to data/maps/TrainerHill_1F/events.inc diff --git a/data/scripts/maps/TrainerHill_1F.inc b/data/maps/TrainerHill_1F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_1F.inc rename to data/maps/TrainerHill_1F/scripts.inc diff --git a/data/maps/events/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_2F.inc rename to data/maps/TrainerHill_2F/events.inc diff --git a/data/scripts/maps/TrainerHill_2F.inc b/data/maps/TrainerHill_2F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_2F.inc rename to data/maps/TrainerHill_2F/scripts.inc diff --git a/data/maps/events/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_3F.inc rename to data/maps/TrainerHill_3F/events.inc diff --git a/data/scripts/maps/TrainerHill_3F.inc b/data/maps/TrainerHill_3F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_3F.inc rename to data/maps/TrainerHill_3F/scripts.inc diff --git a/data/maps/events/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/events.inc similarity index 100% rename from data/maps/events/TrainerHill_4F.inc rename to data/maps/TrainerHill_4F/events.inc diff --git a/data/scripts/maps/TrainerHill_4F.inc b/data/maps/TrainerHill_4F/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_4F.inc rename to data/maps/TrainerHill_4F/scripts.inc diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Elevator.inc rename to data/maps/TrainerHill_Elevator/events.inc diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/maps/TrainerHill_Elevator/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Elevator.inc rename to data/maps/TrainerHill_Elevator/scripts.inc diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Entrance.inc rename to data/maps/TrainerHill_Entrance/events.inc diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/maps/TrainerHill_Entrance/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Entrance.inc rename to data/maps/TrainerHill_Entrance/scripts.inc diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/events.inc similarity index 100% rename from data/maps/events/TrainerHill_Roof.inc rename to data/maps/TrainerHill_Roof/events.inc diff --git a/data/scripts/maps/TrainerHill_Roof.inc b/data/maps/TrainerHill_Roof/scripts.inc similarity index 100% rename from data/scripts/maps/TrainerHill_Roof.inc rename to data/maps/TrainerHill_Roof/scripts.inc diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc similarity index 100% rename from data/maps/events/Underwater1.inc rename to data/maps/Underwater1/events.inc diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater1.inc rename to data/maps/Underwater1/scripts.inc diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc similarity index 100% rename from data/maps/events/Underwater2.inc rename to data/maps/Underwater2/events.inc diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater2.inc rename to data/maps/Underwater2/scripts.inc diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc similarity index 100% rename from data/maps/events/Underwater3.inc rename to data/maps/Underwater3/events.inc diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater3.inc rename to data/maps/Underwater3/scripts.inc diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc similarity index 100% rename from data/maps/events/Underwater4.inc rename to data/maps/Underwater4/events.inc diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater4.inc rename to data/maps/Underwater4/scripts.inc diff --git a/data/maps/events/Underwater5.inc b/data/maps/Underwater5/events.inc similarity index 100% rename from data/maps/events/Underwater5.inc rename to data/maps/Underwater5/events.inc diff --git a/data/scripts/maps/Underwater5.inc b/data/maps/Underwater5/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater5.inc rename to data/maps/Underwater5/scripts.inc diff --git a/data/maps/events/Underwater6.inc b/data/maps/Underwater6/events.inc similarity index 100% rename from data/maps/events/Underwater6.inc rename to data/maps/Underwater6/events.inc diff --git a/data/scripts/maps/Underwater6.inc b/data/maps/Underwater6/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater6.inc rename to data/maps/Underwater6/scripts.inc diff --git a/data/maps/events/Underwater7.inc b/data/maps/Underwater7/events.inc similarity index 100% rename from data/maps/events/Underwater7.inc rename to data/maps/Underwater7/events.inc diff --git a/data/scripts/maps/Underwater7.inc b/data/maps/Underwater7/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater7.inc rename to data/maps/Underwater7/scripts.inc diff --git a/data/maps/events/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/events.inc similarity index 100% rename from data/maps/events/Underwater_MarineCave.inc rename to data/maps/Underwater_MarineCave/events.inc diff --git a/data/scripts/maps/Underwater_MarineCave.inc b/data/maps/Underwater_MarineCave/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_MarineCave.inc rename to data/maps/Underwater_MarineCave/scripts.inc diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc similarity index 100% rename from data/maps/events/Underwater_Route134.inc rename to data/maps/Underwater_Route134/events.inc diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_Route134.inc rename to data/maps/Underwater_Route134/scripts.inc diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/events.inc similarity index 100% rename from data/maps/events/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/events.inc diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SeafloorCavern.inc rename to data/maps/Underwater_SeafloorCavern/scripts.inc diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc similarity index 100% rename from data/maps/events/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/events.inc diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SealedChamber.inc rename to data/maps/Underwater_SealedChamber/scripts.inc diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc similarity index 100% rename from data/maps/events/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/events.inc diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc similarity index 100% rename from data/scripts/maps/Underwater_SootopolisCity.inc rename to data/maps/Underwater_SootopolisCity/scripts.inc diff --git a/data/maps/events/UnionRoom.inc b/data/maps/UnionRoom/events.inc similarity index 100% rename from data/maps/events/UnionRoom.inc rename to data/maps/UnionRoom/events.inc diff --git a/data/scripts/maps/UnionRoom.inc b/data/maps/UnionRoom/scripts.inc similarity index 100% rename from data/scripts/maps/UnionRoom.inc rename to data/maps/UnionRoom/scripts.inc diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/events.inc diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_29.inc rename to data/maps/UnknownMap_25_29/scripts.inc diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/events.inc diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_30.inc rename to data/maps/UnknownMap_25_30/scripts.inc diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/events.inc diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_31.inc rename to data/maps/UnknownMap_25_31/scripts.inc diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/events.inc diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_32.inc rename to data/maps/UnknownMap_25_32/scripts.inc diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/events.inc diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_33.inc rename to data/maps/UnknownMap_25_33/scripts.inc diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/events.inc similarity index 100% rename from data/maps/events/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/events.inc diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/maps/UnknownMap_25_34/scripts.inc similarity index 100% rename from data/scripts/maps/UnknownMap_25_34.inc rename to data/maps/UnknownMap_25_34/scripts.inc diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/VerdanturfTown/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown.inc rename to data/maps/VerdanturfTown/events.inc diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown.inc rename to data/maps/VerdanturfTown/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc rename to data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc rename to data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentCorridor.inc rename to data/maps/VerdanturfTown_BattleTentCorridor/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc rename to data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_BattleTentLobby.inc rename to data/maps/VerdanturfTown_BattleTentLobby/events.inc diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_BattleTentLobby.inc rename to data/maps/VerdanturfTown_BattleTentLobby/scripts.inc diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc rename to data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/events.inc diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_House.inc rename to data/maps/VerdanturfTown_House/scripts.inc diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/events.inc diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_Mart.inc rename to data/maps/VerdanturfTown_Mart/scripts.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/events.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc rename to data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/events.inc diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc rename to data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc similarity index 100% rename from data/maps/events/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/events.inc diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc similarity index 100% rename from data/scripts/maps/VerdanturfTown_WandasHouse.inc rename to data/maps/VerdanturfTown_WandasHouse/scripts.inc diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/events.inc diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_1F.inc rename to data/maps/VictoryRoad_1F/scripts.inc diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/events.inc diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B1F.inc rename to data/maps/VictoryRoad_B1F/scripts.inc diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/events.inc similarity index 100% rename from data/maps/events/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/events.inc diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc similarity index 100% rename from data/scripts/maps/VictoryRoad_B2F.inc rename to data/maps/VictoryRoad_B2F/scripts.inc