From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- Makefile | 6 + data/event_scripts.s | 1 + data/layouts.inc | 441 -- data/layouts/.gitignore | 2 + .../AbandonedShip_CaptainsOffice/layout.inc | 15 - data/layouts/AbandonedShip_Corridors_1F/layout.inc | 15 - .../layouts/AbandonedShip_Corridors_B1F/layout.inc | 15 - data/layouts/AbandonedShip_Deck/layout.inc | 15 - .../AbandonedShip_HiddenFloorCorridors/layout.inc | 15 - .../AbandonedShip_HiddenFloorRooms/layout.inc | 15 - data/layouts/AbandonedShip_Room_B1F/layout.inc | 15 - data/layouts/AbandonedShip_Rooms2_1F/layout.inc | 15 - data/layouts/AbandonedShip_Rooms2_B1F/layout.inc | 15 - data/layouts/AbandonedShip_Rooms_1F/layout.inc | 15 - data/layouts/AbandonedShip_Rooms_B1F/layout.inc | 15 - data/layouts/AbandonedShip_Underwater1/layout.inc | 15 - data/layouts/AbandonedShip_Underwater2/layout.inc | 15 - data/layouts/AlteringCave/layout.inc | 15 - data/layouts/AncientTomb/layout.inc | 15 - data/layouts/AquaHideout_1F/layout.inc | 15 - data/layouts/AquaHideout_B1F/layout.inc | 15 - data/layouts/AquaHideout_B2F/layout.inc | 15 - data/layouts/AquaHideout_UnusedRubyMap1/layout.inc | 15 - data/layouts/AquaHideout_UnusedRubyMap2/layout.inc | 15 - data/layouts/AquaHideout_UnusedRubyMap3/layout.inc | 15 - data/layouts/ArtisanCave_1F/layout.inc | 15 - data/layouts/ArtisanCave_B1F/layout.inc | 15 - data/layouts/BattleElevator/layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattleArenaCorridor/layout.inc | 15 - .../BattleFrontier_BattleArenaLobby/layout.inc | 15 - .../BattleFrontier_BattleDomeBattleRoom/layout.inc | 15 - .../BattleFrontier_BattleDomeCorridor/layout.inc | 15 - .../BattleFrontier_BattleDomeLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattleFactoryLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattlePalaceCorridor/layout.inc | 15 - .../BattleFrontier_BattlePalaceLobby/layout.inc | 15 - .../BattleFrontier_BattlePikeCorridor/layout.inc | 15 - .../BattleFrontier_BattlePikeLobby/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattlePyramidLobby/layout.inc | 15 - .../BattleFrontier_BattlePyramidTop/layout.inc | 15 - .../layout.inc | 15 - .../BattleFrontier_BattleTowerCorridor/layout.inc | 15 - .../BattleFrontier_BattleTowerCorridor2/layout.inc | 15 - .../BattleFrontier_BattleTowerLobby/layout.inc | 15 - .../layout.inc | 15 - data/layouts/BattleFrontier_Lounge1/layout.inc | 15 - data/layouts/BattleFrontier_Lounge2/layout.inc | 15 - data/layouts/BattleFrontier_OutsideEast/layout.inc | 15 - data/layouts/BattleFrontier_OutsideWest/layout.inc | 15 - data/layouts/BattleFrontier_RankingHall/layout.inc | 15 - .../BattleFrontier_ReceptionGate/layout.inc | 15 - data/layouts/BattleFrontier_ScottsHouse/layout.inc | 15 - data/layouts/BattlePyramidSquare01/layout.inc | 15 - data/layouts/BattlePyramidSquare02/layout.inc | 15 - data/layouts/BattlePyramidSquare03/layout.inc | 15 - data/layouts/BattlePyramidSquare04/layout.inc | 15 - data/layouts/BattlePyramidSquare05/layout.inc | 15 - data/layouts/BattlePyramidSquare06/layout.inc | 15 - data/layouts/BattlePyramidSquare07/layout.inc | 15 - data/layouts/BattlePyramidSquare08/layout.inc | 15 - data/layouts/BattlePyramidSquare09/layout.inc | 15 - data/layouts/BattlePyramidSquare10/layout.inc | 15 - data/layouts/BattlePyramidSquare11/layout.inc | 15 - data/layouts/BattlePyramidSquare12/layout.inc | 15 - data/layouts/BattlePyramidSquare13/layout.inc | 15 - data/layouts/BattlePyramidSquare14/layout.inc | 15 - data/layouts/BattlePyramidSquare15/layout.inc | 15 - data/layouts/BattlePyramidSquare16/layout.inc | 15 - data/layouts/BattleTentBattleRoom/layout.inc | 15 - data/layouts/BattleTentCorridor/layout.inc | 15 - data/layouts/BattleTentLobby/layout.inc | 15 - data/layouts/BirthIsland_Exterior/layout.inc | 15 - data/layouts/CableCarStation/layout.inc | 15 - data/layouts/CaveOfOrigin_1F/layout.inc | 15 - data/layouts/CaveOfOrigin_B1F/layout.inc | 15 - data/layouts/CaveOfOrigin_Entrance/layout.inc | 15 - .../CaveOfOrigin_UnusedRubySapphireMap1/layout.inc | 15 - .../CaveOfOrigin_UnusedRubySapphireMap2/layout.inc | 15 - .../CaveOfOrigin_UnusedRubySapphireMap3/layout.inc | 15 - data/layouts/DesertRuins/layout.inc | 15 - data/layouts/DesertUnderpass/layout.inc | 15 - data/layouts/DewfordTown/layout.inc | 15 - data/layouts/DewfordTown_Gym/layout.inc | 15 - data/layouts/DewfordTown_Hall/layout.inc | 15 - data/layouts/DoubleBattleColosseum/layout.inc | 15 - data/layouts/EverGrandeCity/layout.inc | 15 - .../EverGrandeCity_ChampionsRoom/layout.inc | 15 - data/layouts/EverGrandeCity_DrakesRoom/layout.inc | 15 - data/layouts/EverGrandeCity_GlaciasRoom/layout.inc | 15 - data/layouts/EverGrandeCity_Hall4/layout.inc | 15 - data/layouts/EverGrandeCity_HallOfFame/layout.inc | 15 - data/layouts/EverGrandeCity_PhoebesRoom/layout.inc | 15 - .../EverGrandeCity_PokemonLeague_1F/layout.inc | 15 - data/layouts/EverGrandeCity_ShortHall/layout.inc | 15 - data/layouts/EverGrandeCity_SidneysRoom/layout.inc | 15 - data/layouts/FallarborTown/layout.inc | 15 - .../FallarborTown_LeftoverRSContestHall/layout.inc | 15 - .../layout.inc | 15 - data/layouts/FarawayIsland_Entrance/layout.inc | 15 - data/layouts/FarawayIsland_Interior/layout.inc | 15 - data/layouts/FieryPath/layout.inc | 15 - data/layouts/FortreeCity/layout.inc | 15 - data/layouts/FortreeCity_DecorationShop/layout.inc | 15 - data/layouts/FortreeCity_Gym/layout.inc | 15 - data/layouts/FortreeCity_House1/layout.inc | 15 - data/layouts/FortreeCity_House2/layout.inc | 15 - data/layouts/GraniteCave_1F/layout.inc | 15 - data/layouts/GraniteCave_B1F/layout.inc | 15 - data/layouts/GraniteCave_B2F/layout.inc | 15 - data/layouts/GraniteCave_StevensRoom/layout.inc | 15 - data/layouts/Harbor/layout.inc | 15 - data/layouts/House1/layout.inc | 15 - data/layouts/House2/layout.inc | 15 - data/layouts/House3/layout.inc | 15 - data/layouts/House4/layout.inc | 15 - data/layouts/HouseWithBed/layout.inc | 15 - data/layouts/InsideOfTruck/layout.inc | 15 - data/layouts/IslandCave/layout.inc | 15 - data/layouts/IslandHarbor/layout.inc | 15 - data/layouts/JaggedPass/layout.inc | 15 - data/layouts/LavaridgeTown/layout.inc | 15 - data/layouts/LavaridgeTown_Gym_1F/layout.inc | 15 - data/layouts/LavaridgeTown_Gym_B1F/layout.inc | 15 - data/layouts/LavaridgeTown_HerbShop/layout.inc | 15 - .../LavaridgeTown_PokemonCenter_1F/layout.inc | 15 - data/layouts/LilycoveCity/layout.inc | 15 - data/layouts/LilycoveCity_ContestHall/layout.inc | 15 - data/layouts/LilycoveCity_ContestLobby/layout.inc | 15 - .../LilycoveCity_CoveLilyMotel_1F/layout.inc | 15 - .../LilycoveCity_CoveLilyMotel_2F/layout.inc | 15 - .../layout.inc | 15 - .../LilycoveCity_DepartmentStoreRooftop/layout.inc | 15 - .../LilycoveCity_DepartmentStore_1F/layout.inc | 15 - .../LilycoveCity_DepartmentStore_2F/layout.inc | 15 - .../LilycoveCity_DepartmentStore_3F/layout.inc | 15 - .../LilycoveCity_DepartmentStore_4F/layout.inc | 15 - .../LilycoveCity_DepartmentStore_5F/layout.inc | 15 - data/layouts/LilycoveCity_House2/layout.inc | 15 - .../LilycoveCity_LilycoveMuseum_1F/layout.inc | 15 - .../LilycoveCity_LilycoveMuseum_2F/layout.inc | 15 - .../LilycoveCity_PokemonTrainerFanClub/layout.inc | 15 - data/layouts/LinkContestRoom1/layout.inc | 15 - data/layouts/LinkContestRoom2/layout.inc | 15 - data/layouts/LinkContestRoom3/layout.inc | 15 - data/layouts/LinkContestRoom4/layout.inc | 15 - data/layouts/LinkContestRoom5/layout.inc | 15 - data/layouts/LinkContestRoom6/layout.inc | 15 - data/layouts/LittlerootTown/layout.inc | 15 - .../LittlerootTown_BrendansHouse_1F/layout.inc | 15 - .../LittlerootTown_BrendansHouse_2F/layout.inc | 15 - .../layouts/LittlerootTown_MaysHouse_1F/layout.inc | 15 - .../layouts/LittlerootTown_MaysHouse_2F/layout.inc | 15 - .../LittlerootTown_ProfessorBirchsLab/layout.inc | 15 - data/layouts/MagmaHideout_1F/layout.inc | 15 - data/layouts/MagmaHideout_2F_1R/layout.inc | 15 - data/layouts/MagmaHideout_2F_2R/layout.inc | 15 - data/layouts/MagmaHideout_2F_3R/layout.inc | 15 - data/layouts/MagmaHideout_3F_1R/layout.inc | 15 - data/layouts/MagmaHideout_3F_2R/layout.inc | 15 - data/layouts/MagmaHideout_3F_3R/layout.inc | 15 - data/layouts/MagmaHideout_4F/layout.inc | 15 - data/layouts/MarineCave_End/layout.inc | 15 - data/layouts/MarineCave_Entrance/layout.inc | 15 - data/layouts/Mart/layout.inc | 15 - data/layouts/MauvilleCity/layout.inc | 15 - data/layouts/MauvilleCity_BikeShop/layout.inc | 15 - data/layouts/MauvilleCity_GameCorner/layout.inc | 15 - data/layouts/MauvilleCity_Gym/layout.inc | 15 - data/layouts/MeteorFalls_1F_1R/layout.inc | 15 - data/layouts/MeteorFalls_1F_2R/layout.inc | 15 - data/layouts/MeteorFalls_B1F_1R/layout.inc | 15 - data/layouts/MeteorFalls_B1F_2R/layout.inc | 15 - data/layouts/MeteorFalls_StevensCave/layout.inc | 15 - data/layouts/MirageTower_1F/layout.inc | 15 - data/layouts/MirageTower_2F/layout.inc | 15 - data/layouts/MirageTower_3F/layout.inc | 15 - data/layouts/MirageTower_4F/layout.inc | 15 - data/layouts/MossdeepCity/layout.inc | 15 - data/layouts/MossdeepCity_GameCorner_1F/layout.inc | 15 - .../layouts/MossdeepCity_GameCorner_B1F/layout.inc | 15 - data/layouts/MossdeepCity_Gym/layout.inc | 15 - .../layouts/MossdeepCity_SpaceCenter_1F/layout.inc | 15 - .../layouts/MossdeepCity_SpaceCenter_2F/layout.inc | 15 - data/layouts/MossdeepCity_StevensHouse/layout.inc | 15 - data/layouts/MtChimney/layout.inc | 15 - data/layouts/MtPyre_1F/layout.inc | 15 - data/layouts/MtPyre_2F/layout.inc | 15 - data/layouts/MtPyre_3F/layout.inc | 15 - data/layouts/MtPyre_4F/layout.inc | 15 - data/layouts/MtPyre_5F/layout.inc | 15 - data/layouts/MtPyre_6F/layout.inc | 15 - data/layouts/MtPyre_Exterior/layout.inc | 15 - data/layouts/MtPyre_Summit/layout.inc | 15 - data/layouts/NavelRock_B1F/layout.inc | 15 - data/layouts/NavelRock_Bottom/layout.inc | 15 - data/layouts/NavelRock_Entrance/layout.inc | 15 - data/layouts/NavelRock_Exterior/layout.inc | 15 - data/layouts/NavelRock_Fork/layout.inc | 15 - data/layouts/NavelRock_LadderRoom1/layout.inc | 15 - data/layouts/NavelRock_LadderRoom2/layout.inc | 15 - data/layouts/NavelRock_Top/layout.inc | 15 - data/layouts/NewMauville_Entrance/layout.inc | 15 - data/layouts/NewMauville_Inside/layout.inc | 15 - data/layouts/OldaleTown/layout.inc | 15 - data/layouts/PacifidlogTown/layout.inc | 15 - data/layouts/PacifidlogTown_House1/layout.inc | 15 - data/layouts/PacifidlogTown_House2/layout.inc | 15 - data/layouts/PetalburgCity/layout.inc | 15 - data/layouts/PetalburgCity_Gym/layout.inc | 15 - data/layouts/PetalburgWoods/layout.inc | 15 - data/layouts/PokemonCenter_1F/layout.inc | 15 - data/layouts/PokemonCenter_2F/layout.inc | 15 - data/layouts/RecordCorner/layout.inc | 15 - data/layouts/Route101/layout.inc | 15 - data/layouts/Route102/layout.inc | 15 - data/layouts/Route103/layout.inc | 15 - data/layouts/Route104/layout.inc | 15 - data/layouts/Route104_MrBrineysHouse/layout.inc | 15 - .../Route104_PrettyPetalFlowerShop/layout.inc | 15 - data/layouts/Route104_Prototype/layout.inc | 15 - data/layouts/Route105/layout.inc | 15 - data/layouts/Route106/layout.inc | 15 - data/layouts/Route107/layout.inc | 15 - data/layouts/Route108/layout.inc | 15 - data/layouts/Route109/layout.inc | 15 - data/layouts/Route109_SeashoreHouse/layout.inc | 15 - data/layouts/Route110/layout.inc | 15 - .../Route110_SeasideCyclingRoadEntrance/layout.inc | 15 - .../layouts/Route110_TrickHouseCorridor/layout.inc | 15 - data/layouts/Route110_TrickHouseEnd/layout.inc | 15 - .../layouts/Route110_TrickHouseEntrance/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle1/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle2/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle3/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle4/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle5/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle6/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle7/layout.inc | 15 - data/layouts/Route110_TrickHousePuzzle8/layout.inc | 15 - data/layouts/Route111/layout.inc | 15 - data/layouts/Route111_NoMirageTower/layout.inc | 15 - data/layouts/Route112/layout.inc | 15 - data/layouts/Route113/layout.inc | 15 - data/layouts/Route114/layout.inc | 15 - .../layouts/Route114_FossilManiacsHouse/layout.inc | 15 - .../Route114_FossilManiacsTunnel/layout.inc | 15 - data/layouts/Route114_LanettesHouse/layout.inc | 15 - data/layouts/Route115/layout.inc | 15 - data/layouts/Route116/layout.inc | 15 - .../layouts/Route116_TunnelersRestHouse/layout.inc | 15 - data/layouts/Route117/layout.inc | 15 - data/layouts/Route117_PokemonDayCare/layout.inc | 15 - data/layouts/Route118/layout.inc | 15 - data/layouts/Route119/layout.inc | 15 - .../Route119_WeatherInstitute_1F/layout.inc | 15 - .../Route119_WeatherInstitute_2F/layout.inc | 15 - data/layouts/Route120/layout.inc | 15 - data/layouts/Route121/layout.inc | 15 - .../layouts/Route121_SafariZoneEntrance/layout.inc | 15 - data/layouts/Route122/layout.inc | 15 - data/layouts/Route123/layout.inc | 15 - data/layouts/Route124/layout.inc | 15 - .../Route124_DivingTreasureHuntersHouse/layout.inc | 15 - data/layouts/Route125/layout.inc | 15 - data/layouts/Route126/layout.inc | 15 - data/layouts/Route127/layout.inc | 15 - data/layouts/Route128/layout.inc | 15 - data/layouts/Route129/layout.inc | 15 - data/layouts/Route130/layout.inc | 15 - data/layouts/Route131/layout.inc | 15 - data/layouts/Route132/layout.inc | 15 - data/layouts/Route133/layout.inc | 15 - data/layouts/Route134/layout.inc | 15 - data/layouts/RustboroCity/layout.inc | 15 - data/layouts/RustboroCity_CuttersHouse/layout.inc | 15 - data/layouts/RustboroCity_DevonCorp_1F/layout.inc | 15 - data/layouts/RustboroCity_DevonCorp_2F/layout.inc | 15 - data/layouts/RustboroCity_DevonCorp_3F/layout.inc | 15 - data/layouts/RustboroCity_Flat1_1F/layout.inc | 15 - data/layouts/RustboroCity_Flat1_2F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_1F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_2F/layout.inc | 15 - data/layouts/RustboroCity_Flat2_3F/layout.inc | 15 - data/layouts/RustboroCity_Gym/layout.inc | 15 - data/layouts/RustboroCity_House/layout.inc | 15 - data/layouts/RustboroCity_House1/layout.inc | 15 - data/layouts/RustboroCity_PokemonSchool/layout.inc | 15 - data/layouts/RusturfTunnel/layout.inc | 15 - data/layouts/SSTidalCorridor/layout.inc | 15 - data/layouts/SSTidalLowerDeck/layout.inc | 15 - data/layouts/SSTidalRooms/layout.inc | 15 - data/layouts/SafariZone_North/layout.inc | 15 - data/layouts/SafariZone_Northeast/layout.inc | 15 - data/layouts/SafariZone_Northwest/layout.inc | 15 - data/layouts/SafariZone_RestHouse/layout.inc | 15 - data/layouts/SafariZone_South/layout.inc | 15 - data/layouts/SafariZone_Southeast/layout.inc | 15 - data/layouts/SafariZone_Southwest/layout.inc | 15 - data/layouts/ScorchedSlab/layout.inc | 15 - data/layouts/SeafloorCavern_Entrance/layout.inc | 15 - data/layouts/SeafloorCavern_Room1/layout.inc | 15 - data/layouts/SeafloorCavern_Room2/layout.inc | 15 - data/layouts/SeafloorCavern_Room3/layout.inc | 15 - data/layouts/SeafloorCavern_Room4/layout.inc | 15 - data/layouts/SeafloorCavern_Room5/layout.inc | 15 - data/layouts/SeafloorCavern_Room6/layout.inc | 15 - data/layouts/SeafloorCavern_Room7/layout.inc | 15 - data/layouts/SeafloorCavern_Room8/layout.inc | 15 - data/layouts/SeafloorCavern_Room9/layout.inc | 15 - data/layouts/SealedChamber_InnerRoom/layout.inc | 15 - data/layouts/SealedChamber_OuterRoom/layout.inc | 15 - data/layouts/SecretBase_BlueCave1/layout.inc | 15 - data/layouts/SecretBase_BlueCave2/layout.inc | 15 - data/layouts/SecretBase_BlueCave3/layout.inc | 15 - data/layouts/SecretBase_BlueCave4/layout.inc | 15 - data/layouts/SecretBase_BrownCave1/layout.inc | 15 - data/layouts/SecretBase_BrownCave2/layout.inc | 15 - data/layouts/SecretBase_BrownCave3/layout.inc | 15 - data/layouts/SecretBase_BrownCave4/layout.inc | 15 - data/layouts/SecretBase_RedCave1/layout.inc | 15 - data/layouts/SecretBase_RedCave2/layout.inc | 15 - data/layouts/SecretBase_RedCave3/layout.inc | 15 - data/layouts/SecretBase_RedCave4/layout.inc | 15 - data/layouts/SecretBase_Shrub1/layout.inc | 15 - data/layouts/SecretBase_Shrub2/layout.inc | 15 - data/layouts/SecretBase_Shrub3/layout.inc | 15 - data/layouts/SecretBase_Shrub4/layout.inc | 15 - data/layouts/SecretBase_Tree1/layout.inc | 15 - data/layouts/SecretBase_Tree2/layout.inc | 15 - data/layouts/SecretBase_Tree3/layout.inc | 15 - data/layouts/SecretBase_Tree4/layout.inc | 15 - data/layouts/SecretBase_YellowCave1/layout.inc | 15 - data/layouts/SecretBase_YellowCave2/layout.inc | 15 - data/layouts/SecretBase_YellowCave3/layout.inc | 15 - data/layouts/SecretBase_YellowCave4/layout.inc | 15 - .../ShoalCave_HighTideEntranceRoom/layout.inc | 15 - .../layouts/ShoalCave_HighTideInnerRoom/layout.inc | 15 - .../ShoalCave_LowTideEntranceRoom/layout.inc | 15 - data/layouts/ShoalCave_LowTideIceRoom/layout.inc | 15 - data/layouts/ShoalCave_LowTideInnerRoom/layout.inc | 15 - data/layouts/ShoalCave_LowTideLowerRoom/layout.inc | 15 - .../layouts/ShoalCave_LowTideStairsRoom/layout.inc | 15 - data/layouts/SingleBattleColosseum/layout.inc | 15 - data/layouts/SkyPillar_1F/layout.inc | 15 - data/layouts/SkyPillar_2F/layout.inc | 15 - data/layouts/SkyPillar_3F/layout.inc | 15 - data/layouts/SkyPillar_4F/layout.inc | 15 - data/layouts/SkyPillar_5F/layout.inc | 15 - data/layouts/SkyPillar_Entrance/layout.inc | 15 - data/layouts/SkyPillar_Outside/layout.inc | 15 - data/layouts/SkyPillar_Top/layout.inc | 15 - data/layouts/SlateportCity/layout.inc | 15 - .../SlateportCity_OceanicMuseum_1F/layout.inc | 15 - .../SlateportCity_OceanicMuseum_2F/layout.inc | 15 - .../SlateportCity_PokemonFanClub/layout.inc | 15 - .../SlateportCity_SternsShipyard_1F/layout.inc | 15 - .../SlateportCity_SternsShipyard_2F/layout.inc | 15 - data/layouts/SootopolisCity/layout.inc | 15 - data/layouts/SootopolisCity_Gym_1F/layout.inc | 15 - data/layouts/SootopolisCity_Gym_B1F/layout.inc | 15 - data/layouts/SootopolisCity_House1/layout.inc | 15 - data/layouts/SootopolisCity_House2/layout.inc | 15 - data/layouts/SootopolisCity_House3/layout.inc | 15 - .../SootopolisCity_LotadAndSeedotHouse/layout.inc | 15 - .../layout.inc | 15 - .../layout.inc | 15 - data/layouts/SouthernIsland_Exterior/layout.inc | 15 - data/layouts/SouthernIsland_Interior/layout.inc | 15 - data/layouts/TerraCave_End/layout.inc | 15 - data/layouts/TerraCave_Entrance/layout.inc | 15 - data/layouts/TradeCenter/layout.inc | 15 - data/layouts/TrainerHill_1F/layout.inc | 15 - data/layouts/TrainerHill_2F/layout.inc | 15 - data/layouts/TrainerHill_3F/layout.inc | 15 - data/layouts/TrainerHill_4F/layout.inc | 15 - data/layouts/TrainerHill_Entrance/layout.inc | 15 - data/layouts/TrainerHill_Roof/layout.inc | 15 - data/layouts/Underwater1/layout.inc | 15 - data/layouts/Underwater2/layout.inc | 15 - data/layouts/Underwater3/layout.inc | 15 - data/layouts/Underwater4/layout.inc | 15 - data/layouts/Underwater5/layout.inc | 15 - data/layouts/Underwater6/layout.inc | 15 - data/layouts/Underwater7/layout.inc | 15 - data/layouts/Underwater_MarineCave/layout.inc | 15 - data/layouts/Underwater_Route134/layout.inc | 15 - data/layouts/Underwater_SeafloorCavern/layout.inc | 15 - data/layouts/Underwater_SealedChamber/layout.inc | 15 - data/layouts/Underwater_SootopolisCity/layout.inc | 15 - data/layouts/UnionRoom/layout.inc | 15 - data/layouts/UnknownMap_08417FC4/layout.inc | 15 - data/layouts/UnknownMap_08428450/layout.inc | 15 - data/layouts/UnknownMap_084294C4/layout.inc | 15 - data/layouts/UnknownMap_084294E8/layout.inc | 15 - data/layouts/UnknownMap_0843E6C0/layout.inc | 15 - data/layouts/UnknownMap_0843E6E4/layout.inc | 15 - data/layouts/UnknownMap_0843E708/layout.inc | 15 - data/layouts/UnknownMap_0843E72C/layout.inc | 15 - data/layouts/UnknownMap_0843E750/layout.inc | 15 - data/layouts/UnknownMap_0843E774/layout.inc | 15 - data/layouts/UnknownMap_0843E798/layout.inc | 15 - data/layouts/UnknownMap_0843E7BC/layout.inc | 15 - data/layouts/UnknownMap_0843E7E0/layout.inc | 15 - data/layouts/UnknownMap_0843E804/layout.inc | 15 - data/layouts/UnknownMap_0843E828/layout.inc | 15 - data/layouts/UnknownMap_0843E84C/layout.inc | 15 - data/layouts/UnknownMap_0843E870/layout.inc | 15 - data/layouts/UnknownMap_0843E894/layout.inc | 15 - data/layouts/UnknownMap_08447028/layout.inc | 15 - data/layouts/UnknownMap_0845A394/layout.inc | 15 - data/layouts/UnknownMap_0845D470/layout.inc | 15 - data/layouts/UnknownMap_0845ECB4/layout.inc | 15 - data/layouts/UnknownMap_08469200/layout.inc | 15 - data/layouts/UnknownMap_084693AC/layout.inc | 15 - data/layouts/UnknownMap_08480DAC/layout.inc | 15 - data/layouts/UnknownMap_08480F54/layout.inc | 15 - data/layouts/UnknownMap_084810FC/layout.inc | 15 - data/layouts/UnknownMap_084812A4/layout.inc | 15 - data/layouts/UnknownMap_0848144C/layout.inc | 15 - data/layouts/UnknownMap_084815F4/layout.inc | 15 - data/layouts/UnknownMap_08481B24/layout.inc | 15 - data/layouts/UnknownMap_08481DBC/layout.inc | 15 - data/layouts/UnknownMap_25_29/layout.inc | 15 - data/layouts/UnknownMap_25_30/layout.inc | 15 - data/layouts/UnknownMap_25_31/layout.inc | 15 - data/layouts/UnknownMap_25_32/layout.inc | 15 - data/layouts/UnknownMap_25_33/layout.inc | 15 - data/layouts/UnknownMap_25_34/layout.inc | 15 - data/layouts/VerdanturfTown/layout.inc | 15 - .../VerdanturfTown_BattleTentBattleRoom/layout.inc | 15 - data/layouts/VerdanturfTown_WandasHouse/layout.inc | 15 - data/layouts/VictoryRoad_1F/layout.inc | 15 - data/layouts/VictoryRoad_B1F/layout.inc | 15 - data/layouts/VictoryRoad_B2F/layout.inc | 15 - data/layouts/layouts.json | 4415 ++++++++++++++++++++ data/layouts_table.inc | 443 -- data/map_events.s | 519 +-- data/maps.s | 4 +- data/maps/.gitignore | 7 + data/maps/AbandonedShip_CaptainsOffice/events.inc | 11 - data/maps/AbandonedShip_CaptainsOffice/header.inc | 15 - data/maps/AbandonedShip_CaptainsOffice/map.json | 62 + data/maps/AbandonedShip_Corridors_1F/events.inc | 21 - data/maps/AbandonedShip_Corridors_1F/header.inc | 15 - data/maps/AbandonedShip_Corridors_1F/map.json | 132 + data/maps/AbandonedShip_Corridors_B1F/events.inc | 20 - data/maps/AbandonedShip_Corridors_B1F/header.inc | 15 - data/maps/AbandonedShip_Corridors_B1F/map.json | 113 + data/maps/AbandonedShip_Deck/events.inc | 10 - data/maps/AbandonedShip_Deck/header.inc | 15 - data/maps/AbandonedShip_Deck/map.json | 56 + .../AbandonedShip_HiddenFloorCorridors/events.inc | 17 - .../AbandonedShip_HiddenFloorCorridors/header.inc | 15 - .../AbandonedShip_HiddenFloorCorridors/map.json | 96 + .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 32 - .../maps/AbandonedShip_HiddenFloorRooms/header.inc | 15 - data/maps/AbandonedShip_HiddenFloorRooms/map.json | 218 + data/maps/AbandonedShip_Room_B1F/events.inc | 10 - data/maps/AbandonedShip_Room_B1F/header.inc | 15 - data/maps/AbandonedShip_Room_B1F/map.json | 49 + data/maps/AbandonedShip_Rooms2_1F/events.inc | 15 - data/maps/AbandonedShip_Rooms2_1F/header.inc | 15 - data/maps/AbandonedShip_Rooms2_1F/map.json | 108 + data/maps/AbandonedShip_Rooms2_B1F/events.inc | 13 - data/maps/AbandonedShip_Rooms2_B1F/header.inc | 15 - data/maps/AbandonedShip_Rooms2_B1F/map.json | 76 + data/maps/AbandonedShip_Rooms_1F/events.inc | 17 - data/maps/AbandonedShip_Rooms_1F/header.inc | 15 - data/maps/AbandonedShip_Rooms_1F/map.json | 116 + data/maps/AbandonedShip_Rooms_B1F/events.inc | 12 - data/maps/AbandonedShip_Rooms_B1F/header.inc | 15 - data/maps/AbandonedShip_Rooms_B1F/map.json | 69 + data/maps/AbandonedShip_Underwater1/events.inc | 7 - data/maps/AbandonedShip_Underwater1/header.inc | 15 - data/maps/AbandonedShip_Underwater1/map.json | 35 + data/maps/AbandonedShip_Underwater2/events.inc | 6 - data/maps/AbandonedShip_Underwater2/header.inc | 15 - data/maps/AbandonedShip_Underwater2/map.json | 28 + data/maps/AlteringCave/events.inc | 6 - data/maps/AlteringCave/header.inc | 15 - data/maps/AlteringCave/map.json | 28 + data/maps/AncientTomb/events.inc | 16 - data/maps/AncientTomb/header.inc | 15 - data/maps/AncientTomb/map.json | 81 + data/maps/AquaHideout_1F/events.inc | 13 - data/maps/AquaHideout_1F/header.inc | 15 - data/maps/AquaHideout_1F/map.json | 82 + data/maps/AquaHideout_B1F/events.inc | 41 - data/maps/AquaHideout_B1F/header.inc | 15 - data/maps/AquaHideout_B1F/map.json | 314 ++ data/maps/AquaHideout_B2F/events.inc | 27 - data/maps/AquaHideout_B2F/header.inc | 15 - data/maps/AquaHideout_B2F/map.json | 189 + data/maps/AquaHideout_UnusedRubyMap1/events.inc | 3 - data/maps/AquaHideout_UnusedRubyMap1/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap1/map.json | 20 + data/maps/AquaHideout_UnusedRubyMap2/events.inc | 3 - data/maps/AquaHideout_UnusedRubyMap2/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap2/map.json | 20 + data/maps/AquaHideout_UnusedRubyMap3/events.inc | 3 - data/maps/AquaHideout_UnusedRubyMap3/header.inc | 15 - data/maps/AquaHideout_UnusedRubyMap3/map.json | 20 + data/maps/ArtisanCave_1F/events.inc | 10 - data/maps/ArtisanCave_1F/header.inc | 15 - data/maps/ArtisanCave_1F/map.json | 49 + data/maps/ArtisanCave_B1F/events.inc | 16 - data/maps/ArtisanCave_B1F/header.inc | 15 - data/maps/ArtisanCave_B1F/map.json | 82 + .../events.inc | 14 - .../header.inc | 15 - .../BattleFrontier_BattleArenaBattleRoom/map.json | 138 + .../BattleFrontier_BattleArenaCorridor/events.inc | 6 - .../BattleFrontier_BattleArenaCorridor/header.inc | 15 - .../BattleFrontier_BattleArenaCorridor/map.json | 34 + .../BattleFrontier_BattleArenaLobby/events.inc | 17 - .../BattleFrontier_BattleArenaLobby/header.inc | 15 - data/maps/BattleFrontier_BattleArenaLobby/map.json | 111 + .../BattleFrontier_BattleDomeBattleRoom/events.inc | 20 - .../BattleFrontier_BattleDomeBattleRoom/header.inc | 15 - .../BattleFrontier_BattleDomeBattleRoom/map.json | 216 + .../BattleFrontier_BattleDomeCorridor/events.inc | 10 - .../BattleFrontier_BattleDomeCorridor/header.inc | 15 - .../BattleFrontier_BattleDomeCorridor/map.json | 49 + .../maps/BattleFrontier_BattleDomeLobby/events.inc | 21 - .../maps/BattleFrontier_BattleDomeLobby/header.inc | 15 - data/maps/BattleFrontier_BattleDomeLobby/map.json | 147 + .../events.inc | 10 - .../header.inc | 15 - .../map.json | 49 + .../events.inc | 13 - .../header.inc | 15 - .../map.json | 125 + .../BattleFrontier_BattleFactoryLobby/events.inc | 20 - .../BattleFrontier_BattleFactoryLobby/header.inc | 15 - .../BattleFrontier_BattleFactoryLobby/map.json | 139 + .../events.inc | 6 - .../header.inc | 15 - .../map.json | 34 + .../events.inc | 14 - .../header.inc | 15 - .../BattleFrontier_BattlePalaceBattleRoom/map.json | 101 + .../BattleFrontier_BattlePalaceCorridor/events.inc | 18 - .../BattleFrontier_BattlePalaceCorridor/header.inc | 15 - .../BattleFrontier_BattlePalaceCorridor/map.json | 141 + .../BattleFrontier_BattlePalaceLobby/events.inc | 21 - .../BattleFrontier_BattlePalaceLobby/header.inc | 15 - .../maps/BattleFrontier_BattlePalaceLobby/map.json | 146 + .../BattleFrontier_BattlePikeCorridor/events.inc | 6 - .../BattleFrontier_BattlePikeCorridor/header.inc | 15 - .../BattleFrontier_BattlePikeCorridor/map.json | 34 + .../maps/BattleFrontier_BattlePikeLobby/events.inc | 18 - .../maps/BattleFrontier_BattlePikeLobby/header.inc | 15 - data/maps/BattleFrontier_BattlePikeLobby/map.json | 112 + .../events.inc | 16 - .../header.inc | 15 - .../BattleFrontier_BattlePikeRandomRoom1/map.json | 111 + .../events.inc | 6 - .../header.inc | 15 - .../BattleFrontier_BattlePikeRandomRoom2/map.json | 34 + .../events.inc | 12 - .../header.inc | 15 - .../BattleFrontier_BattlePikeRandomRoom3/map.json | 84 + .../events.inc | 18 - .../header.inc | 15 - .../map.json | 129 + .../events.inc | 19 - .../header.inc | 15 - .../map.json | 160 + .../events.inc | 21 - .../header.inc | 15 - .../map.json | 229 + .../BattleFrontier_BattlePyramidLobby/events.inc | 16 - .../BattleFrontier_BattlePyramidLobby/header.inc | 15 - .../BattleFrontier_BattlePyramidLobby/map.json | 98 + .../BattleFrontier_BattlePyramidTop/events.inc | 10 - .../BattleFrontier_BattlePyramidTop/header.inc | 15 - data/maps/BattleFrontier_BattlePyramidTop/map.json | 57 + .../events.inc | 12 - .../header.inc | 15 - .../BattleFrontier_BattleTowerBattleRoom/map.json | 75 + .../events.inc | 11 - .../header.inc | 15 - .../BattleFrontier_BattleTowerBattleRoom2/map.json | 99 + .../BattleFrontier_BattleTowerCorridor/events.inc | 6 - .../BattleFrontier_BattleTowerCorridor/header.inc | 15 - .../BattleFrontier_BattleTowerCorridor/map.json | 34 + .../BattleFrontier_BattleTowerCorridor2/events.inc | 9 - .../BattleFrontier_BattleTowerCorridor2/header.inc | 15 - .../BattleFrontier_BattleTowerCorridor2/map.json | 73 + .../BattleFrontier_BattleTowerElevator/events.inc | 6 - .../BattleFrontier_BattleTowerElevator/header.inc | 15 - .../BattleFrontier_BattleTowerElevator/map.json | 34 + .../BattleFrontier_BattleTowerLobby/events.inc | 26 - .../BattleFrontier_BattleTowerLobby/header.inc | 15 - data/maps/BattleFrontier_BattleTowerLobby/map.json | 201 + .../events.inc | 14 - .../header.inc | 15 - .../map.json | 138 + data/maps/BattleFrontier_Lounge1/events.inc | 11 - data/maps/BattleFrontier_Lounge1/header.inc | 15 - data/maps/BattleFrontier_Lounge1/map.json | 68 + data/maps/BattleFrontier_Lounge2/events.inc | 14 - data/maps/BattleFrontier_Lounge2/header.inc | 15 - data/maps/BattleFrontier_Lounge2/map.json | 101 + data/maps/BattleFrontier_Lounge3/events.inc | 13 - data/maps/BattleFrontier_Lounge3/header.inc | 15 - data/maps/BattleFrontier_Lounge3/map.json | 94 + data/maps/BattleFrontier_Lounge4/events.inc | 11 - data/maps/BattleFrontier_Lounge4/header.inc | 15 - data/maps/BattleFrontier_Lounge4/map.json | 68 + data/maps/BattleFrontier_Lounge5/events.inc | 13 - data/maps/BattleFrontier_Lounge5/header.inc | 15 - data/maps/BattleFrontier_Lounge5/map.json | 88 + data/maps/BattleFrontier_Lounge6/events.inc | 9 - data/maps/BattleFrontier_Lounge6/header.inc | 15 - data/maps/BattleFrontier_Lounge6/map.json | 42 + data/maps/BattleFrontier_Lounge7/events.inc | 12 - data/maps/BattleFrontier_Lounge7/header.inc | 15 - data/maps/BattleFrontier_Lounge7/map.json | 81 + data/maps/BattleFrontier_Lounge8/events.inc | 11 - data/maps/BattleFrontier_Lounge8/header.inc | 15 - data/maps/BattleFrontier_Lounge8/map.json | 68 + data/maps/BattleFrontier_Lounge9/events.inc | 10 - data/maps/BattleFrontier_Lounge9/header.inc | 15 - data/maps/BattleFrontier_Lounge9/map.json | 49 + data/maps/BattleFrontier_Mart/events.inc | 13 - data/maps/BattleFrontier_Mart/header.inc | 15 - data/maps/BattleFrontier_Mart/map.json | 88 + .../BattleFrontier_OutsideEast/connections.inc | 7 - data/maps/BattleFrontier_OutsideEast/events.inc | 57 - data/maps/BattleFrontier_OutsideEast/header.inc | 15 - data/maps/BattleFrontier_OutsideEast/map.json | 529 +++ .../BattleFrontier_OutsideWest/connections.inc | 7 - data/maps/BattleFrontier_OutsideWest/events.inc | 49 - data/maps/BattleFrontier_OutsideWest/header.inc | 15 - data/maps/BattleFrontier_OutsideWest/map.json | 458 ++ .../BattleFrontier_PokemonCenter_1F/events.inc | 15 - .../BattleFrontier_PokemonCenter_1F/header.inc | 15 - data/maps/BattleFrontier_PokemonCenter_1F/map.json | 108 + .../BattleFrontier_PokemonCenter_2F/events.inc | 14 - .../BattleFrontier_PokemonCenter_2F/header.inc | 15 - data/maps/BattleFrontier_PokemonCenter_2F/map.json | 95 + data/maps/BattleFrontier_RankingHall/events.inc | 26 - data/maps/BattleFrontier_RankingHall/header.inc | 15 - data/maps/BattleFrontier_RankingHall/map.json | 172 + data/maps/BattleFrontier_ReceptionGate/events.inc | 14 - data/maps/BattleFrontier_ReceptionGate/header.inc | 15 - data/maps/BattleFrontier_ReceptionGate/map.json | 101 + data/maps/BattleFrontier_ScottsHouse/events.inc | 10 - data/maps/BattleFrontier_ScottsHouse/header.inc | 15 - data/maps/BattleFrontier_ScottsHouse/map.json | 49 + data/maps/BattlePyramidSquare01/events.inc | 12 - data/maps/BattlePyramidSquare01/header.inc | 15 - data/maps/BattlePyramidSquare01/map.json | 112 + data/maps/BattlePyramidSquare02/events.inc | 12 - data/maps/BattlePyramidSquare02/header.inc | 15 - data/maps/BattlePyramidSquare02/map.json | 112 + data/maps/BattlePyramidSquare03/events.inc | 12 - data/maps/BattlePyramidSquare03/header.inc | 15 - data/maps/BattlePyramidSquare03/map.json | 112 + data/maps/BattlePyramidSquare04/events.inc | 12 - data/maps/BattlePyramidSquare04/header.inc | 15 - data/maps/BattlePyramidSquare04/map.json | 112 + data/maps/BattlePyramidSquare05/events.inc | 12 - data/maps/BattlePyramidSquare05/header.inc | 15 - data/maps/BattlePyramidSquare05/map.json | 112 + data/maps/BattlePyramidSquare06/events.inc | 12 - data/maps/BattlePyramidSquare06/header.inc | 15 - data/maps/BattlePyramidSquare06/map.json | 112 + data/maps/BattlePyramidSquare07/events.inc | 12 - data/maps/BattlePyramidSquare07/header.inc | 15 - data/maps/BattlePyramidSquare07/map.json | 112 + data/maps/BattlePyramidSquare08/events.inc | 12 - data/maps/BattlePyramidSquare08/header.inc | 15 - data/maps/BattlePyramidSquare08/map.json | 112 + data/maps/BattlePyramidSquare09/events.inc | 12 - data/maps/BattlePyramidSquare09/header.inc | 15 - data/maps/BattlePyramidSquare09/map.json | 112 + data/maps/BattlePyramidSquare10/events.inc | 12 - data/maps/BattlePyramidSquare10/header.inc | 15 - data/maps/BattlePyramidSquare10/map.json | 112 + data/maps/BattlePyramidSquare11/events.inc | 12 - data/maps/BattlePyramidSquare11/header.inc | 15 - data/maps/BattlePyramidSquare11/map.json | 112 + data/maps/BattlePyramidSquare12/events.inc | 12 - data/maps/BattlePyramidSquare12/header.inc | 15 - data/maps/BattlePyramidSquare12/map.json | 112 + data/maps/BattlePyramidSquare13/events.inc | 12 - data/maps/BattlePyramidSquare13/header.inc | 15 - data/maps/BattlePyramidSquare13/map.json | 112 + data/maps/BattlePyramidSquare14/events.inc | 12 - data/maps/BattlePyramidSquare14/header.inc | 15 - data/maps/BattlePyramidSquare14/map.json | 112 + data/maps/BattlePyramidSquare15/events.inc | 12 - data/maps/BattlePyramidSquare15/header.inc | 15 - data/maps/BattlePyramidSquare15/map.json | 112 + data/maps/BattlePyramidSquare16/events.inc | 12 - data/maps/BattlePyramidSquare16/header.inc | 15 - data/maps/BattlePyramidSquare16/map.json | 112 + data/maps/BirthIsland_Exterior/events.inc | 10 - data/maps/BirthIsland_Exterior/header.inc | 15 - data/maps/BirthIsland_Exterior/map.json | 55 + data/maps/BirthIsland_Harbor/events.inc | 10 - data/maps/BirthIsland_Harbor/header.inc | 15 - data/maps/BirthIsland_Harbor/map.json | 55 + data/maps/CaveOfOrigin_1F/events.inc | 7 - data/maps/CaveOfOrigin_1F/header.inc | 15 - data/maps/CaveOfOrigin_1F/map.json | 35 + data/maps/CaveOfOrigin_B1F/events.inc | 9 - data/maps/CaveOfOrigin_B1F/header.inc | 15 - data/maps/CaveOfOrigin_B1F/map.json | 42 + data/maps/CaveOfOrigin_Entrance/events.inc | 7 - data/maps/CaveOfOrigin_Entrance/header.inc | 15 - data/maps/CaveOfOrigin_Entrance/map.json | 35 + .../CaveOfOrigin_UnusedRubySapphireMap1/events.inc | 7 - .../CaveOfOrigin_UnusedRubySapphireMap1/header.inc | 15 - .../CaveOfOrigin_UnusedRubySapphireMap1/map.json | 35 + .../CaveOfOrigin_UnusedRubySapphireMap2/events.inc | 7 - .../CaveOfOrigin_UnusedRubySapphireMap2/header.inc | 15 - .../CaveOfOrigin_UnusedRubySapphireMap2/map.json | 35 + .../CaveOfOrigin_UnusedRubySapphireMap3/events.inc | 7 - .../CaveOfOrigin_UnusedRubySapphireMap3/header.inc | 15 - .../CaveOfOrigin_UnusedRubySapphireMap3/map.json | 35 + data/maps/DesertRuins/events.inc | 16 - data/maps/DesertRuins/header.inc | 15 - data/maps/DesertRuins/map.json | 81 + data/maps/DesertUnderpass/events.inc | 9 - data/maps/DesertUnderpass/header.inc | 15 - data/maps/DesertUnderpass/map.json | 42 + data/maps/DewfordTown/connections.inc | 8 - data/maps/DewfordTown/events.inc | 24 - data/maps/DewfordTown/header.inc | 15 - data/maps/DewfordTown/map.json | 174 + data/maps/DewfordTown_Gym/events.inc | 23 - data/maps/DewfordTown_Gym/header.inc | 15 - data/maps/DewfordTown_Gym/map.json | 173 + data/maps/DewfordTown_Hall/events.inc | 22 - data/maps/DewfordTown_Hall/header.inc | 15 - data/maps/DewfordTown_Hall/map.json | 170 + data/maps/DewfordTown_House1/events.inc | 12 - data/maps/DewfordTown_House1/header.inc | 15 - data/maps/DewfordTown_House1/map.json | 75 + data/maps/DewfordTown_House2/events.inc | 11 - data/maps/DewfordTown_House2/header.inc | 15 - data/maps/DewfordTown_House2/map.json | 62 + data/maps/DewfordTown_PokemonCenter_1F/events.inc | 13 - data/maps/DewfordTown_PokemonCenter_1F/header.inc | 15 - data/maps/DewfordTown_PokemonCenter_1F/map.json | 82 + data/maps/DewfordTown_PokemonCenter_2F/events.inc | 14 - data/maps/DewfordTown_PokemonCenter_2F/header.inc | 15 - data/maps/DewfordTown_PokemonCenter_2F/map.json | 95 + data/maps/DoubleBattleColosseum/events.inc | 15 - data/maps/DoubleBattleColosseum/header.inc | 15 - data/maps/DoubleBattleColosseum/map.json | 86 + data/maps/EverGrandeCity/connections.inc | 7 - data/maps/EverGrandeCity/events.inc | 29 - data/maps/EverGrandeCity/header.inc | 15 - data/maps/EverGrandeCity/map.json | 196 + data/maps/EverGrandeCity_ChampionsRoom/events.inc | 12 - data/maps/EverGrandeCity_ChampionsRoom/header.inc | 15 - data/maps/EverGrandeCity_ChampionsRoom/map.json | 75 + data/maps/EverGrandeCity_DrakesRoom/events.inc | 10 - data/maps/EverGrandeCity_DrakesRoom/header.inc | 15 - data/maps/EverGrandeCity_DrakesRoom/map.json | 49 + data/maps/EverGrandeCity_GlaciasRoom/events.inc | 10 - data/maps/EverGrandeCity_GlaciasRoom/header.inc | 15 - data/maps/EverGrandeCity_GlaciasRoom/map.json | 49 + data/maps/EverGrandeCity_Hall1/events.inc | 9 - data/maps/EverGrandeCity_Hall1/header.inc | 15 - data/maps/EverGrandeCity_Hall1/map.json | 49 + data/maps/EverGrandeCity_Hall2/events.inc | 9 - data/maps/EverGrandeCity_Hall2/header.inc | 15 - data/maps/EverGrandeCity_Hall2/map.json | 49 + data/maps/EverGrandeCity_Hall3/events.inc | 9 - data/maps/EverGrandeCity_Hall3/header.inc | 15 - data/maps/EverGrandeCity_Hall3/map.json | 49 + data/maps/EverGrandeCity_Hall4/events.inc | 7 - data/maps/EverGrandeCity_Hall4/header.inc | 15 - data/maps/EverGrandeCity_Hall4/map.json | 35 + data/maps/EverGrandeCity_Hall5/events.inc | 9 - data/maps/EverGrandeCity_Hall5/header.inc | 15 - data/maps/EverGrandeCity_Hall5/map.json | 49 + data/maps/EverGrandeCity_HallOfFame/events.inc | 9 - data/maps/EverGrandeCity_HallOfFame/header.inc | 15 - data/maps/EverGrandeCity_HallOfFame/map.json | 42 + data/maps/EverGrandeCity_PhoebesRoom/events.inc | 10 - data/maps/EverGrandeCity_PhoebesRoom/header.inc | 15 - data/maps/EverGrandeCity_PhoebesRoom/map.json | 49 + .../EverGrandeCity_PokemonCenter_1F/events.inc | 14 - .../EverGrandeCity_PokemonCenter_1F/header.inc | 15 - data/maps/EverGrandeCity_PokemonCenter_1F/map.json | 95 + .../EverGrandeCity_PokemonCenter_2F/events.inc | 14 - .../EverGrandeCity_PokemonCenter_2F/header.inc | 15 - data/maps/EverGrandeCity_PokemonCenter_2F/map.json | 95 + .../EverGrandeCity_PokemonLeague_1F/events.inc | 16 - .../EverGrandeCity_PokemonLeague_1F/header.inc | 15 - data/maps/EverGrandeCity_PokemonLeague_1F/map.json | 109 + .../EverGrandeCity_PokemonLeague_2F/events.inc | 14 - .../EverGrandeCity_PokemonLeague_2F/header.inc | 15 - data/maps/EverGrandeCity_PokemonLeague_2F/map.json | 95 + data/maps/EverGrandeCity_SidneysRoom/events.inc | 10 - data/maps/EverGrandeCity_SidneysRoom/header.inc | 15 - data/maps/EverGrandeCity_SidneysRoom/map.json | 49 + data/maps/FallarborTown/connections.inc | 8 - data/maps/FallarborTown/events.inc | 26 - data/maps/FallarborTown/header.inc | 15 - data/maps/FallarborTown/map.json | 185 + .../FallarborTown_BattleTentBattleRoom/events.inc | 8 - .../FallarborTown_BattleTentBattleRoom/header.inc | 15 - .../FallarborTown_BattleTentBattleRoom/map.json | 60 + .../FallarborTown_BattleTentCorridor/events.inc | 6 - .../FallarborTown_BattleTentCorridor/header.inc | 15 - .../maps/FallarborTown_BattleTentCorridor/map.json | 34 + data/maps/FallarborTown_BattleTentLobby/events.inc | 17 - data/maps/FallarborTown_BattleTentLobby/header.inc | 15 - data/maps/FallarborTown_BattleTentLobby/map.json | 110 + data/maps/FallarborTown_House1/events.inc | 11 - data/maps/FallarborTown_House1/header.inc | 15 - data/maps/FallarborTown_House1/map.json | 62 + data/maps/FallarborTown_House2/events.inc | 10 - data/maps/FallarborTown_House2/header.inc | 15 - data/maps/FallarborTown_House2/map.json | 49 + data/maps/FallarborTown_Mart/events.inc | 14 - data/maps/FallarborTown_Mart/header.inc | 15 - data/maps/FallarborTown_Mart/map.json | 101 + .../maps/FallarborTown_PokemonCenter_1F/events.inc | 14 - .../maps/FallarborTown_PokemonCenter_1F/header.inc | 15 - data/maps/FallarborTown_PokemonCenter_1F/map.json | 95 + .../maps/FallarborTown_PokemonCenter_2F/events.inc | 14 - .../maps/FallarborTown_PokemonCenter_2F/header.inc | 15 - data/maps/FallarborTown_PokemonCenter_2F/map.json | 95 + data/maps/FarawayIsland_Entrance/events.inc | 19 - data/maps/FarawayIsland_Entrance/header.inc | 15 - data/maps/FarawayIsland_Entrance/map.json | 99 + data/maps/FarawayIsland_Interior/events.inc | 10 - data/maps/FarawayIsland_Interior/header.inc | 15 - data/maps/FarawayIsland_Interior/map.json | 49 + data/maps/FieryPath/events.inc | 17 - data/maps/FieryPath/header.inc | 15 - data/maps/FieryPath/map.json | 140 + data/maps/FortreeCity/connections.inc | 8 - data/maps/FortreeCity/events.inc | 31 - data/maps/FortreeCity/header.inc | 15 - data/maps/FortreeCity/map.json | 236 ++ data/maps/FortreeCity_DecorationShop/events.inc | 13 - data/maps/FortreeCity_DecorationShop/header.inc | 15 - data/maps/FortreeCity_DecorationShop/map.json | 88 + data/maps/FortreeCity_Gym/events.inc | 21 - data/maps/FortreeCity_Gym/header.inc | 15 - data/maps/FortreeCity_Gym/map.json | 157 + data/maps/FortreeCity_House1/events.inc | 12 - data/maps/FortreeCity_House1/header.inc | 15 - data/maps/FortreeCity_House1/map.json | 75 + data/maps/FortreeCity_House2/events.inc | 11 - data/maps/FortreeCity_House2/header.inc | 15 - data/maps/FortreeCity_House2/map.json | 62 + data/maps/FortreeCity_House3/events.inc | 11 - data/maps/FortreeCity_House3/header.inc | 15 - data/maps/FortreeCity_House3/map.json | 62 + data/maps/FortreeCity_House4/events.inc | 12 - data/maps/FortreeCity_House4/header.inc | 15 - data/maps/FortreeCity_House4/map.json | 75 + data/maps/FortreeCity_House5/events.inc | 12 - data/maps/FortreeCity_House5/header.inc | 15 - data/maps/FortreeCity_House5/map.json | 75 + data/maps/FortreeCity_Mart/events.inc | 13 - data/maps/FortreeCity_Mart/header.inc | 15 - data/maps/FortreeCity_Mart/map.json | 88 + data/maps/FortreeCity_PokemonCenter_1F/events.inc | 14 - data/maps/FortreeCity_PokemonCenter_1F/header.inc | 15 - data/maps/FortreeCity_PokemonCenter_1F/map.json | 95 + data/maps/FortreeCity_PokemonCenter_2F/events.inc | 14 - data/maps/FortreeCity_PokemonCenter_2F/header.inc | 15 - data/maps/FortreeCity_PokemonCenter_2F/map.json | 95 + data/maps/GraniteCave_1F/events.inc | 13 - data/maps/GraniteCave_1F/header.inc | 15 - data/maps/GraniteCave_1F/map.json | 76 + data/maps/GraniteCave_B1F/events.inc | 15 - data/maps/GraniteCave_B1F/header.inc | 15 - data/maps/GraniteCave_B1F/map.json | 84 + data/maps/GraniteCave_B2F/events.inc | 25 - data/maps/GraniteCave_B2F/header.inc | 15 - data/maps/GraniteCave_B2F/map.json | 191 + data/maps/GraniteCave_StevensRoom/events.inc | 9 - data/maps/GraniteCave_StevensRoom/header.inc | 15 - data/maps/GraniteCave_StevensRoom/map.json | 42 + data/maps/InsideOfTruck/events.inc | 25 - data/maps/InsideOfTruck/header.inc | 15 - data/maps/InsideOfTruck/map.json | 151 + data/maps/IslandCave/events.inc | 16 - data/maps/IslandCave/header.inc | 15 - data/maps/IslandCave/map.json | 81 + data/maps/JaggedPass/events.inc | 35 - data/maps/JaggedPass/header.inc | 15 - data/maps/JaggedPass/map.json | 246 ++ data/maps/LavaridgeTown/connections.inc | 7 - data/maps/LavaridgeTown/events.inc | 35 - data/maps/LavaridgeTown/header.inc | 15 - data/maps/LavaridgeTown/map.json | 262 ++ data/maps/LavaridgeTown_Gym_1F/events.inc | 43 - data/maps/LavaridgeTown_Gym_1F/header.inc | 15 - data/maps/LavaridgeTown_Gym_1F/map.json | 299 ++ data/maps/LavaridgeTown_Gym_B1F/events.inc | 35 - data/maps/LavaridgeTown_Gym_B1F/header.inc | 15 - data/maps/LavaridgeTown_Gym_B1F/map.json | 242 ++ data/maps/LavaridgeTown_HerbShop/events.inc | 12 - data/maps/LavaridgeTown_HerbShop/header.inc | 15 - data/maps/LavaridgeTown_HerbShop/map.json | 75 + data/maps/LavaridgeTown_House/events.inc | 12 - data/maps/LavaridgeTown_House/header.inc | 15 - data/maps/LavaridgeTown_House/map.json | 75 + data/maps/LavaridgeTown_Mart/events.inc | 12 - data/maps/LavaridgeTown_Mart/header.inc | 15 - data/maps/LavaridgeTown_Mart/map.json | 75 + .../maps/LavaridgeTown_PokemonCenter_1F/events.inc | 15 - .../maps/LavaridgeTown_PokemonCenter_1F/header.inc | 15 - data/maps/LavaridgeTown_PokemonCenter_1F/map.json | 102 + .../maps/LavaridgeTown_PokemonCenter_2F/events.inc | 14 - .../maps/LavaridgeTown_PokemonCenter_2F/header.inc | 15 - data/maps/LavaridgeTown_PokemonCenter_2F/map.json | 95 + data/maps/LilycoveCity/connections.inc | 8 - data/maps/LilycoveCity/events.inc | 58 - data/maps/LilycoveCity/header.inc | 15 - data/maps/LilycoveCity/map.json | 522 +++ data/maps/LilycoveCity_ContestHall/events.inc | 51 - data/maps/LilycoveCity_ContestHall/header.inc | 15 - data/maps/LilycoveCity_ContestHall/map.json | 515 +++ data/maps/LilycoveCity_ContestLobby/events.inc | 50 - data/maps/LilycoveCity_ContestLobby/header.inc | 15 - data/maps/LilycoveCity_ContestLobby/map.json | 472 +++ data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 14 - data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc | 15 - data/maps/LilycoveCity_CoveLilyMotel_1F/map.json | 66 + data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc | 15 - data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc | 15 - data/maps/LilycoveCity_CoveLilyMotel_2F/map.json | 120 + .../events.inc | 10 - .../header.inc | 15 - .../LilycoveCity_DepartmentStoreElevator/map.json | 49 + .../LilycoveCity_DepartmentStoreRooftop/events.inc | 16 - .../LilycoveCity_DepartmentStoreRooftop/header.inc | 15 - .../LilycoveCity_DepartmentStoreRooftop/map.json | 98 + .../LilycoveCity_DepartmentStore_1F/events.inc | 20 - .../LilycoveCity_DepartmentStore_1F/header.inc | 15 - data/maps/LilycoveCity_DepartmentStore_1F/map.json | 137 + .../LilycoveCity_DepartmentStore_2F/events.inc | 15 - .../LilycoveCity_DepartmentStore_2F/header.inc | 15 - data/maps/LilycoveCity_DepartmentStore_2F/map.json | 108 + .../LilycoveCity_DepartmentStore_3F/events.inc | 15 - .../LilycoveCity_DepartmentStore_3F/header.inc | 15 - data/maps/LilycoveCity_DepartmentStore_3F/map.json | 108 + .../LilycoveCity_DepartmentStore_4F/events.inc | 15 - .../LilycoveCity_DepartmentStore_4F/header.inc | 15 - data/maps/LilycoveCity_DepartmentStore_4F/map.json | 108 + .../LilycoveCity_DepartmentStore_5F/events.inc | 17 - .../LilycoveCity_DepartmentStore_5F/header.inc | 15 - data/maps/LilycoveCity_DepartmentStore_5F/map.json | 134 + data/maps/LilycoveCity_Harbor/events.inc | 14 - data/maps/LilycoveCity_Harbor/header.inc | 15 - data/maps/LilycoveCity_Harbor/map.json | 101 + data/maps/LilycoveCity_House1/events.inc | 11 - data/maps/LilycoveCity_House1/header.inc | 15 - data/maps/LilycoveCity_House1/map.json | 62 + data/maps/LilycoveCity_House2/events.inc | 10 - data/maps/LilycoveCity_House2/header.inc | 15 - data/maps/LilycoveCity_House2/map.json | 49 + data/maps/LilycoveCity_House3/events.inc | 15 - data/maps/LilycoveCity_House3/header.inc | 15 - data/maps/LilycoveCity_House3/map.json | 114 + data/maps/LilycoveCity_House4/events.inc | 11 - data/maps/LilycoveCity_House4/header.inc | 15 - data/maps/LilycoveCity_House4/map.json | 62 + .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 38 - .../maps/LilycoveCity_LilycoveMuseum_1F/header.inc | 15 - data/maps/LilycoveCity_LilycoveMuseum_1F/map.json | 302 ++ .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 26 - .../maps/LilycoveCity_LilycoveMuseum_2F/header.inc | 15 - data/maps/LilycoveCity_LilycoveMuseum_2F/map.json | 178 + .../maps/LilycoveCity_MoveDeletersHouse/events.inc | 10 - .../maps/LilycoveCity_MoveDeletersHouse/header.inc | 15 - data/maps/LilycoveCity_MoveDeletersHouse/map.json | 49 + data/maps/LilycoveCity_PokemonCenter_1F/events.inc | 15 - data/maps/LilycoveCity_PokemonCenter_1F/header.inc | 15 - data/maps/LilycoveCity_PokemonCenter_1F/map.json | 108 + data/maps/LilycoveCity_PokemonCenter_2F/events.inc | 14 - data/maps/LilycoveCity_PokemonCenter_2F/header.inc | 15 - data/maps/LilycoveCity_PokemonCenter_2F/map.json | 95 + .../LilycoveCity_PokemonTrainerFanClub/events.inc | 18 - .../LilycoveCity_PokemonTrainerFanClub/header.inc | 15 - .../LilycoveCity_PokemonTrainerFanClub/map.json | 153 + data/maps/LilycoveCity_UnusedMart/events.inc | 7 - data/maps/LilycoveCity_UnusedMart/header.inc | 15 - data/maps/LilycoveCity_UnusedMart/map.json | 35 + data/maps/LinkContestRoom1/events.inc | 20 - data/maps/LinkContestRoom1/header.inc | 15 - data/maps/LinkContestRoom1/map.json | 216 + data/maps/LinkContestRoom2/events.inc | 1 - data/maps/LinkContestRoom2/header.inc | 15 - data/maps/LinkContestRoom2/map.json | 18 + data/maps/LinkContestRoom3/events.inc | 1 - data/maps/LinkContestRoom3/header.inc | 15 - data/maps/LinkContestRoom3/map.json | 18 + data/maps/LinkContestRoom4/events.inc | 1 - data/maps/LinkContestRoom4/header.inc | 15 - data/maps/LinkContestRoom4/map.json | 18 + data/maps/LinkContestRoom5/events.inc | 1 - data/maps/LinkContestRoom5/header.inc | 15 - data/maps/LinkContestRoom5/map.json | 18 + data/maps/LinkContestRoom6/events.inc | 1 - data/maps/LinkContestRoom6/header.inc | 15 - data/maps/LinkContestRoom6/map.json | 18 + data/maps/LittlerootTown/connections.inc | 7 - data/maps/LittlerootTown/events.inc | 35 - data/maps/LittlerootTown/header.inc | 15 - data/maps/LittlerootTown/map.json | 268 ++ .../LittlerootTown_BrendansHouse_1F/events.inc | 23 - .../LittlerootTown_BrendansHouse_1F/header.inc | 15 - data/maps/LittlerootTown_BrendansHouse_1F/map.json | 171 + .../LittlerootTown_BrendansHouse_2F/events.inc | 30 - .../LittlerootTown_BrendansHouse_2F/header.inc | 15 - data/maps/LittlerootTown_BrendansHouse_2F/map.json | 270 ++ data/maps/LittlerootTown_MaysHouse_1F/events.inc | 23 - data/maps/LittlerootTown_MaysHouse_1F/header.inc | 15 - data/maps/LittlerootTown_MaysHouse_1F/map.json | 171 + data/maps/LittlerootTown_MaysHouse_2F/events.inc | 30 - data/maps/LittlerootTown_MaysHouse_2F/header.inc | 15 - data/maps/LittlerootTown_MaysHouse_2F/map.json | 270 ++ .../LittlerootTown_ProfessorBirchsLab/events.inc | 32 - .../LittlerootTown_ProfessorBirchsLab/header.inc | 15 - .../LittlerootTown_ProfessorBirchsLab/map.json | 235 ++ .../LittlerootTown_ProfessorBirchsLab/scripts.inc | 4 +- data/maps/MagmaHideout_1F/events.inc | 17 - data/maps/MagmaHideout_1F/header.inc | 15 - data/maps/MagmaHideout_1F/map.json | 128 + data/maps/MagmaHideout_2F_1R/events.inc | 14 - data/maps/MagmaHideout_2F_1R/header.inc | 15 - data/maps/MagmaHideout_2F_1R/map.json | 95 + data/maps/MagmaHideout_2F_2R/events.inc | 15 - data/maps/MagmaHideout_2F_2R/header.inc | 15 - data/maps/MagmaHideout_2F_2R/map.json | 114 + data/maps/MagmaHideout_2F_3R/events.inc | 7 - data/maps/MagmaHideout_2F_3R/header.inc | 15 - data/maps/MagmaHideout_2F_3R/map.json | 35 + data/maps/MagmaHideout_3F_1R/events.inc | 13 - data/maps/MagmaHideout_3F_1R/header.inc | 15 - data/maps/MagmaHideout_3F_1R/map.json | 82 + data/maps/MagmaHideout_3F_2R/events.inc | 10 - data/maps/MagmaHideout_3F_2R/header.inc | 15 - data/maps/MagmaHideout_3F_2R/map.json | 55 + data/maps/MagmaHideout_3F_3R/events.inc | 10 - data/maps/MagmaHideout_3F_3R/header.inc | 15 - data/maps/MagmaHideout_3F_3R/map.json | 49 + data/maps/MagmaHideout_4F/events.inc | 17 - data/maps/MagmaHideout_4F/header.inc | 15 - data/maps/MagmaHideout_4F/map.json | 140 + data/maps/MarineCave_End/events.inc | 12 - data/maps/MarineCave_End/header.inc | 15 - data/maps/MarineCave_End/map.json | 52 + data/maps/MarineCave_Entrance/events.inc | 6 - data/maps/MarineCave_Entrance/header.inc | 15 - data/maps/MarineCave_Entrance/map.json | 28 + data/maps/MauvilleCity/connections.inc | 10 - data/maps/MauvilleCity/events.inc | 35 - data/maps/MauvilleCity/header.inc | 15 - data/maps/MauvilleCity/map.json | 300 ++ data/maps/MauvilleCity_BikeShop/events.inc | 15 - data/maps/MauvilleCity_BikeShop/header.inc | 15 - data/maps/MauvilleCity_BikeShop/map.json | 79 + data/maps/MauvilleCity_GameCorner/events.inc | 47 - data/maps/MauvilleCity_GameCorner/header.inc | 15 - data/maps/MauvilleCity_GameCorner/map.json | 385 ++ data/maps/MauvilleCity_Gym/events.inc | 26 - data/maps/MauvilleCity_Gym/header.inc | 15 - data/maps/MauvilleCity_Gym/map.json | 181 + data/maps/MauvilleCity_House1/events.inc | 10 - data/maps/MauvilleCity_House1/header.inc | 15 - data/maps/MauvilleCity_House1/map.json | 49 + data/maps/MauvilleCity_House2/events.inc | 10 - data/maps/MauvilleCity_House2/header.inc | 15 - data/maps/MauvilleCity_House2/map.json | 49 + data/maps/MauvilleCity_Mart/events.inc | 12 - data/maps/MauvilleCity_Mart/header.inc | 15 - data/maps/MauvilleCity_Mart/map.json | 75 + data/maps/MauvilleCity_PokemonCenter_1F/events.inc | 15 - data/maps/MauvilleCity_PokemonCenter_1F/header.inc | 15 - data/maps/MauvilleCity_PokemonCenter_1F/map.json | 108 + data/maps/MauvilleCity_PokemonCenter_2F/events.inc | 15 - data/maps/MauvilleCity_PokemonCenter_2F/header.inc | 15 - data/maps/MauvilleCity_PokemonCenter_2F/map.json | 108 + data/maps/MeteorFalls_1F_1R/events.inc | 29 - data/maps/MeteorFalls_1F_1R/header.inc | 15 - data/maps/MeteorFalls_1F_1R/map.json | 213 + data/maps/MeteorFalls_1F_2R/events.inc | 17 - data/maps/MeteorFalls_1F_2R/header.inc | 15 - data/maps/MeteorFalls_1F_2R/map.json | 98 + data/maps/MeteorFalls_B1F_1R/events.inc | 11 - data/maps/MeteorFalls_B1F_1R/header.inc | 15 - data/maps/MeteorFalls_B1F_1R/map.json | 63 + data/maps/MeteorFalls_B1F_2R/events.inc | 9 - data/maps/MeteorFalls_B1F_2R/header.inc | 15 - data/maps/MeteorFalls_B1F_2R/map.json | 42 + data/maps/MeteorFalls_StevensCave/events.inc | 9 - data/maps/MeteorFalls_StevensCave/header.inc | 15 - data/maps/MeteorFalls_StevensCave/map.json | 42 + data/maps/MirageTower_1F/events.inc | 7 - data/maps/MirageTower_1F/header.inc | 15 - data/maps/MirageTower_1F/map.json | 35 + data/maps/MirageTower_2F/events.inc | 7 - data/maps/MirageTower_2F/header.inc | 15 - data/maps/MirageTower_2F/map.json | 35 + data/maps/MirageTower_3F/events.inc | 11 - data/maps/MirageTower_3F/header.inc | 15 - data/maps/MirageTower_3F/map.json | 62 + data/maps/MirageTower_4F/events.inc | 11 - data/maps/MirageTower_4F/header.inc | 15 - data/maps/MirageTower_4F/map.json | 68 + data/maps/MossdeepCity/connections.inc | 9 - data/maps/MossdeepCity/events.inc | 56 - data/maps/MossdeepCity/header.inc | 15 - data/maps/MossdeepCity/map.json | 485 +++ data/maps/MossdeepCity_GameCorner_1F/events.inc | 17 - data/maps/MossdeepCity_GameCorner_1F/header.inc | 15 - data/maps/MossdeepCity_GameCorner_1F/map.json | 94 + data/maps/MossdeepCity_GameCorner_B1F/events.inc | 9 - data/maps/MossdeepCity_GameCorner_B1F/header.inc | 15 - data/maps/MossdeepCity_GameCorner_B1F/map.json | 42 + data/maps/MossdeepCity_Gym/events.inc | 72 - data/maps/MossdeepCity_Gym/header.inc | 15 - data/maps/MossdeepCity_Gym/map.json | 687 +++ data/maps/MossdeepCity_House1/events.inc | 11 - data/maps/MossdeepCity_House1/header.inc | 15 - data/maps/MossdeepCity_House1/map.json | 62 + data/maps/MossdeepCity_House2/events.inc | 12 - data/maps/MossdeepCity_House2/header.inc | 15 - data/maps/MossdeepCity_House2/map.json | 75 + data/maps/MossdeepCity_House3/events.inc | 10 - data/maps/MossdeepCity_House3/header.inc | 15 - data/maps/MossdeepCity_House3/map.json | 49 + data/maps/MossdeepCity_House4/events.inc | 12 - data/maps/MossdeepCity_House4/header.inc | 15 - data/maps/MossdeepCity_House4/map.json | 75 + data/maps/MossdeepCity_Mart/events.inc | 13 - data/maps/MossdeepCity_Mart/header.inc | 15 - data/maps/MossdeepCity_Mart/map.json | 88 + data/maps/MossdeepCity_PokemonCenter_1F/events.inc | 13 - data/maps/MossdeepCity_PokemonCenter_1F/header.inc | 15 - data/maps/MossdeepCity_PokemonCenter_1F/map.json | 82 + data/maps/MossdeepCity_PokemonCenter_2F/events.inc | 15 - data/maps/MossdeepCity_PokemonCenter_2F/header.inc | 15 - data/maps/MossdeepCity_PokemonCenter_2F/map.json | 108 + data/maps/MossdeepCity_SpaceCenter_1F/events.inc | 21 - data/maps/MossdeepCity_SpaceCenter_1F/header.inc | 15 - data/maps/MossdeepCity_SpaceCenter_1F/map.json | 186 + data/maps/MossdeepCity_SpaceCenter_2F/events.inc | 17 - data/maps/MossdeepCity_SpaceCenter_2F/header.inc | 15 - data/maps/MossdeepCity_SpaceCenter_2F/map.json | 146 + data/maps/MossdeepCity_StevensHouse/events.inc | 18 - data/maps/MossdeepCity_StevensHouse/header.inc | 15 - data/maps/MossdeepCity_StevensHouse/map.json | 108 + data/maps/MtChimney/events.inc | 45 - data/maps/MtChimney/header.inc | 15 - data/maps/MtChimney/map.json | 457 ++ data/maps/MtChimney_CableCarStation/events.inc | 11 - data/maps/MtChimney_CableCarStation/header.inc | 15 - data/maps/MtChimney_CableCarStation/map.json | 62 + data/maps/MtPyre_1F/events.inc | 16 - data/maps/MtPyre_1F/header.inc | 15 - data/maps/MtPyre_1F/map.json | 103 + data/maps/MtPyre_2F/events.inc | 20 - data/maps/MtPyre_2F/header.inc | 15 - data/maps/MtPyre_2F/map.json | 161 + data/maps/MtPyre_3F/events.inc | 17 - data/maps/MtPyre_3F/header.inc | 15 - data/maps/MtPyre_3F/map.json | 116 + data/maps/MtPyre_4F/events.inc | 15 - data/maps/MtPyre_4F/header.inc | 15 - data/maps/MtPyre_4F/map.json | 90 + data/maps/MtPyre_5F/events.inc | 14 - data/maps/MtPyre_5F/header.inc | 15 - data/maps/MtPyre_5F/map.json | 83 + data/maps/MtPyre_6F/events.inc | 12 - data/maps/MtPyre_6F/header.inc | 15 - data/maps/MtPyre_6F/map.json | 75 + data/maps/MtPyre_Exterior/events.inc | 23 - data/maps/MtPyre_Exterior/header.inc | 15 - data/maps/MtPyre_Exterior/map.json | 132 + data/maps/MtPyre_Summit/events.inc | 30 - data/maps/MtPyre_Summit/header.inc | 15 - data/maps/MtPyre_Summit/map.json | 219 + data/maps/NavelRock_B1F/events.inc | 7 - data/maps/NavelRock_B1F/header.inc | 15 - data/maps/NavelRock_B1F/map.json | 35 + data/maps/NavelRock_Bottom/events.inc | 9 - data/maps/NavelRock_Bottom/header.inc | 15 - data/maps/NavelRock_Bottom/map.json | 42 + data/maps/NavelRock_Down01/events.inc | 7 - data/maps/NavelRock_Down01/header.inc | 15 - data/maps/NavelRock_Down01/map.json | 35 + data/maps/NavelRock_Down02/events.inc | 7 - data/maps/NavelRock_Down02/header.inc | 15 - data/maps/NavelRock_Down02/map.json | 35 + data/maps/NavelRock_Down03/events.inc | 7 - data/maps/NavelRock_Down03/header.inc | 15 - data/maps/NavelRock_Down03/map.json | 35 + data/maps/NavelRock_Down04/events.inc | 7 - data/maps/NavelRock_Down04/header.inc | 15 - data/maps/NavelRock_Down04/map.json | 35 + data/maps/NavelRock_Down05/events.inc | 7 - data/maps/NavelRock_Down05/header.inc | 15 - data/maps/NavelRock_Down05/map.json | 35 + data/maps/NavelRock_Down06/events.inc | 7 - data/maps/NavelRock_Down06/header.inc | 15 - data/maps/NavelRock_Down06/map.json | 35 + data/maps/NavelRock_Down07/events.inc | 7 - data/maps/NavelRock_Down07/header.inc | 15 - data/maps/NavelRock_Down07/map.json | 35 + data/maps/NavelRock_Down08/events.inc | 7 - data/maps/NavelRock_Down08/header.inc | 15 - data/maps/NavelRock_Down08/map.json | 35 + data/maps/NavelRock_Down09/events.inc | 7 - data/maps/NavelRock_Down09/header.inc | 15 - data/maps/NavelRock_Down09/map.json | 35 + data/maps/NavelRock_Down10/events.inc | 7 - data/maps/NavelRock_Down10/header.inc | 15 - data/maps/NavelRock_Down10/map.json | 35 + data/maps/NavelRock_Down11/events.inc | 7 - data/maps/NavelRock_Down11/header.inc | 15 - data/maps/NavelRock_Down11/map.json | 35 + data/maps/NavelRock_Entrance/events.inc | 7 - data/maps/NavelRock_Entrance/header.inc | 15 - data/maps/NavelRock_Entrance/map.json | 35 + data/maps/NavelRock_Exterior/events.inc | 7 - data/maps/NavelRock_Exterior/header.inc | 15 - data/maps/NavelRock_Exterior/map.json | 35 + data/maps/NavelRock_Fork/events.inc | 8 - data/maps/NavelRock_Fork/header.inc | 15 - data/maps/NavelRock_Fork/map.json | 42 + data/maps/NavelRock_Harbor/events.inc | 10 - data/maps/NavelRock_Harbor/header.inc | 15 - data/maps/NavelRock_Harbor/map.json | 55 + data/maps/NavelRock_Top/events.inc | 15 - data/maps/NavelRock_Top/header.inc | 15 - data/maps/NavelRock_Top/map.json | 61 + data/maps/NavelRock_Up1/events.inc | 7 - data/maps/NavelRock_Up1/header.inc | 15 - data/maps/NavelRock_Up1/map.json | 35 + data/maps/NavelRock_Up2/events.inc | 7 - data/maps/NavelRock_Up2/header.inc | 15 - data/maps/NavelRock_Up2/map.json | 35 + data/maps/NavelRock_Up3/events.inc | 7 - data/maps/NavelRock_Up3/header.inc | 15 - data/maps/NavelRock_Up3/map.json | 35 + data/maps/NavelRock_Up4/events.inc | 7 - data/maps/NavelRock_Up4/header.inc | 15 - data/maps/NavelRock_Up4/map.json | 35 + data/maps/NewMauville_Entrance/events.inc | 10 - data/maps/NewMauville_Entrance/header.inc | 15 - data/maps/NewMauville_Entrance/map.json | 45 + data/maps/NewMauville_Inside/events.inc | 38 - data/maps/NewMauville_Inside/header.inc | 15 - data/maps/NewMauville_Inside/map.json | 289 ++ data/maps/OldaleTown/connections.inc | 9 - data/maps/OldaleTown/events.inc | 28 - data/maps/OldaleTown/header.inc | 15 - data/maps/OldaleTown/map.json | 196 + data/maps/OldaleTown_House1/events.inc | 10 - data/maps/OldaleTown_House1/header.inc | 15 - data/maps/OldaleTown_House1/map.json | 49 + data/maps/OldaleTown_House2/events.inc | 11 - data/maps/OldaleTown_House2/header.inc | 15 - data/maps/OldaleTown_House2/map.json | 62 + data/maps/OldaleTown_Mart/events.inc | 12 - data/maps/OldaleTown_Mart/header.inc | 15 - data/maps/OldaleTown_Mart/map.json | 75 + data/maps/OldaleTown_PokemonCenter_1F/events.inc | 14 - data/maps/OldaleTown_PokemonCenter_1F/header.inc | 15 - data/maps/OldaleTown_PokemonCenter_1F/map.json | 95 + data/maps/OldaleTown_PokemonCenter_2F/events.inc | 14 - data/maps/OldaleTown_PokemonCenter_2F/header.inc | 15 - data/maps/OldaleTown_PokemonCenter_2F/map.json | 95 + data/maps/PacifidlogTown/connections.inc | 8 - data/maps/PacifidlogTown/events.inc | 21 - data/maps/PacifidlogTown/header.inc | 15 - data/maps/PacifidlogTown/map.json | 139 + data/maps/PacifidlogTown_House1/events.inc | 11 - data/maps/PacifidlogTown_House1/header.inc | 15 - data/maps/PacifidlogTown_House1/map.json | 62 + data/maps/PacifidlogTown_House2/events.inc | 12 - data/maps/PacifidlogTown_House2/header.inc | 15 - data/maps/PacifidlogTown_House2/map.json | 75 + data/maps/PacifidlogTown_House3/events.inc | 11 - data/maps/PacifidlogTown_House3/header.inc | 15 - data/maps/PacifidlogTown_House3/map.json | 62 + data/maps/PacifidlogTown_House4/events.inc | 12 - data/maps/PacifidlogTown_House4/header.inc | 15 - data/maps/PacifidlogTown_House4/map.json | 75 + data/maps/PacifidlogTown_House5/events.inc | 11 - data/maps/PacifidlogTown_House5/header.inc | 15 - data/maps/PacifidlogTown_House5/map.json | 62 + .../PacifidlogTown_PokemonCenter_1F/events.inc | 15 - .../PacifidlogTown_PokemonCenter_1F/header.inc | 15 - data/maps/PacifidlogTown_PokemonCenter_1F/map.json | 108 + .../PacifidlogTown_PokemonCenter_2F/events.inc | 14 - .../PacifidlogTown_PokemonCenter_2F/header.inc | 15 - data/maps/PacifidlogTown_PokemonCenter_2F/map.json | 95 + data/maps/PetalburgCity/connections.inc | 8 - data/maps/PetalburgCity/events.inc | 42 - data/maps/PetalburgCity/header.inc | 15 - data/maps/PetalburgCity/map.json | 330 ++ data/maps/PetalburgCity_Gym/events.inc | 72 - data/maps/PetalburgCity_Gym/header.inc | 15 - data/maps/PetalburgCity_Gym/map.json | 544 +++ data/maps/PetalburgCity_House1/events.inc | 11 - data/maps/PetalburgCity_House1/header.inc | 15 - data/maps/PetalburgCity_House1/map.json | 62 + data/maps/PetalburgCity_House2/events.inc | 11 - data/maps/PetalburgCity_House2/header.inc | 15 - data/maps/PetalburgCity_House2/map.json | 62 + data/maps/PetalburgCity_Mart/events.inc | 13 - data/maps/PetalburgCity_Mart/header.inc | 15 - data/maps/PetalburgCity_Mart/map.json | 88 + .../maps/PetalburgCity_PokemonCenter_1F/events.inc | 15 - .../maps/PetalburgCity_PokemonCenter_1F/header.inc | 15 - data/maps/PetalburgCity_PokemonCenter_1F/map.json | 108 + .../maps/PetalburgCity_PokemonCenter_2F/events.inc | 14 - .../maps/PetalburgCity_PokemonCenter_2F/header.inc | 15 - data/maps/PetalburgCity_PokemonCenter_2F/map.json | 95 + data/maps/PetalburgCity_WallysHouse/events.inc | 11 - data/maps/PetalburgCity_WallysHouse/header.inc | 15 - data/maps/PetalburgCity_WallysHouse/map.json | 62 + data/maps/PetalburgWoods/events.inc | 38 - data/maps/PetalburgWoods/header.inc | 15 - data/maps/PetalburgWoods/map.json | 301 ++ data/maps/RecordCorner/events.inc | 18 - data/maps/RecordCorner/header.inc | 15 - data/maps/RecordCorner/map.json | 100 + data/maps/Route101/connections.inc | 8 - data/maps/Route101/events.inc | 25 - data/maps/Route101/header.inc | 15 - data/maps/Route101/map.json | 201 + data/maps/Route102/connections.inc | 8 - data/maps/Route102/events.inc | 18 - data/maps/Route102/header.inc | 15 - data/maps/Route102/map.json | 166 + data/maps/Route103/connections.inc | 8 - data/maps/Route103/events.inc | 31 - data/maps/Route103/header.inc | 15 - data/maps/Route103/map.json | 309 ++ data/maps/Route104/connections.inc | 9 - data/maps/Route104/events.inc | 64 - data/maps/Route104/header.inc | 15 - data/maps/Route104/map.json | 627 +++ data/maps/Route104_MrBrineysHouse/events.inc | 11 - data/maps/Route104_MrBrineysHouse/header.inc | 15 - data/maps/Route104_MrBrineysHouse/map.json | 62 + .../maps/Route104_PrettyPetalFlowerShop/events.inc | 12 - .../maps/Route104_PrettyPetalFlowerShop/header.inc | 15 - data/maps/Route104_PrettyPetalFlowerShop/map.json | 75 + data/maps/Route104_Prototype/events.inc | 3 - data/maps/Route104_Prototype/header.inc | 15 - data/maps/Route104_Prototype/map.json | 20 + .../events.inc | 3 - .../header.inc | 15 - .../map.json | 20 + data/maps/Route105/connections.inc | 9 - data/maps/Route105/events.inc | 20 - data/maps/Route105/header.inc | 15 - data/maps/Route105/map.json | 166 + data/maps/Route106/connections.inc | 8 - data/maps/Route106/events.inc | 19 - data/maps/Route106/header.inc | 15 - data/maps/Route106/map.json | 138 + data/maps/Route107/connections.inc | 8 - data/maps/Route107/events.inc | 12 - data/maps/Route107/header.inc | 15 - data/maps/Route107/map.json | 123 + data/maps/Route108/connections.inc | 8 - data/maps/Route108/events.inc | 18 - data/maps/Route108/header.inc | 15 - data/maps/Route108/map.json | 140 + data/maps/Route109/connections.inc | 8 - data/maps/Route109/events.inc | 42 - data/maps/Route109/header.inc | 15 - data/maps/Route109/map.json | 417 ++ data/maps/Route109_SeashoreHouse/events.inc | 13 - data/maps/Route109_SeashoreHouse/header.inc | 15 - data/maps/Route109_SeashoreHouse/map.json | 88 + data/maps/Route110/connections.inc | 9 - data/maps/Route110/events.inc | 79 - data/maps/Route110/header.inc | 15 - data/maps/Route110/map.json | 765 ++++ .../events.inc | 16 - .../header.inc | 15 - .../map.json | 82 + .../events.inc | 16 - .../header.inc | 15 - .../map.json | 82 + data/maps/Route110_TrickHouseCorridor/events.inc | 9 - data/maps/Route110_TrickHouseCorridor/header.inc | 15 - data/maps/Route110_TrickHouseCorridor/map.json | 49 + data/maps/Route110_TrickHouseEnd/events.inc | 16 - data/maps/Route110_TrickHouseEnd/header.inc | 15 - data/maps/Route110_TrickHouseEnd/map.json | 68 + data/maps/Route110_TrickHouseEntrance/events.inc | 20 - data/maps/Route110_TrickHouseEntrance/header.inc | 15 - data/maps/Route110_TrickHouseEntrance/map.json | 102 + data/maps/Route110_TrickHousePuzzle1/events.inc | 28 - data/maps/Route110_TrickHousePuzzle1/header.inc | 15 - data/maps/Route110_TrickHousePuzzle1/map.json | 247 ++ data/maps/Route110_TrickHousePuzzle2/events.inc | 24 - data/maps/Route110_TrickHousePuzzle2/header.inc | 15 - data/maps/Route110_TrickHousePuzzle2/map.json | 154 + data/maps/Route110_TrickHousePuzzle3/events.inc | 26 - data/maps/Route110_TrickHousePuzzle3/header.inc | 15 - data/maps/Route110_TrickHousePuzzle3/map.json | 180 + data/maps/Route110_TrickHousePuzzle4/events.inc | 27 - data/maps/Route110_TrickHousePuzzle4/header.inc | 15 - data/maps/Route110_TrickHousePuzzle4/map.json | 234 ++ data/maps/Route110_TrickHousePuzzle5/events.inc | 42 - data/maps/Route110_TrickHousePuzzle5/header.inc | 15 - data/maps/Route110_TrickHousePuzzle5/map.json | 316 ++ data/maps/Route110_TrickHousePuzzle6/events.inc | 17 - data/maps/Route110_TrickHousePuzzle6/header.inc | 15 - data/maps/Route110_TrickHousePuzzle6/map.json | 104 + data/maps/Route110_TrickHousePuzzle7/events.inc | 38 - data/maps/Route110_TrickHousePuzzle7/header.inc | 15 - data/maps/Route110_TrickHousePuzzle7/map.json | 276 ++ data/maps/Route110_TrickHousePuzzle8/events.inc | 17 - data/maps/Route110_TrickHousePuzzle8/header.inc | 15 - data/maps/Route110_TrickHousePuzzle8/map.json | 104 + data/maps/Route111/connections.inc | 9 - data/maps/Route111/events.inc | 114 - data/maps/Route111/header.inc | 15 - data/maps/Route111/map.json | 1115 +++++ data/maps/Route111/scripts.inc | 2 +- data/maps/Route111_OldLadysRestStop/events.inc | 10 - data/maps/Route111_OldLadysRestStop/header.inc | 15 - data/maps/Route111_OldLadysRestStop/map.json | 49 + .../maps/Route111_WinstrateFamilysHouse/events.inc | 13 - .../maps/Route111_WinstrateFamilysHouse/header.inc | 15 - data/maps/Route111_WinstrateFamilysHouse/map.json | 88 + data/maps/Route112/connections.inc | 9 - data/maps/Route112/events.inc | 32 - data/maps/Route112/header.inc | 15 - data/maps/Route112/map.json | 287 ++ data/maps/Route112_CableCarStation/events.inc | 11 - data/maps/Route112_CableCarStation/header.inc | 15 - data/maps/Route112_CableCarStation/map.json | 62 + data/maps/Route113/connections.inc | 9 - data/maps/Route113/events.inc | 57 - data/maps/Route113/header.inc | 15 - data/maps/Route113/map.json | 465 +++ data/maps/Route113_GlassWorkshop/events.inc | 11 - data/maps/Route113_GlassWorkshop/header.inc | 15 - data/maps/Route113_GlassWorkshop/map.json | 62 + data/maps/Route114/connections.inc | 8 - data/maps/Route114/events.inc | 53 - data/maps/Route114/header.inc | 15 - data/maps/Route114/map.json | 509 +++ data/maps/Route114_FossilManiacsHouse/events.inc | 17 - data/maps/Route114_FossilManiacsHouse/header.inc | 15 - data/maps/Route114_FossilManiacsHouse/map.json | 89 + data/maps/Route114_FossilManiacsTunnel/events.inc | 15 - data/maps/Route114_FossilManiacsTunnel/header.inc | 15 - data/maps/Route114_FossilManiacsTunnel/map.json | 75 + data/maps/Route114_LanettesHouse/events.inc | 15 - data/maps/Route114_LanettesHouse/header.inc | 15 - data/maps/Route114_LanettesHouse/map.json | 74 + data/maps/Route115/connections.inc | 8 - data/maps/Route115/events.inc | 49 - data/maps/Route115/header.inc | 15 - data/maps/Route115/map.json | 455 ++ data/maps/Route116/connections.inc | 8 - data/maps/Route116/events.inc | 56 - data/maps/Route116/header.inc | 15 - data/maps/Route116/map.json | 527 +++ data/maps/Route116_TunnelersRestHouse/events.inc | 12 - data/maps/Route116_TunnelersRestHouse/header.inc | 15 - data/maps/Route116_TunnelersRestHouse/map.json | 75 + data/maps/Route117/connections.inc | 8 - data/maps/Route117/events.inc | 38 - data/maps/Route117/header.inc | 15 - data/maps/Route117/map.json | 385 ++ data/maps/Route117_PokemonDayCare/events.inc | 10 - data/maps/Route117_PokemonDayCare/header.inc | 15 - data/maps/Route117_PokemonDayCare/map.json | 49 + data/maps/Route118/connections.inc | 9 - data/maps/Route118/events.inc | 46 - data/maps/Route118/header.inc | 15 - data/maps/Route118/map.json | 421 ++ data/maps/Route119/connections.inc | 8 - data/maps/Route119/events.inc | 99 - data/maps/Route119/header.inc | 15 - data/maps/Route119/map.json | 920 ++++ data/maps/Route119_House/events.inc | 16 - data/maps/Route119_House/header.inc | 15 - data/maps/Route119_House/map.json | 127 + data/maps/Route119_WeatherInstitute_1F/events.inc | 21 - data/maps/Route119_WeatherInstitute_1F/header.inc | 15 - data/maps/Route119_WeatherInstitute_1F/map.json | 141 + data/maps/Route119_WeatherInstitute_2F/events.inc | 16 - data/maps/Route119_WeatherInstitute_2F/header.inc | 15 - data/maps/Route119_WeatherInstitute_2F/map.json | 133 + data/maps/Route120/connections.inc | 8 - data/maps/Route120/events.inc | 90 - data/maps/Route120/header.inc | 15 - data/maps/Route120/map.json | 858 ++++ data/maps/Route121/connections.inc | 9 - data/maps/Route121/events.inc | 55 - data/maps/Route121/header.inc | 15 - data/maps/Route121/map.json | 536 +++ data/maps/Route121_SafariZoneEntrance/events.inc | 20 - data/maps/Route121_SafariZoneEntrance/header.inc | 15 - data/maps/Route121_SafariZoneEntrance/map.json | 108 + data/maps/Route122/connections.inc | 8 - data/maps/Route122/events.inc | 6 - data/maps/Route122/header.inc | 15 - data/maps/Route122/map.json | 39 + data/maps/Route123/connections.inc | 8 - data/maps/Route123/events.inc | 88 - data/maps/Route123/header.inc | 15 - data/maps/Route123/map.json | 840 ++++ data/maps/Route123_BerryMastersHouse/events.inc | 11 - data/maps/Route123_BerryMastersHouse/header.inc | 15 - data/maps/Route123_BerryMastersHouse/map.json | 62 + data/maps/Route124/connections.inc | 11 - data/maps/Route124/events.inc | 23 - data/maps/Route124/header.inc | 15 - data/maps/Route124/map.json | 220 + .../Route124_DivingTreasureHuntersHouse/events.inc | 13 - .../Route124_DivingTreasureHuntersHouse/header.inc | 15 - .../Route124_DivingTreasureHuntersHouse/map.json | 58 + data/maps/Route125/connections.inc | 9 - data/maps/Route125/events.inc | 24 - data/maps/Route125/header.inc | 15 - data/maps/Route125/map.json | 204 + data/maps/Route126/connections.inc | 9 - data/maps/Route126/events.inc | 14 - data/maps/Route126/header.inc | 15 - data/maps/Route126/map.json | 154 + data/maps/Route127/connections.inc | 10 - data/maps/Route127/events.inc | 23 - data/maps/Route127/header.inc | 15 - data/maps/Route127/map.json | 221 + data/maps/Route128/connections.inc | 10 - data/maps/Route128/events.inc | 20 - data/maps/Route128/header.inc | 15 - data/maps/Route128/map.json | 197 + data/maps/Route129/connections.inc | 9 - data/maps/Route129/events.inc | 10 - data/maps/Route129/header.inc | 15 - data/maps/Route129/map.json | 102 + data/maps/Route130/connections.inc | 8 - data/maps/Route130/events.inc | 9 - data/maps/Route130/header.inc | 15 - data/maps/Route130/map.json | 84 + data/maps/Route130/scripts.inc | 4 +- data/maps/Route131/connections.inc | 8 - data/maps/Route131/events.inc | 16 - data/maps/Route131/header.inc | 15 - data/maps/Route131/map.json | 144 + data/maps/Route131/scripts.inc | 2 +- data/maps/Route132/connections.inc | 8 - data/maps/Route132/events.inc | 15 - data/maps/Route132/header.inc | 15 - data/maps/Route132/map.json | 162 + data/maps/Route133/connections.inc | 8 - data/maps/Route133/events.inc | 15 - data/maps/Route133/header.inc | 15 - data/maps/Route133/map.json | 162 + data/maps/Route134/connections.inc | 8 - data/maps/Route134/events.inc | 16 - data/maps/Route134/header.inc | 15 - data/maps/Route134/map.json | 175 + data/maps/RustboroCity/connections.inc | 9 - data/maps/RustboroCity/events.inc | 70 - data/maps/RustboroCity/header.inc | 15 - data/maps/RustboroCity/map.json | 601 +++ data/maps/RustboroCity_CuttersHouse/events.inc | 11 - data/maps/RustboroCity_CuttersHouse/header.inc | 15 - data/maps/RustboroCity_CuttersHouse/map.json | 62 + data/maps/RustboroCity_DevonCorp_1F/events.inc | 17 - data/maps/RustboroCity_DevonCorp_1F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_1F/map.json | 99 + data/maps/RustboroCity_DevonCorp_2F/events.inc | 15 - data/maps/RustboroCity_DevonCorp_2F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_2F/map.json | 114 + data/maps/RustboroCity_DevonCorp_3F/events.inc | 15 - data/maps/RustboroCity_DevonCorp_3F/header.inc | 15 - data/maps/RustboroCity_DevonCorp_3F/map.json | 85 + data/maps/RustboroCity_Flat1_1F/events.inc | 12 - data/maps/RustboroCity_Flat1_1F/header.inc | 15 - data/maps/RustboroCity_Flat1_1F/map.json | 69 + data/maps/RustboroCity_Flat1_2F/events.inc | 16 - data/maps/RustboroCity_Flat1_2F/header.inc | 15 - data/maps/RustboroCity_Flat1_2F/map.json | 133 + data/maps/RustboroCity_Flat2_1F/events.inc | 12 - data/maps/RustboroCity_Flat2_1F/header.inc | 15 - data/maps/RustboroCity_Flat2_1F/map.json | 69 + data/maps/RustboroCity_Flat2_2F/events.inc | 11 - data/maps/RustboroCity_Flat2_2F/header.inc | 15 - data/maps/RustboroCity_Flat2_2F/map.json | 62 + data/maps/RustboroCity_Flat2_3F/events.inc | 10 - data/maps/RustboroCity_Flat2_3F/header.inc | 15 - data/maps/RustboroCity_Flat2_3F/map.json | 55 + data/maps/RustboroCity_Gym/events.inc | 18 - data/maps/RustboroCity_Gym/header.inc | 15 - data/maps/RustboroCity_Gym/map.json | 118 + data/maps/RustboroCity_House1/events.inc | 11 - data/maps/RustboroCity_House1/header.inc | 15 - data/maps/RustboroCity_House1/map.json | 62 + data/maps/RustboroCity_House2/events.inc | 11 - data/maps/RustboroCity_House2/header.inc | 15 - data/maps/RustboroCity_House2/map.json | 62 + data/maps/RustboroCity_House3/events.inc | 12 - data/maps/RustboroCity_House3/header.inc | 15 - data/maps/RustboroCity_House3/map.json | 75 + data/maps/RustboroCity_Mart/events.inc | 13 - data/maps/RustboroCity_Mart/header.inc | 15 - data/maps/RustboroCity_Mart/map.json | 88 + data/maps/RustboroCity_PokemonCenter_1F/events.inc | 14 - data/maps/RustboroCity_PokemonCenter_1F/header.inc | 15 - data/maps/RustboroCity_PokemonCenter_1F/map.json | 95 + data/maps/RustboroCity_PokemonCenter_2F/events.inc | 14 - data/maps/RustboroCity_PokemonCenter_2F/header.inc | 15 - data/maps/RustboroCity_PokemonCenter_2F/map.json | 95 + data/maps/RustboroCity_PokemonSchool/events.inc | 23 - data/maps/RustboroCity_PokemonSchool/header.inc | 15 - data/maps/RustboroCity_PokemonSchool/map.json | 168 + data/maps/RusturfTunnel/events.inc | 27 - data/maps/RusturfTunnel/header.inc | 15 - data/maps/RusturfTunnel/map.json | 219 + data/maps/SSTidalCorridor/events.inc | 35 - data/maps/SSTidalCorridor/header.inc | 15 - data/maps/SSTidalCorridor/map.json | 247 ++ data/maps/SSTidalLowerDeck/events.inc | 13 - data/maps/SSTidalLowerDeck/header.inc | 15 - data/maps/SSTidalLowerDeck/map.json | 64 + data/maps/SSTidalRooms/events.inc | 31 - data/maps/SSTidalRooms/header.inc | 15 - data/maps/SSTidalRooms/map.json | 227 + data/maps/SafariZone_North/connections.inc | 9 - data/maps/SafariZone_North/events.inc | 14 - data/maps/SafariZone_North/header.inc | 15 - data/maps/SafariZone_North/map.json | 154 + data/maps/SafariZone_Northeast/connections.inc | 8 - data/maps/SafariZone_Northeast/events.inc | 18 - data/maps/SafariZone_Northeast/header.inc | 15 - data/maps/SafariZone_Northeast/map.json | 166 + data/maps/SafariZone_Northwest/connections.inc | 8 - data/maps/SafariZone_Northwest/events.inc | 7 - data/maps/SafariZone_Northwest/header.inc | 15 - data/maps/SafariZone_Northwest/map.json | 58 + data/maps/SafariZone_RestHouse/events.inc | 12 - data/maps/SafariZone_RestHouse/header.inc | 15 - data/maps/SafariZone_RestHouse/map.json | 75 + data/maps/SafariZone_South/connections.inc | 9 - data/maps/SafariZone_South/events.inc | 14 - data/maps/SafariZone_South/header.inc | 15 - data/maps/SafariZone_South/map.json | 123 + data/maps/SafariZone_Southeast/connections.inc | 8 - data/maps/SafariZone_Southeast/events.inc | 14 - data/maps/SafariZone_Southeast/header.inc | 15 - data/maps/SafariZone_Southeast/map.json | 114 + data/maps/SafariZone_Southwest/connections.inc | 8 - data/maps/SafariZone_Southwest/events.inc | 13 - data/maps/SafariZone_Southwest/header.inc | 15 - data/maps/SafariZone_Southwest/map.json | 75 + data/maps/ScorchedSlab/events.inc | 9 - data/maps/ScorchedSlab/header.inc | 15 - data/maps/ScorchedSlab/map.json | 42 + data/maps/SeafloorCavern_Entrance/events.inc | 10 - data/maps/SeafloorCavern_Entrance/header.inc | 15 - data/maps/SeafloorCavern_Entrance/map.json | 49 + data/maps/SeafloorCavern_Room1/events.inc | 15 - data/maps/SeafloorCavern_Room1/header.inc | 15 - data/maps/SeafloorCavern_Room1/map.json | 108 + data/maps/SeafloorCavern_Room2/events.inc | 19 - data/maps/SeafloorCavern_Room2/header.inc | 15 - data/maps/SeafloorCavern_Room2/map.json | 154 + data/maps/SeafloorCavern_Room3/events.inc | 19 - data/maps/SeafloorCavern_Room3/header.inc | 15 - data/maps/SeafloorCavern_Room3/map.json | 160 + data/maps/SeafloorCavern_Room4/events.inc | 13 - data/maps/SeafloorCavern_Room4/header.inc | 15 - data/maps/SeafloorCavern_Room4/map.json | 76 + data/maps/SeafloorCavern_Room5/events.inc | 16 - data/maps/SeafloorCavern_Room5/header.inc | 15 - data/maps/SeafloorCavern_Room5/map.json | 121 + data/maps/SeafloorCavern_Room6/events.inc | 8 - data/maps/SeafloorCavern_Room6/header.inc | 15 - data/maps/SeafloorCavern_Room6/map.json | 42 + data/maps/SeafloorCavern_Room7/events.inc | 7 - data/maps/SeafloorCavern_Room7/header.inc | 15 - data/maps/SeafloorCavern_Room7/map.json | 35 + data/maps/SeafloorCavern_Room8/events.inc | 21 - data/maps/SeafloorCavern_Room8/header.inc | 15 - data/maps/SeafloorCavern_Room8/map.json | 192 + data/maps/SeafloorCavern_Room9/events.inc | 18 - data/maps/SeafloorCavern_Room9/header.inc | 15 - data/maps/SeafloorCavern_Room9/map.json | 130 + data/maps/SealedChamber_InnerRoom/events.inc | 17 - data/maps/SealedChamber_InnerRoom/header.inc | 15 - data/maps/SealedChamber_InnerRoom/map.json | 101 + data/maps/SealedChamber_OuterRoom/events.inc | 37 - data/maps/SealedChamber_OuterRoom/header.inc | 15 - data/maps/SealedChamber_OuterRoom/map.json | 261 ++ data/maps/SecretBase_BlueCave1/events.inc | 23 - data/maps/SecretBase_BlueCave1/header.inc | 15 - data/maps/SecretBase_BlueCave1/map.json | 224 + data/maps/SecretBase_BlueCave2/events.inc | 23 - data/maps/SecretBase_BlueCave2/header.inc | 15 - data/maps/SecretBase_BlueCave2/map.json | 224 + data/maps/SecretBase_BlueCave3/events.inc | 23 - data/maps/SecretBase_BlueCave3/header.inc | 15 - data/maps/SecretBase_BlueCave3/map.json | 224 + data/maps/SecretBase_BlueCave4/events.inc | 23 - data/maps/SecretBase_BlueCave4/header.inc | 15 - data/maps/SecretBase_BlueCave4/map.json | 224 + data/maps/SecretBase_BrownCave1/events.inc | 23 - data/maps/SecretBase_BrownCave1/header.inc | 15 - data/maps/SecretBase_BrownCave1/map.json | 224 + data/maps/SecretBase_BrownCave2/events.inc | 23 - data/maps/SecretBase_BrownCave2/header.inc | 15 - data/maps/SecretBase_BrownCave2/map.json | 224 + data/maps/SecretBase_BrownCave3/events.inc | 23 - data/maps/SecretBase_BrownCave3/header.inc | 15 - data/maps/SecretBase_BrownCave3/map.json | 224 + data/maps/SecretBase_BrownCave4/events.inc | 23 - data/maps/SecretBase_BrownCave4/header.inc | 15 - data/maps/SecretBase_BrownCave4/map.json | 224 + data/maps/SecretBase_RedCave1/events.inc | 23 - data/maps/SecretBase_RedCave1/header.inc | 15 - data/maps/SecretBase_RedCave1/map.json | 224 + data/maps/SecretBase_RedCave2/events.inc | 23 - data/maps/SecretBase_RedCave2/header.inc | 15 - data/maps/SecretBase_RedCave2/map.json | 224 + data/maps/SecretBase_RedCave3/events.inc | 23 - data/maps/SecretBase_RedCave3/header.inc | 15 - data/maps/SecretBase_RedCave3/map.json | 224 + data/maps/SecretBase_RedCave4/events.inc | 23 - data/maps/SecretBase_RedCave4/header.inc | 15 - data/maps/SecretBase_RedCave4/map.json | 224 + data/maps/SecretBase_Shrub1/events.inc | 23 - data/maps/SecretBase_Shrub1/header.inc | 15 - data/maps/SecretBase_Shrub1/map.json | 224 + data/maps/SecretBase_Shrub2/events.inc | 23 - data/maps/SecretBase_Shrub2/header.inc | 15 - data/maps/SecretBase_Shrub2/map.json | 224 + data/maps/SecretBase_Shrub3/events.inc | 23 - data/maps/SecretBase_Shrub3/header.inc | 15 - data/maps/SecretBase_Shrub3/map.json | 224 + data/maps/SecretBase_Shrub4/events.inc | 23 - data/maps/SecretBase_Shrub4/header.inc | 15 - data/maps/SecretBase_Shrub4/map.json | 224 + data/maps/SecretBase_Tree1/events.inc | 23 - data/maps/SecretBase_Tree1/header.inc | 15 - data/maps/SecretBase_Tree1/map.json | 224 + data/maps/SecretBase_Tree2/events.inc | 23 - data/maps/SecretBase_Tree2/header.inc | 15 - data/maps/SecretBase_Tree2/map.json | 224 + data/maps/SecretBase_Tree3/events.inc | 23 - data/maps/SecretBase_Tree3/header.inc | 15 - data/maps/SecretBase_Tree3/map.json | 224 + data/maps/SecretBase_Tree4/events.inc | 23 - data/maps/SecretBase_Tree4/header.inc | 15 - data/maps/SecretBase_Tree4/map.json | 224 + data/maps/SecretBase_YellowCave1/events.inc | 23 - data/maps/SecretBase_YellowCave1/header.inc | 15 - data/maps/SecretBase_YellowCave1/map.json | 224 + data/maps/SecretBase_YellowCave2/events.inc | 23 - data/maps/SecretBase_YellowCave2/header.inc | 15 - data/maps/SecretBase_YellowCave2/map.json | 224 + data/maps/SecretBase_YellowCave3/events.inc | 23 - data/maps/SecretBase_YellowCave3/header.inc | 15 - data/maps/SecretBase_YellowCave3/map.json | 224 + data/maps/SecretBase_YellowCave4/events.inc | 23 - data/maps/SecretBase_YellowCave4/header.inc | 15 - data/maps/SecretBase_YellowCave4/map.json | 224 + .../maps/ShoalCave_HighTideEntranceRoom/events.inc | 3 - .../maps/ShoalCave_HighTideEntranceRoom/header.inc | 15 - data/maps/ShoalCave_HighTideEntranceRoom/map.json | 20 + data/maps/ShoalCave_HighTideInnerRoom/events.inc | 3 - data/maps/ShoalCave_HighTideInnerRoom/header.inc | 15 - data/maps/ShoalCave_HighTideInnerRoom/map.json | 20 + data/maps/ShoalCave_LowTideEntranceRoom/events.inc | 13 - data/maps/ShoalCave_LowTideEntranceRoom/header.inc | 15 - data/maps/ShoalCave_LowTideEntranceRoom/map.json | 76 + .../maps/ShoalCave_LowTideEntranceRoom/scripts.inc | 4 +- data/maps/ShoalCave_LowTideIceRoom/events.inc | 10 - data/maps/ShoalCave_LowTideIceRoom/header.inc | 15 - data/maps/ShoalCave_LowTideIceRoom/map.json | 55 + data/maps/ShoalCave_LowTideInnerRoom/events.inc | 24 - data/maps/ShoalCave_LowTideInnerRoom/header.inc | 15 - data/maps/ShoalCave_LowTideInnerRoom/map.json | 140 + data/maps/ShoalCave_LowTideInnerRoom/scripts.inc | 4 +- data/maps/ShoalCave_LowTideLowerRoom/events.inc | 16 - data/maps/ShoalCave_LowTideLowerRoom/header.inc | 15 - data/maps/ShoalCave_LowTideLowerRoom/map.json | 85 + data/maps/ShoalCave_LowTideStairsRoom/events.inc | 13 - data/maps/ShoalCave_LowTideStairsRoom/header.inc | 15 - data/maps/ShoalCave_LowTideStairsRoom/map.json | 58 + data/maps/SingleBattleColosseum/events.inc | 14 - data/maps/SingleBattleColosseum/header.inc | 15 - data/maps/SingleBattleColosseum/map.json | 68 + data/maps/SkyPillar_1F/events.inc | 8 - data/maps/SkyPillar_1F/header.inc | 15 - data/maps/SkyPillar_1F/map.json | 42 + data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/events.inc | 7 - data/maps/SkyPillar_2F/header.inc | 15 - data/maps/SkyPillar_2F/map.json | 35 + data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/events.inc | 8 - data/maps/SkyPillar_3F/header.inc | 15 - data/maps/SkyPillar_3F/map.json | 42 + data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/events.inc | 8 - data/maps/SkyPillar_4F/header.inc | 15 - data/maps/SkyPillar_4F/map.json | 42 + data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/events.inc | 7 - data/maps/SkyPillar_5F/header.inc | 15 - data/maps/SkyPillar_5F/map.json | 35 + data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Entrance/events.inc | 7 - data/maps/SkyPillar_Entrance/header.inc | 15 - data/maps/SkyPillar_Entrance/map.json | 35 + data/maps/SkyPillar_Outside/events.inc | 10 - data/maps/SkyPillar_Outside/header.inc | 15 - data/maps/SkyPillar_Outside/map.json | 49 + data/maps/SkyPillar_Top/events.inc | 13 - data/maps/SkyPillar_Top/header.inc | 15 - data/maps/SkyPillar_Top/map.json | 65 + data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SlateportCity/connections.inc | 9 - data/maps/SlateportCity/events.inc | 71 - data/maps/SlateportCity/header.inc | 15 - data/maps/SlateportCity/map.json | 685 +++ .../SlateportCity_BattleTentBattleRoom/events.inc | 8 - .../SlateportCity_BattleTentBattleRoom/header.inc | 15 - .../SlateportCity_BattleTentBattleRoom/map.json | 60 + .../SlateportCity_BattleTentCorridor/events.inc | 6 - .../SlateportCity_BattleTentCorridor/header.inc | 15 - .../maps/SlateportCity_BattleTentCorridor/map.json | 34 + data/maps/SlateportCity_BattleTentLobby/events.inc | 17 - data/maps/SlateportCity_BattleTentLobby/header.inc | 15 - data/maps/SlateportCity_BattleTentLobby/map.json | 110 + data/maps/SlateportCity_Harbor/events.inc | 25 - data/maps/SlateportCity_Harbor/header.inc | 15 - data/maps/SlateportCity_Harbor/map.json | 191 + data/maps/SlateportCity_House1/events.inc | 10 - data/maps/SlateportCity_House1/header.inc | 15 - data/maps/SlateportCity_House1/map.json | 49 + data/maps/SlateportCity_House2/events.inc | 11 - data/maps/SlateportCity_House2/header.inc | 15 - data/maps/SlateportCity_House2/map.json | 62 + data/maps/SlateportCity_Mart/events.inc | 12 - data/maps/SlateportCity_Mart/header.inc | 15 - data/maps/SlateportCity_Mart/map.json | 75 + .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 43 - .../maps/SlateportCity_OceanicMuseum_1F/header.inc | 15 - data/maps/SlateportCity_OceanicMuseum_1F/map.json | 349 ++ .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 38 - .../maps/SlateportCity_OceanicMuseum_2F/header.inc | 15 - data/maps/SlateportCity_OceanicMuseum_2F/map.json | 289 ++ .../maps/SlateportCity_PokemonCenter_1F/events.inc | 13 - .../maps/SlateportCity_PokemonCenter_1F/header.inc | 15 - data/maps/SlateportCity_PokemonCenter_1F/map.json | 82 + .../maps/SlateportCity_PokemonCenter_2F/events.inc | 14 - .../maps/SlateportCity_PokemonCenter_2F/header.inc | 15 - data/maps/SlateportCity_PokemonCenter_2F/map.json | 95 + data/maps/SlateportCity_PokemonFanClub/events.inc | 18 - data/maps/SlateportCity_PokemonFanClub/header.inc | 15 - data/maps/SlateportCity_PokemonFanClub/map.json | 153 + .../SlateportCity_SternsShipyard_1F/events.inc | 14 - .../SlateportCity_SternsShipyard_1F/header.inc | 15 - data/maps/SlateportCity_SternsShipyard_1F/map.json | 95 + .../SlateportCity_SternsShipyard_2F/events.inc | 11 - .../SlateportCity_SternsShipyard_2F/header.inc | 15 - data/maps/SlateportCity_SternsShipyard_2F/map.json | 68 + data/maps/SootopolisCity/connections.inc | 6 - data/maps/SootopolisCity/events.inc | 46 - data/maps/SootopolisCity/header.inc | 15 - data/maps/SootopolisCity/map.json | 396 ++ data/maps/SootopolisCity/scripts.inc | 2 +- data/maps/SootopolisCity_Gym_1F/events.inc | 16 - data/maps/SootopolisCity_Gym_1F/header.inc | 15 - data/maps/SootopolisCity_Gym_1F/map.json | 86 + data/maps/SootopolisCity_Gym_B1F/events.inc | 18 - data/maps/SootopolisCity_Gym_B1F/header.inc | 15 - data/maps/SootopolisCity_Gym_B1F/map.json | 159 + data/maps/SootopolisCity_House1/events.inc | 11 - data/maps/SootopolisCity_House1/header.inc | 15 - data/maps/SootopolisCity_House1/map.json | 62 + data/maps/SootopolisCity_House2/events.inc | 10 - data/maps/SootopolisCity_House2/header.inc | 15 - data/maps/SootopolisCity_House2/map.json | 49 + data/maps/SootopolisCity_House3/events.inc | 11 - data/maps/SootopolisCity_House3/header.inc | 15 - data/maps/SootopolisCity_House3/map.json | 62 + data/maps/SootopolisCity_House4/events.inc | 12 - data/maps/SootopolisCity_House4/header.inc | 15 - data/maps/SootopolisCity_House4/map.json | 75 + data/maps/SootopolisCity_House5/events.inc | 11 - data/maps/SootopolisCity_House5/header.inc | 15 - data/maps/SootopolisCity_House5/map.json | 62 + data/maps/SootopolisCity_House6/events.inc | 10 - data/maps/SootopolisCity_House6/header.inc | 15 - data/maps/SootopolisCity_House6/map.json | 49 + data/maps/SootopolisCity_House7/events.inc | 11 - data/maps/SootopolisCity_House7/header.inc | 15 - data/maps/SootopolisCity_House7/map.json | 62 + .../SootopolisCity_LotadAndSeedotHouse/events.inc | 15 - .../SootopolisCity_LotadAndSeedotHouse/header.inc | 15 - .../SootopolisCity_LotadAndSeedotHouse/map.json | 79 + data/maps/SootopolisCity_Mart/events.inc | 12 - data/maps/SootopolisCity_Mart/header.inc | 15 - data/maps/SootopolisCity_Mart/map.json | 75 + .../events.inc | 11 - .../header.inc | 15 - .../SootopolisCity_MysteryEventsHouse_1F/map.json | 56 + .../scripts.inc | 2 +- .../events.inc | 9 - .../header.inc | 15 - .../SootopolisCity_MysteryEventsHouse_B1F/map.json | 42 + .../SootopolisCity_PokemonCenter_1F/events.inc | 14 - .../SootopolisCity_PokemonCenter_1F/header.inc | 15 - data/maps/SootopolisCity_PokemonCenter_1F/map.json | 95 + .../SootopolisCity_PokemonCenter_2F/events.inc | 14 - .../SootopolisCity_PokemonCenter_2F/header.inc | 15 - data/maps/SootopolisCity_PokemonCenter_2F/map.json | 95 + data/maps/SouthernIsland_Exterior/events.inc | 14 - data/maps/SouthernIsland_Exterior/header.inc | 15 - data/maps/SouthernIsland_Exterior/map.json | 71 + data/maps/SouthernIsland_Interior/events.inc | 14 - data/maps/SouthernIsland_Interior/header.inc | 15 - data/maps/SouthernIsland_Interior/map.json | 71 + data/maps/TerraCave_End/events.inc | 12 - data/maps/TerraCave_End/header.inc | 15 - data/maps/TerraCave_End/map.json | 52 + data/maps/TerraCave_Entrance/events.inc | 7 - data/maps/TerraCave_Entrance/header.inc | 15 - data/maps/TerraCave_Entrance/map.json | 35 + data/maps/TradeCenter/events.inc | 14 - data/maps/TradeCenter/header.inc | 15 - data/maps/TradeCenter/map.json | 68 + data/maps/TrainerHill_1F/events.inc | 7 - data/maps/TrainerHill_1F/header.inc | 15 - data/maps/TrainerHill_1F/map.json | 35 + data/maps/TrainerHill_2F/events.inc | 7 - data/maps/TrainerHill_2F/header.inc | 15 - data/maps/TrainerHill_2F/map.json | 35 + data/maps/TrainerHill_3F/events.inc | 7 - data/maps/TrainerHill_3F/header.inc | 15 - data/maps/TrainerHill_3F/map.json | 35 + data/maps/TrainerHill_4F/events.inc | 7 - data/maps/TrainerHill_4F/header.inc | 15 - data/maps/TrainerHill_4F/map.json | 35 + data/maps/TrainerHill_Elevator/events.inc | 10 - data/maps/TrainerHill_Elevator/header.inc | 15 - data/maps/TrainerHill_Elevator/map.json | 49 + data/maps/TrainerHill_Entrance/events.inc | 21 - data/maps/TrainerHill_Entrance/header.inc | 15 - data/maps/TrainerHill_Entrance/map.json | 127 + data/maps/TrainerHill_Roof/events.inc | 10 - data/maps/TrainerHill_Roof/header.inc | 15 - data/maps/TrainerHill_Roof/map.json | 49 + data/maps/Underwater1/connections.inc | 8 - data/maps/Underwater1/events.inc | 12 - data/maps/Underwater1/header.inc | 15 - data/maps/Underwater1/map.json | 88 + data/maps/Underwater2/connections.inc | 9 - data/maps/Underwater2/events.inc | 16 - data/maps/Underwater2/header.inc | 15 - data/maps/Underwater2/map.json | 109 + data/maps/Underwater3/connections.inc | 9 - data/maps/Underwater3/events.inc | 13 - data/maps/Underwater3/header.inc | 15 - data/maps/Underwater3/map.json | 84 + data/maps/Underwater4/connections.inc | 8 - data/maps/Underwater4/events.inc | 10 - data/maps/Underwater4/header.inc | 15 - data/maps/Underwater4/map.json | 56 + data/maps/Underwater5/connections.inc | 7 - data/maps/Underwater5/events.inc | 7 - data/maps/Underwater5/header.inc | 15 - data/maps/Underwater5/map.json | 41 + data/maps/Underwater6/connections.inc | 7 - data/maps/Underwater6/events.inc | 7 - data/maps/Underwater6/header.inc | 15 - data/maps/Underwater6/map.json | 41 + data/maps/Underwater7/connections.inc | 7 - data/maps/Underwater7/events.inc | 7 - data/maps/Underwater7/header.inc | 15 - data/maps/Underwater7/map.json | 41 + data/maps/Underwater_MarineCave/events.inc | 6 - data/maps/Underwater_MarineCave/header.inc | 15 - data/maps/Underwater_MarineCave/map.json | 28 + data/maps/Underwater_Route134/events.inc | 6 - data/maps/Underwater_Route134/header.inc | 15 - data/maps/Underwater_Route134/map.json | 28 + data/maps/Underwater_SeafloorCavern/events.inc | 12 - data/maps/Underwater_SeafloorCavern/header.inc | 15 - data/maps/Underwater_SeafloorCavern/map.json | 81 + data/maps/Underwater_SealedChamber/events.inc | 9 - data/maps/Underwater_SealedChamber/header.inc | 15 - data/maps/Underwater_SealedChamber/map.json | 37 + data/maps/Underwater_SootopolisCity/events.inc | 7 - data/maps/Underwater_SootopolisCity/header.inc | 15 - data/maps/Underwater_SootopolisCity/map.json | 35 + data/maps/UnionRoom/events.inc | 18 - data/maps/UnionRoom/header.inc | 15 - data/maps/UnionRoom/map.json | 153 + data/maps/UnknownMap_25_29/events.inc | 1 - data/maps/UnknownMap_25_29/header.inc | 15 - data/maps/UnknownMap_25_29/map.json | 18 + data/maps/UnknownMap_25_30/events.inc | 1 - data/maps/UnknownMap_25_30/header.inc | 15 - data/maps/UnknownMap_25_30/map.json | 18 + data/maps/UnknownMap_25_31/events.inc | 1 - data/maps/UnknownMap_25_31/header.inc | 15 - data/maps/UnknownMap_25_31/map.json | 18 + data/maps/UnknownMap_25_32/events.inc | 1 - data/maps/UnknownMap_25_32/header.inc | 15 - data/maps/UnknownMap_25_32/map.json | 18 + data/maps/UnknownMap_25_33/events.inc | 1 - data/maps/UnknownMap_25_33/header.inc | 15 - data/maps/UnknownMap_25_33/map.json | 18 + data/maps/UnknownMap_25_34/events.inc | 1 - data/maps/UnknownMap_25_34/header.inc | 15 - data/maps/UnknownMap_25_34/map.json | 18 + data/maps/VerdanturfTown/connections.inc | 8 - data/maps/VerdanturfTown/events.inc | 28 - data/maps/VerdanturfTown/header.inc | 15 - data/maps/VerdanturfTown/map.json | 199 + .../VerdanturfTown_BattleTentBattleRoom/events.inc | 8 - .../VerdanturfTown_BattleTentBattleRoom/header.inc | 15 - .../VerdanturfTown_BattleTentBattleRoom/map.json | 60 + .../VerdanturfTown_BattleTentCorridor/events.inc | 6 - .../VerdanturfTown_BattleTentCorridor/header.inc | 15 - .../VerdanturfTown_BattleTentCorridor/map.json | 34 + .../maps/VerdanturfTown_BattleTentLobby/events.inc | 18 - .../maps/VerdanturfTown_BattleTentLobby/header.inc | 15 - data/maps/VerdanturfTown_BattleTentLobby/map.json | 123 + .../events.inc | 11 - .../header.inc | 15 - .../VerdanturfTown_FriendshipRatersHouse/map.json | 62 + data/maps/VerdanturfTown_House/events.inc | 11 - data/maps/VerdanturfTown_House/header.inc | 15 - data/maps/VerdanturfTown_House/map.json | 62 + data/maps/VerdanturfTown_Mart/events.inc | 13 - data/maps/VerdanturfTown_Mart/header.inc | 15 - data/maps/VerdanturfTown_Mart/map.json | 88 + .../VerdanturfTown_PokemonCenter_1F/events.inc | 14 - .../VerdanturfTown_PokemonCenter_1F/header.inc | 15 - data/maps/VerdanturfTown_PokemonCenter_1F/map.json | 95 + .../VerdanturfTown_PokemonCenter_2F/events.inc | 14 - .../VerdanturfTown_PokemonCenter_2F/header.inc | 15 - data/maps/VerdanturfTown_PokemonCenter_2F/map.json | 95 + data/maps/VerdanturfTown_WandasHouse/events.inc | 14 - data/maps/VerdanturfTown_WandasHouse/header.inc | 15 - data/maps/VerdanturfTown_WandasHouse/map.json | 101 + data/maps/VictoryRoad_1F/events.inc | 28 - data/maps/VictoryRoad_1F/header.inc | 15 - data/maps/VictoryRoad_1F/map.json | 202 + data/maps/VictoryRoad_B1F/events.inc | 35 - data/maps/VictoryRoad_B1F/header.inc | 15 - data/maps/VictoryRoad_B1F/map.json | 344 ++ data/maps/VictoryRoad_B2F/events.inc | 22 - data/maps/VictoryRoad_B2F/header.inc | 15 - data/maps/VictoryRoad_B2F/map.json | 158 + data/maps/connections.inc | 65 - data/maps/groups.inc | 623 --- data/maps/headers.inc | 518 --- data/maps/map_groups.json | 691 +++ include/constants/layouts.h | 2 +- include/constants/map_groups.h | 592 +++ include/constants/maps.h | 589 +-- map_data_rules.mk | 31 + src/battle_factory.c | 4 +- src/battle_pike.c | 7 +- src/battle_pyramid.c | 8 +- src/battle_tent.c | 5 +- src/map_name_popup.c | 7 +- src/overworld.c | 9 +- src/pokemon.c | 3 +- src/trainer_hill.c | 27 +- src/tv.c | 9 +- src/wild_encounter.c | 20 +- tools/mapjson/mapjson.py | 389 ++ 2102 files changed, 72595 insertions(+), 27039 deletions(-) delete mode 100755 data/layouts.inc create mode 100755 data/layouts/.gitignore delete mode 100644 data/layouts/AbandonedShip_CaptainsOffice/layout.inc delete mode 100644 data/layouts/AbandonedShip_Corridors_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Corridors_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Deck/layout.inc delete mode 100644 data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc delete mode 100644 data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc delete mode 100644 data/layouts/AbandonedShip_Room_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms2_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms2_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms_1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Rooms_B1F/layout.inc delete mode 100644 data/layouts/AbandonedShip_Underwater1/layout.inc delete mode 100644 data/layouts/AbandonedShip_Underwater2/layout.inc delete mode 100644 data/layouts/AlteringCave/layout.inc delete mode 100644 data/layouts/AncientTomb/layout.inc delete mode 100644 data/layouts/AquaHideout_1F/layout.inc delete mode 100644 data/layouts/AquaHideout_B1F/layout.inc delete mode 100644 data/layouts/AquaHideout_B2F/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap1/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap2/layout.inc delete mode 100644 data/layouts/AquaHideout_UnusedRubyMap3/layout.inc delete mode 100644 data/layouts/ArtisanCave_1F/layout.inc delete mode 100644 data/layouts/ArtisanCave_B1F/layout.inc delete mode 100644 data/layouts/BattleElevator/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleArenaLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomeLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattlePyramidTop/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerLobby/layout.inc delete mode 100644 data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc delete mode 100644 data/layouts/BattleFrontier_Lounge1/layout.inc delete mode 100644 data/layouts/BattleFrontier_Lounge2/layout.inc delete mode 100644 data/layouts/BattleFrontier_OutsideEast/layout.inc delete mode 100644 data/layouts/BattleFrontier_OutsideWest/layout.inc delete mode 100644 data/layouts/BattleFrontier_RankingHall/layout.inc delete mode 100644 data/layouts/BattleFrontier_ReceptionGate/layout.inc delete mode 100644 data/layouts/BattleFrontier_ScottsHouse/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare01/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare02/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare03/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare04/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare05/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare06/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare07/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare08/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare09/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare10/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare11/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare12/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare13/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare14/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare15/layout.inc delete mode 100644 data/layouts/BattlePyramidSquare16/layout.inc delete mode 100644 data/layouts/BattleTentBattleRoom/layout.inc delete mode 100644 data/layouts/BattleTentCorridor/layout.inc delete mode 100644 data/layouts/BattleTentLobby/layout.inc delete mode 100644 data/layouts/BirthIsland_Exterior/layout.inc delete mode 100644 data/layouts/CableCarStation/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_1F/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_B1F/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_Entrance/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc delete mode 100644 data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc delete mode 100644 data/layouts/DesertRuins/layout.inc delete mode 100644 data/layouts/DesertUnderpass/layout.inc delete mode 100644 data/layouts/DewfordTown/layout.inc delete mode 100644 data/layouts/DewfordTown_Gym/layout.inc delete mode 100644 data/layouts/DewfordTown_Hall/layout.inc delete mode 100644 data/layouts/DoubleBattleColosseum/layout.inc delete mode 100644 data/layouts/EverGrandeCity/layout.inc delete mode 100644 data/layouts/EverGrandeCity_ChampionsRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_DrakesRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_GlaciasRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_Hall4/layout.inc delete mode 100644 data/layouts/EverGrandeCity_HallOfFame/layout.inc delete mode 100644 data/layouts/EverGrandeCity_PhoebesRoom/layout.inc delete mode 100644 data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc delete mode 100644 data/layouts/EverGrandeCity_ShortHall/layout.inc delete mode 100644 data/layouts/EverGrandeCity_SidneysRoom/layout.inc delete mode 100644 data/layouts/FallarborTown/layout.inc delete mode 100644 data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc delete mode 100644 data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc delete mode 100644 data/layouts/FarawayIsland_Entrance/layout.inc delete mode 100644 data/layouts/FarawayIsland_Interior/layout.inc delete mode 100644 data/layouts/FieryPath/layout.inc delete mode 100644 data/layouts/FortreeCity/layout.inc delete mode 100644 data/layouts/FortreeCity_DecorationShop/layout.inc delete mode 100644 data/layouts/FortreeCity_Gym/layout.inc delete mode 100644 data/layouts/FortreeCity_House1/layout.inc delete mode 100644 data/layouts/FortreeCity_House2/layout.inc delete mode 100644 data/layouts/GraniteCave_1F/layout.inc delete mode 100644 data/layouts/GraniteCave_B1F/layout.inc delete mode 100644 data/layouts/GraniteCave_B2F/layout.inc delete mode 100644 data/layouts/GraniteCave_StevensRoom/layout.inc delete mode 100644 data/layouts/Harbor/layout.inc delete mode 100644 data/layouts/House1/layout.inc delete mode 100644 data/layouts/House2/layout.inc delete mode 100644 data/layouts/House3/layout.inc delete mode 100644 data/layouts/House4/layout.inc delete mode 100644 data/layouts/HouseWithBed/layout.inc delete mode 100644 data/layouts/InsideOfTruck/layout.inc delete mode 100644 data/layouts/IslandCave/layout.inc delete mode 100644 data/layouts/IslandHarbor/layout.inc delete mode 100644 data/layouts/JaggedPass/layout.inc delete mode 100644 data/layouts/LavaridgeTown/layout.inc delete mode 100644 data/layouts/LavaridgeTown_Gym_1F/layout.inc delete mode 100644 data/layouts/LavaridgeTown_Gym_B1F/layout.inc delete mode 100644 data/layouts/LavaridgeTown_HerbShop/layout.inc delete mode 100644 data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity/layout.inc delete mode 100644 data/layouts/LilycoveCity_ContestHall/layout.inc delete mode 100644 data/layouts/LilycoveCity_ContestLobby/layout.inc delete mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc delete mode 100644 data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc delete mode 100644 data/layouts/LilycoveCity_House2/layout.inc delete mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc delete mode 100644 data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc delete mode 100644 data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc delete mode 100644 data/layouts/LinkContestRoom1/layout.inc delete mode 100644 data/layouts/LinkContestRoom2/layout.inc delete mode 100644 data/layouts/LinkContestRoom3/layout.inc delete mode 100644 data/layouts/LinkContestRoom4/layout.inc delete mode 100644 data/layouts/LinkContestRoom5/layout.inc delete mode 100644 data/layouts/LinkContestRoom6/layout.inc delete mode 100644 data/layouts/LittlerootTown/layout.inc delete mode 100644 data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc delete mode 100644 data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc delete mode 100644 data/layouts/LittlerootTown_MaysHouse_1F/layout.inc delete mode 100644 data/layouts/LittlerootTown_MaysHouse_2F/layout.inc delete mode 100644 data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc delete mode 100644 data/layouts/MagmaHideout_1F/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_1R/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_2R/layout.inc delete mode 100644 data/layouts/MagmaHideout_2F_3R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_1R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_2R/layout.inc delete mode 100644 data/layouts/MagmaHideout_3F_3R/layout.inc delete mode 100644 data/layouts/MagmaHideout_4F/layout.inc delete mode 100644 data/layouts/MarineCave_End/layout.inc delete mode 100644 data/layouts/MarineCave_Entrance/layout.inc delete mode 100644 data/layouts/Mart/layout.inc delete mode 100644 data/layouts/MauvilleCity/layout.inc delete mode 100644 data/layouts/MauvilleCity_BikeShop/layout.inc delete mode 100644 data/layouts/MauvilleCity_GameCorner/layout.inc delete mode 100644 data/layouts/MauvilleCity_Gym/layout.inc delete mode 100644 data/layouts/MeteorFalls_1F_1R/layout.inc delete mode 100644 data/layouts/MeteorFalls_1F_2R/layout.inc delete mode 100644 data/layouts/MeteorFalls_B1F_1R/layout.inc delete mode 100644 data/layouts/MeteorFalls_B1F_2R/layout.inc delete mode 100644 data/layouts/MeteorFalls_StevensCave/layout.inc delete mode 100644 data/layouts/MirageTower_1F/layout.inc delete mode 100644 data/layouts/MirageTower_2F/layout.inc delete mode 100644 data/layouts/MirageTower_3F/layout.inc delete mode 100644 data/layouts/MirageTower_4F/layout.inc delete mode 100644 data/layouts/MossdeepCity/layout.inc delete mode 100644 data/layouts/MossdeepCity_GameCorner_1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_GameCorner_B1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_Gym/layout.inc delete mode 100644 data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc delete mode 100644 data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc delete mode 100644 data/layouts/MossdeepCity_StevensHouse/layout.inc delete mode 100644 data/layouts/MtChimney/layout.inc delete mode 100644 data/layouts/MtPyre_1F/layout.inc delete mode 100644 data/layouts/MtPyre_2F/layout.inc delete mode 100644 data/layouts/MtPyre_3F/layout.inc delete mode 100644 data/layouts/MtPyre_4F/layout.inc delete mode 100644 data/layouts/MtPyre_5F/layout.inc delete mode 100644 data/layouts/MtPyre_6F/layout.inc delete mode 100644 data/layouts/MtPyre_Exterior/layout.inc delete mode 100644 data/layouts/MtPyre_Summit/layout.inc delete mode 100644 data/layouts/NavelRock_B1F/layout.inc delete mode 100644 data/layouts/NavelRock_Bottom/layout.inc delete mode 100644 data/layouts/NavelRock_Entrance/layout.inc delete mode 100644 data/layouts/NavelRock_Exterior/layout.inc delete mode 100644 data/layouts/NavelRock_Fork/layout.inc delete mode 100644 data/layouts/NavelRock_LadderRoom1/layout.inc delete mode 100644 data/layouts/NavelRock_LadderRoom2/layout.inc delete mode 100644 data/layouts/NavelRock_Top/layout.inc delete mode 100644 data/layouts/NewMauville_Entrance/layout.inc delete mode 100644 data/layouts/NewMauville_Inside/layout.inc delete mode 100644 data/layouts/OldaleTown/layout.inc delete mode 100644 data/layouts/PacifidlogTown/layout.inc delete mode 100644 data/layouts/PacifidlogTown_House1/layout.inc delete mode 100644 data/layouts/PacifidlogTown_House2/layout.inc delete mode 100644 data/layouts/PetalburgCity/layout.inc delete mode 100644 data/layouts/PetalburgCity_Gym/layout.inc delete mode 100644 data/layouts/PetalburgWoods/layout.inc delete mode 100644 data/layouts/PokemonCenter_1F/layout.inc delete mode 100644 data/layouts/PokemonCenter_2F/layout.inc delete mode 100644 data/layouts/RecordCorner/layout.inc delete mode 100644 data/layouts/Route101/layout.inc delete mode 100644 data/layouts/Route102/layout.inc delete mode 100644 data/layouts/Route103/layout.inc delete mode 100644 data/layouts/Route104/layout.inc delete mode 100644 data/layouts/Route104_MrBrineysHouse/layout.inc delete mode 100644 data/layouts/Route104_PrettyPetalFlowerShop/layout.inc delete mode 100644 data/layouts/Route104_Prototype/layout.inc delete mode 100644 data/layouts/Route105/layout.inc delete mode 100644 data/layouts/Route106/layout.inc delete mode 100644 data/layouts/Route107/layout.inc delete mode 100644 data/layouts/Route108/layout.inc delete mode 100644 data/layouts/Route109/layout.inc delete mode 100644 data/layouts/Route109_SeashoreHouse/layout.inc delete mode 100644 data/layouts/Route110/layout.inc delete mode 100644 data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseCorridor/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseEnd/layout.inc delete mode 100644 data/layouts/Route110_TrickHouseEntrance/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle1/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle2/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle3/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle4/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle5/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle6/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle7/layout.inc delete mode 100644 data/layouts/Route110_TrickHousePuzzle8/layout.inc delete mode 100644 data/layouts/Route111/layout.inc delete mode 100644 data/layouts/Route111_NoMirageTower/layout.inc delete mode 100644 data/layouts/Route112/layout.inc delete mode 100644 data/layouts/Route113/layout.inc delete mode 100644 data/layouts/Route114/layout.inc delete mode 100644 data/layouts/Route114_FossilManiacsHouse/layout.inc delete mode 100644 data/layouts/Route114_FossilManiacsTunnel/layout.inc delete mode 100644 data/layouts/Route114_LanettesHouse/layout.inc delete mode 100644 data/layouts/Route115/layout.inc delete mode 100644 data/layouts/Route116/layout.inc delete mode 100644 data/layouts/Route116_TunnelersRestHouse/layout.inc delete mode 100644 data/layouts/Route117/layout.inc delete mode 100644 data/layouts/Route117_PokemonDayCare/layout.inc delete mode 100644 data/layouts/Route118/layout.inc delete mode 100644 data/layouts/Route119/layout.inc delete mode 100644 data/layouts/Route119_WeatherInstitute_1F/layout.inc delete mode 100644 data/layouts/Route119_WeatherInstitute_2F/layout.inc delete mode 100644 data/layouts/Route120/layout.inc delete mode 100644 data/layouts/Route121/layout.inc delete mode 100644 data/layouts/Route121_SafariZoneEntrance/layout.inc delete mode 100644 data/layouts/Route122/layout.inc delete mode 100644 data/layouts/Route123/layout.inc delete mode 100644 data/layouts/Route124/layout.inc delete mode 100644 data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc delete mode 100644 data/layouts/Route125/layout.inc delete mode 100644 data/layouts/Route126/layout.inc delete mode 100644 data/layouts/Route127/layout.inc delete mode 100644 data/layouts/Route128/layout.inc delete mode 100644 data/layouts/Route129/layout.inc delete mode 100644 data/layouts/Route130/layout.inc delete mode 100644 data/layouts/Route131/layout.inc delete mode 100644 data/layouts/Route132/layout.inc delete mode 100644 data/layouts/Route133/layout.inc delete mode 100644 data/layouts/Route134/layout.inc delete mode 100644 data/layouts/RustboroCity/layout.inc delete mode 100644 data/layouts/RustboroCity_CuttersHouse/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_DevonCorp_3F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat1_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat1_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_1F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_2F/layout.inc delete mode 100644 data/layouts/RustboroCity_Flat2_3F/layout.inc delete mode 100644 data/layouts/RustboroCity_Gym/layout.inc delete mode 100644 data/layouts/RustboroCity_House/layout.inc delete mode 100644 data/layouts/RustboroCity_House1/layout.inc delete mode 100644 data/layouts/RustboroCity_PokemonSchool/layout.inc delete mode 100644 data/layouts/RusturfTunnel/layout.inc delete mode 100644 data/layouts/SSTidalCorridor/layout.inc delete mode 100644 data/layouts/SSTidalLowerDeck/layout.inc delete mode 100644 data/layouts/SSTidalRooms/layout.inc delete mode 100644 data/layouts/SafariZone_North/layout.inc delete mode 100644 data/layouts/SafariZone_Northeast/layout.inc delete mode 100644 data/layouts/SafariZone_Northwest/layout.inc delete mode 100644 data/layouts/SafariZone_RestHouse/layout.inc delete mode 100644 data/layouts/SafariZone_South/layout.inc delete mode 100644 data/layouts/SafariZone_Southeast/layout.inc delete mode 100644 data/layouts/SafariZone_Southwest/layout.inc delete mode 100644 data/layouts/ScorchedSlab/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Entrance/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room1/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room2/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room3/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room4/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room5/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room6/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room7/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room8/layout.inc delete mode 100644 data/layouts/SeafloorCavern_Room9/layout.inc delete mode 100644 data/layouts/SealedChamber_InnerRoom/layout.inc delete mode 100644 data/layouts/SealedChamber_OuterRoom/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave1/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave2/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave3/layout.inc delete mode 100644 data/layouts/SecretBase_BlueCave4/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave1/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave2/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave3/layout.inc delete mode 100644 data/layouts/SecretBase_BrownCave4/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave1/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave2/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave3/layout.inc delete mode 100644 data/layouts/SecretBase_RedCave4/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub1/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub2/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub3/layout.inc delete mode 100644 data/layouts/SecretBase_Shrub4/layout.inc delete mode 100644 data/layouts/SecretBase_Tree1/layout.inc delete mode 100644 data/layouts/SecretBase_Tree2/layout.inc delete mode 100644 data/layouts/SecretBase_Tree3/layout.inc delete mode 100644 data/layouts/SecretBase_Tree4/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave1/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave2/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave3/layout.inc delete mode 100644 data/layouts/SecretBase_YellowCave4/layout.inc delete mode 100644 data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_HighTideInnerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideIceRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideInnerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideLowerRoom/layout.inc delete mode 100644 data/layouts/ShoalCave_LowTideStairsRoom/layout.inc delete mode 100644 data/layouts/SingleBattleColosseum/layout.inc delete mode 100644 data/layouts/SkyPillar_1F/layout.inc delete mode 100644 data/layouts/SkyPillar_2F/layout.inc delete mode 100644 data/layouts/SkyPillar_3F/layout.inc delete mode 100644 data/layouts/SkyPillar_4F/layout.inc delete mode 100644 data/layouts/SkyPillar_5F/layout.inc delete mode 100644 data/layouts/SkyPillar_Entrance/layout.inc delete mode 100644 data/layouts/SkyPillar_Outside/layout.inc delete mode 100644 data/layouts/SkyPillar_Top/layout.inc delete mode 100644 data/layouts/SlateportCity/layout.inc delete mode 100644 data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc delete mode 100644 data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc delete mode 100644 data/layouts/SlateportCity_PokemonFanClub/layout.inc delete mode 100644 data/layouts/SlateportCity_SternsShipyard_1F/layout.inc delete mode 100644 data/layouts/SlateportCity_SternsShipyard_2F/layout.inc delete mode 100644 data/layouts/SootopolisCity/layout.inc delete mode 100644 data/layouts/SootopolisCity_Gym_1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_Gym_B1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_House1/layout.inc delete mode 100644 data/layouts/SootopolisCity_House2/layout.inc delete mode 100644 data/layouts/SootopolisCity_House3/layout.inc delete mode 100644 data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc delete mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc delete mode 100644 data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc delete mode 100644 data/layouts/SouthernIsland_Exterior/layout.inc delete mode 100644 data/layouts/SouthernIsland_Interior/layout.inc delete mode 100644 data/layouts/TerraCave_End/layout.inc delete mode 100644 data/layouts/TerraCave_Entrance/layout.inc delete mode 100644 data/layouts/TradeCenter/layout.inc delete mode 100644 data/layouts/TrainerHill_1F/layout.inc delete mode 100644 data/layouts/TrainerHill_2F/layout.inc delete mode 100644 data/layouts/TrainerHill_3F/layout.inc delete mode 100644 data/layouts/TrainerHill_4F/layout.inc delete mode 100644 data/layouts/TrainerHill_Entrance/layout.inc delete mode 100644 data/layouts/TrainerHill_Roof/layout.inc delete mode 100644 data/layouts/Underwater1/layout.inc delete mode 100644 data/layouts/Underwater2/layout.inc delete mode 100644 data/layouts/Underwater3/layout.inc delete mode 100644 data/layouts/Underwater4/layout.inc delete mode 100644 data/layouts/Underwater5/layout.inc delete mode 100644 data/layouts/Underwater6/layout.inc delete mode 100644 data/layouts/Underwater7/layout.inc delete mode 100644 data/layouts/Underwater_MarineCave/layout.inc delete mode 100644 data/layouts/Underwater_Route134/layout.inc delete mode 100644 data/layouts/Underwater_SeafloorCavern/layout.inc delete mode 100644 data/layouts/Underwater_SealedChamber/layout.inc delete mode 100644 data/layouts/Underwater_SootopolisCity/layout.inc delete mode 100644 data/layouts/UnionRoom/layout.inc delete mode 100644 data/layouts/UnknownMap_08417FC4/layout.inc delete mode 100644 data/layouts/UnknownMap_08428450/layout.inc delete mode 100644 data/layouts/UnknownMap_084294C4/layout.inc delete mode 100644 data/layouts/UnknownMap_084294E8/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E6C0/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E6E4/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E708/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E72C/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E750/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E774/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E798/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E7BC/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E7E0/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E804/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E828/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E84C/layout.inc delete mode 100644 data/layouts/UnknownMap_0843E870/layout.inc delete mode 100755 data/layouts/UnknownMap_0843E894/layout.inc delete mode 100644 data/layouts/UnknownMap_08447028/layout.inc delete mode 100644 data/layouts/UnknownMap_0845A394/layout.inc delete mode 100644 data/layouts/UnknownMap_0845D470/layout.inc delete mode 100644 data/layouts/UnknownMap_0845ECB4/layout.inc delete mode 100644 data/layouts/UnknownMap_08469200/layout.inc delete mode 100644 data/layouts/UnknownMap_084693AC/layout.inc delete mode 100644 data/layouts/UnknownMap_08480DAC/layout.inc delete mode 100644 data/layouts/UnknownMap_08480F54/layout.inc delete mode 100644 data/layouts/UnknownMap_084810FC/layout.inc delete mode 100644 data/layouts/UnknownMap_084812A4/layout.inc delete mode 100644 data/layouts/UnknownMap_0848144C/layout.inc delete mode 100644 data/layouts/UnknownMap_084815F4/layout.inc delete mode 100644 data/layouts/UnknownMap_08481B24/layout.inc delete mode 100644 data/layouts/UnknownMap_08481DBC/layout.inc delete mode 100644 data/layouts/UnknownMap_25_29/layout.inc delete mode 100644 data/layouts/UnknownMap_25_30/layout.inc delete mode 100644 data/layouts/UnknownMap_25_31/layout.inc delete mode 100644 data/layouts/UnknownMap_25_32/layout.inc delete mode 100644 data/layouts/UnknownMap_25_33/layout.inc delete mode 100644 data/layouts/UnknownMap_25_34/layout.inc delete mode 100644 data/layouts/VerdanturfTown/layout.inc delete mode 100644 data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc delete mode 100644 data/layouts/VerdanturfTown_WandasHouse/layout.inc delete mode 100644 data/layouts/VictoryRoad_1F/layout.inc delete mode 100644 data/layouts/VictoryRoad_B1F/layout.inc delete mode 100644 data/layouts/VictoryRoad_B2F/layout.inc create mode 100644 data/layouts/layouts.json delete mode 100644 data/layouts_table.inc create mode 100755 data/maps/.gitignore delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/events.inc delete mode 100644 data/maps/AbandonedShip_CaptainsOffice/header.inc create mode 100644 data/maps/AbandonedShip_CaptainsOffice/map.json delete mode 100644 data/maps/AbandonedShip_Corridors_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Corridors_1F/header.inc create mode 100644 data/maps/AbandonedShip_Corridors_1F/map.json delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Corridors_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Corridors_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Deck/events.inc delete mode 100644 data/maps/AbandonedShip_Deck/header.inc create mode 100644 data/maps/AbandonedShip_Deck/map.json delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/events.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/header.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/map.json delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/events.inc delete mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/header.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/map.json delete mode 100644 data/maps/AbandonedShip_Room_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Room_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Room_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms2_1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms2_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms_1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms_1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms_1F/map.json delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/events.inc delete mode 100644 data/maps/AbandonedShip_Rooms_B1F/header.inc create mode 100644 data/maps/AbandonedShip_Rooms_B1F/map.json delete mode 100644 data/maps/AbandonedShip_Underwater1/events.inc delete mode 100644 data/maps/AbandonedShip_Underwater1/header.inc create mode 100644 data/maps/AbandonedShip_Underwater1/map.json delete mode 100644 data/maps/AbandonedShip_Underwater2/events.inc delete mode 100644 data/maps/AbandonedShip_Underwater2/header.inc create mode 100644 data/maps/AbandonedShip_Underwater2/map.json delete mode 100644 data/maps/AlteringCave/events.inc delete mode 100644 data/maps/AlteringCave/header.inc create mode 100644 data/maps/AlteringCave/map.json delete mode 100644 data/maps/AncientTomb/events.inc delete mode 100644 data/maps/AncientTomb/header.inc create mode 100644 data/maps/AncientTomb/map.json delete mode 100644 data/maps/AquaHideout_1F/events.inc delete mode 100644 data/maps/AquaHideout_1F/header.inc create mode 100644 data/maps/AquaHideout_1F/map.json delete mode 100644 data/maps/AquaHideout_B1F/events.inc delete mode 100644 data/maps/AquaHideout_B1F/header.inc create mode 100644 data/maps/AquaHideout_B1F/map.json delete mode 100644 data/maps/AquaHideout_B2F/events.inc delete mode 100644 data/maps/AquaHideout_B2F/header.inc create mode 100644 data/maps/AquaHideout_B2F/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap1/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap1/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap2/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap2/map.json delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/events.inc delete mode 100644 data/maps/AquaHideout_UnusedRubyMap3/header.inc create mode 100644 data/maps/AquaHideout_UnusedRubyMap3/map.json delete mode 100644 data/maps/ArtisanCave_1F/events.inc delete mode 100644 data/maps/ArtisanCave_1F/header.inc create mode 100644 data/maps/ArtisanCave_1F/map.json delete mode 100644 data/maps/ArtisanCave_B1F/events.inc delete mode 100644 data/maps/ArtisanCave_B1F/header.inc create mode 100644 data/maps/ArtisanCave_B1F/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleArenaLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleArenaLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomeLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomeLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePalaceLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc create mode 100644 data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/events.inc delete mode 100644 data/maps/BattleFrontier_BattlePyramidTop/header.inc create mode 100644 data/maps/BattleFrontier_BattlePyramidTop/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerCorridor2/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerElevator/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerElevator/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerLobby/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerLobby/map.json delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc delete mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc create mode 100644 data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json delete mode 100644 data/maps/BattleFrontier_Lounge1/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge1/header.inc create mode 100644 data/maps/BattleFrontier_Lounge1/map.json delete mode 100644 data/maps/BattleFrontier_Lounge2/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge2/header.inc create mode 100644 data/maps/BattleFrontier_Lounge2/map.json delete mode 100644 data/maps/BattleFrontier_Lounge3/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge3/header.inc create mode 100644 data/maps/BattleFrontier_Lounge3/map.json delete mode 100644 data/maps/BattleFrontier_Lounge4/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge4/header.inc create mode 100644 data/maps/BattleFrontier_Lounge4/map.json delete mode 100644 data/maps/BattleFrontier_Lounge5/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge5/header.inc create mode 100644 data/maps/BattleFrontier_Lounge5/map.json delete mode 100644 data/maps/BattleFrontier_Lounge6/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge6/header.inc create mode 100644 data/maps/BattleFrontier_Lounge6/map.json delete mode 100644 data/maps/BattleFrontier_Lounge7/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge7/header.inc create mode 100644 data/maps/BattleFrontier_Lounge7/map.json delete mode 100644 data/maps/BattleFrontier_Lounge8/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge8/header.inc create mode 100644 data/maps/BattleFrontier_Lounge8/map.json delete mode 100644 data/maps/BattleFrontier_Lounge9/events.inc delete mode 100644 data/maps/BattleFrontier_Lounge9/header.inc create mode 100644 data/maps/BattleFrontier_Lounge9/map.json delete mode 100644 data/maps/BattleFrontier_Mart/events.inc delete mode 100644 data/maps/BattleFrontier_Mart/header.inc create mode 100644 data/maps/BattleFrontier_Mart/map.json delete mode 100644 data/maps/BattleFrontier_OutsideEast/connections.inc delete mode 100644 data/maps/BattleFrontier_OutsideEast/events.inc delete mode 100644 data/maps/BattleFrontier_OutsideEast/header.inc create mode 100644 data/maps/BattleFrontier_OutsideEast/map.json delete mode 100644 data/maps/BattleFrontier_OutsideWest/connections.inc delete mode 100644 data/maps/BattleFrontier_OutsideWest/events.inc delete mode 100644 data/maps/BattleFrontier_OutsideWest/header.inc create mode 100644 data/maps/BattleFrontier_OutsideWest/map.json delete mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/events.inc delete mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/header.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_1F/map.json delete mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/events.inc delete mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/header.inc create mode 100644 data/maps/BattleFrontier_PokemonCenter_2F/map.json delete mode 100644 data/maps/BattleFrontier_RankingHall/events.inc delete mode 100644 data/maps/BattleFrontier_RankingHall/header.inc create mode 100644 data/maps/BattleFrontier_RankingHall/map.json delete mode 100644 data/maps/BattleFrontier_ReceptionGate/events.inc delete mode 100644 data/maps/BattleFrontier_ReceptionGate/header.inc create mode 100644 data/maps/BattleFrontier_ReceptionGate/map.json delete mode 100644 data/maps/BattleFrontier_ScottsHouse/events.inc delete mode 100644 data/maps/BattleFrontier_ScottsHouse/header.inc create mode 100644 data/maps/BattleFrontier_ScottsHouse/map.json delete mode 100644 data/maps/BattlePyramidSquare01/events.inc delete mode 100644 data/maps/BattlePyramidSquare01/header.inc create mode 100644 data/maps/BattlePyramidSquare01/map.json delete mode 100644 data/maps/BattlePyramidSquare02/events.inc delete mode 100644 data/maps/BattlePyramidSquare02/header.inc create mode 100644 data/maps/BattlePyramidSquare02/map.json delete mode 100644 data/maps/BattlePyramidSquare03/events.inc delete mode 100644 data/maps/BattlePyramidSquare03/header.inc create mode 100644 data/maps/BattlePyramidSquare03/map.json delete mode 100644 data/maps/BattlePyramidSquare04/events.inc delete mode 100644 data/maps/BattlePyramidSquare04/header.inc create mode 100644 data/maps/BattlePyramidSquare04/map.json delete mode 100644 data/maps/BattlePyramidSquare05/events.inc delete mode 100644 data/maps/BattlePyramidSquare05/header.inc create mode 100644 data/maps/BattlePyramidSquare05/map.json delete mode 100644 data/maps/BattlePyramidSquare06/events.inc delete mode 100644 data/maps/BattlePyramidSquare06/header.inc create mode 100644 data/maps/BattlePyramidSquare06/map.json delete mode 100644 data/maps/BattlePyramidSquare07/events.inc delete mode 100644 data/maps/BattlePyramidSquare07/header.inc create mode 100644 data/maps/BattlePyramidSquare07/map.json delete mode 100644 data/maps/BattlePyramidSquare08/events.inc delete mode 100644 data/maps/BattlePyramidSquare08/header.inc create mode 100644 data/maps/BattlePyramidSquare08/map.json delete mode 100644 data/maps/BattlePyramidSquare09/events.inc delete mode 100644 data/maps/BattlePyramidSquare09/header.inc create mode 100644 data/maps/BattlePyramidSquare09/map.json delete mode 100644 data/maps/BattlePyramidSquare10/events.inc delete mode 100644 data/maps/BattlePyramidSquare10/header.inc create mode 100644 data/maps/BattlePyramidSquare10/map.json delete mode 100644 data/maps/BattlePyramidSquare11/events.inc delete mode 100644 data/maps/BattlePyramidSquare11/header.inc create mode 100644 data/maps/BattlePyramidSquare11/map.json delete mode 100644 data/maps/BattlePyramidSquare12/events.inc delete mode 100644 data/maps/BattlePyramidSquare12/header.inc create mode 100644 data/maps/BattlePyramidSquare12/map.json delete mode 100644 data/maps/BattlePyramidSquare13/events.inc delete mode 100644 data/maps/BattlePyramidSquare13/header.inc create mode 100644 data/maps/BattlePyramidSquare13/map.json delete mode 100644 data/maps/BattlePyramidSquare14/events.inc delete mode 100644 data/maps/BattlePyramidSquare14/header.inc create mode 100644 data/maps/BattlePyramidSquare14/map.json delete mode 100644 data/maps/BattlePyramidSquare15/events.inc delete mode 100644 data/maps/BattlePyramidSquare15/header.inc create mode 100644 data/maps/BattlePyramidSquare15/map.json delete mode 100644 data/maps/BattlePyramidSquare16/events.inc delete mode 100644 data/maps/BattlePyramidSquare16/header.inc create mode 100644 data/maps/BattlePyramidSquare16/map.json delete mode 100644 data/maps/BirthIsland_Exterior/events.inc delete mode 100644 data/maps/BirthIsland_Exterior/header.inc create mode 100644 data/maps/BirthIsland_Exterior/map.json delete mode 100644 data/maps/BirthIsland_Harbor/events.inc delete mode 100644 data/maps/BirthIsland_Harbor/header.inc create mode 100644 data/maps/BirthIsland_Harbor/map.json delete mode 100644 data/maps/CaveOfOrigin_1F/events.inc delete mode 100644 data/maps/CaveOfOrigin_1F/header.inc create mode 100644 data/maps/CaveOfOrigin_1F/map.json delete mode 100644 data/maps/CaveOfOrigin_B1F/events.inc delete mode 100644 data/maps/CaveOfOrigin_B1F/header.inc create mode 100644 data/maps/CaveOfOrigin_B1F/map.json delete mode 100644 data/maps/CaveOfOrigin_Entrance/events.inc delete mode 100644 data/maps/CaveOfOrigin_Entrance/header.inc create mode 100644 data/maps/CaveOfOrigin_Entrance/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc delete mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc create mode 100644 data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json delete mode 100644 data/maps/DesertRuins/events.inc delete mode 100644 data/maps/DesertRuins/header.inc create mode 100644 data/maps/DesertRuins/map.json delete mode 100644 data/maps/DesertUnderpass/events.inc delete mode 100644 data/maps/DesertUnderpass/header.inc create mode 100644 data/maps/DesertUnderpass/map.json delete mode 100644 data/maps/DewfordTown/connections.inc delete mode 100644 data/maps/DewfordTown/events.inc delete mode 100644 data/maps/DewfordTown/header.inc create mode 100644 data/maps/DewfordTown/map.json delete mode 100644 data/maps/DewfordTown_Gym/events.inc delete mode 100644 data/maps/DewfordTown_Gym/header.inc create mode 100644 data/maps/DewfordTown_Gym/map.json delete mode 100644 data/maps/DewfordTown_Hall/events.inc delete mode 100644 data/maps/DewfordTown_Hall/header.inc create mode 100644 data/maps/DewfordTown_Hall/map.json delete mode 100644 data/maps/DewfordTown_House1/events.inc delete mode 100644 data/maps/DewfordTown_House1/header.inc create mode 100644 data/maps/DewfordTown_House1/map.json delete mode 100644 data/maps/DewfordTown_House2/events.inc delete mode 100644 data/maps/DewfordTown_House2/header.inc create mode 100644 data/maps/DewfordTown_House2/map.json delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/DewfordTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/DoubleBattleColosseum/events.inc delete mode 100644 data/maps/DoubleBattleColosseum/header.inc create mode 100644 data/maps/DoubleBattleColosseum/map.json delete mode 100644 data/maps/EverGrandeCity/connections.inc delete mode 100644 data/maps/EverGrandeCity/events.inc delete mode 100644 data/maps/EverGrandeCity/header.inc create mode 100644 data/maps/EverGrandeCity/map.json delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_ChampionsRoom/header.inc create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/map.json delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_DrakesRoom/header.inc create mode 100644 data/maps/EverGrandeCity_DrakesRoom/map.json delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_GlaciasRoom/header.inc create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/map.json delete mode 100644 data/maps/EverGrandeCity_Hall1/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall1/header.inc create mode 100644 data/maps/EverGrandeCity_Hall1/map.json delete mode 100644 data/maps/EverGrandeCity_Hall2/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall2/header.inc create mode 100644 data/maps/EverGrandeCity_Hall2/map.json delete mode 100644 data/maps/EverGrandeCity_Hall3/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall3/header.inc create mode 100644 data/maps/EverGrandeCity_Hall3/map.json delete mode 100644 data/maps/EverGrandeCity_Hall4/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall4/header.inc create mode 100644 data/maps/EverGrandeCity_Hall4/map.json delete mode 100644 data/maps/EverGrandeCity_Hall5/events.inc delete mode 100644 data/maps/EverGrandeCity_Hall5/header.inc create mode 100644 data/maps/EverGrandeCity_Hall5/map.json delete mode 100644 data/maps/EverGrandeCity_HallOfFame/events.inc delete mode 100644 data/maps/EverGrandeCity_HallOfFame/header.inc create mode 100644 data/maps/EverGrandeCity_HallOfFame/map.json delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_PhoebesRoom/header.inc create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_1F/map.json delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/events.inc delete mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/header.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague_2F/map.json delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/events.inc delete mode 100644 data/maps/EverGrandeCity_SidneysRoom/header.inc create mode 100644 data/maps/EverGrandeCity_SidneysRoom/map.json delete mode 100644 data/maps/FallarborTown/connections.inc delete mode 100644 data/maps/FallarborTown/events.inc delete mode 100644 data/maps/FallarborTown/header.inc create mode 100644 data/maps/FallarborTown/map.json delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/header.inc create mode 100644 data/maps/FallarborTown_BattleTentBattleRoom/map.json delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentCorridor/header.inc create mode 100644 data/maps/FallarborTown_BattleTentCorridor/map.json delete mode 100644 data/maps/FallarborTown_BattleTentLobby/events.inc delete mode 100644 data/maps/FallarborTown_BattleTentLobby/header.inc create mode 100644 data/maps/FallarborTown_BattleTentLobby/map.json delete mode 100644 data/maps/FallarborTown_House1/events.inc delete mode 100644 data/maps/FallarborTown_House1/header.inc create mode 100644 data/maps/FallarborTown_House1/map.json delete mode 100644 data/maps/FallarborTown_House2/events.inc delete mode 100644 data/maps/FallarborTown_House2/header.inc create mode 100644 data/maps/FallarborTown_House2/map.json delete mode 100644 data/maps/FallarborTown_Mart/events.inc delete mode 100644 data/maps/FallarborTown_Mart/header.inc create mode 100644 data/maps/FallarborTown_Mart/map.json delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FallarborTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/FarawayIsland_Entrance/events.inc delete mode 100644 data/maps/FarawayIsland_Entrance/header.inc create mode 100644 data/maps/FarawayIsland_Entrance/map.json delete mode 100644 data/maps/FarawayIsland_Interior/events.inc delete mode 100644 data/maps/FarawayIsland_Interior/header.inc create mode 100644 data/maps/FarawayIsland_Interior/map.json delete mode 100644 data/maps/FieryPath/events.inc delete mode 100644 data/maps/FieryPath/header.inc create mode 100644 data/maps/FieryPath/map.json delete mode 100644 data/maps/FortreeCity/connections.inc delete mode 100644 data/maps/FortreeCity/events.inc delete mode 100644 data/maps/FortreeCity/header.inc create mode 100644 data/maps/FortreeCity/map.json delete mode 100644 data/maps/FortreeCity_DecorationShop/events.inc delete mode 100644 data/maps/FortreeCity_DecorationShop/header.inc create mode 100644 data/maps/FortreeCity_DecorationShop/map.json delete mode 100644 data/maps/FortreeCity_Gym/events.inc delete mode 100644 data/maps/FortreeCity_Gym/header.inc create mode 100644 data/maps/FortreeCity_Gym/map.json delete mode 100644 data/maps/FortreeCity_House1/events.inc delete mode 100644 data/maps/FortreeCity_House1/header.inc create mode 100644 data/maps/FortreeCity_House1/map.json delete mode 100644 data/maps/FortreeCity_House2/events.inc delete mode 100644 data/maps/FortreeCity_House2/header.inc create mode 100644 data/maps/FortreeCity_House2/map.json delete mode 100644 data/maps/FortreeCity_House3/events.inc delete mode 100644 data/maps/FortreeCity_House3/header.inc create mode 100644 data/maps/FortreeCity_House3/map.json delete mode 100644 data/maps/FortreeCity_House4/events.inc delete mode 100644 data/maps/FortreeCity_House4/header.inc create mode 100644 data/maps/FortreeCity_House4/map.json delete mode 100644 data/maps/FortreeCity_House5/events.inc delete mode 100644 data/maps/FortreeCity_House5/header.inc create mode 100644 data/maps/FortreeCity_House5/map.json delete mode 100644 data/maps/FortreeCity_Mart/events.inc delete mode 100644 data/maps/FortreeCity_Mart/header.inc create mode 100644 data/maps/FortreeCity_Mart/map.json delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/FortreeCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/GraniteCave_1F/events.inc delete mode 100644 data/maps/GraniteCave_1F/header.inc create mode 100644 data/maps/GraniteCave_1F/map.json delete mode 100644 data/maps/GraniteCave_B1F/events.inc delete mode 100644 data/maps/GraniteCave_B1F/header.inc create mode 100644 data/maps/GraniteCave_B1F/map.json delete mode 100644 data/maps/GraniteCave_B2F/events.inc delete mode 100644 data/maps/GraniteCave_B2F/header.inc create mode 100644 data/maps/GraniteCave_B2F/map.json delete mode 100644 data/maps/GraniteCave_StevensRoom/events.inc delete mode 100644 data/maps/GraniteCave_StevensRoom/header.inc create mode 100644 data/maps/GraniteCave_StevensRoom/map.json delete mode 100644 data/maps/InsideOfTruck/events.inc delete mode 100644 data/maps/InsideOfTruck/header.inc create mode 100644 data/maps/InsideOfTruck/map.json delete mode 100644 data/maps/IslandCave/events.inc delete mode 100644 data/maps/IslandCave/header.inc create mode 100644 data/maps/IslandCave/map.json delete mode 100644 data/maps/JaggedPass/events.inc delete mode 100644 data/maps/JaggedPass/header.inc create mode 100644 data/maps/JaggedPass/map.json delete mode 100644 data/maps/LavaridgeTown/connections.inc delete mode 100644 data/maps/LavaridgeTown/events.inc delete mode 100644 data/maps/LavaridgeTown/header.inc create mode 100644 data/maps/LavaridgeTown/map.json delete mode 100644 data/maps/LavaridgeTown_Gym_1F/events.inc delete mode 100644 data/maps/LavaridgeTown_Gym_1F/header.inc create mode 100644 data/maps/LavaridgeTown_Gym_1F/map.json delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/events.inc delete mode 100644 data/maps/LavaridgeTown_Gym_B1F/header.inc create mode 100644 data/maps/LavaridgeTown_Gym_B1F/map.json delete mode 100644 data/maps/LavaridgeTown_HerbShop/events.inc delete mode 100644 data/maps/LavaridgeTown_HerbShop/header.inc create mode 100644 data/maps/LavaridgeTown_HerbShop/map.json delete mode 100644 data/maps/LavaridgeTown_House/events.inc delete mode 100644 data/maps/LavaridgeTown_House/header.inc create mode 100644 data/maps/LavaridgeTown_House/map.json delete mode 100644 data/maps/LavaridgeTown_Mart/events.inc delete mode 100644 data/maps/LavaridgeTown_Mart/header.inc create mode 100644 data/maps/LavaridgeTown_Mart/map.json delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/LilycoveCity/connections.inc delete mode 100644 data/maps/LilycoveCity/events.inc delete mode 100644 data/maps/LilycoveCity/header.inc create mode 100644 data/maps/LilycoveCity/map.json delete mode 100644 data/maps/LilycoveCity_ContestHall/events.inc delete mode 100644 data/maps/LilycoveCity_ContestHall/header.inc create mode 100644 data/maps/LilycoveCity_ContestHall/map.json delete mode 100644 data/maps/LilycoveCity_ContestLobby/events.inc delete mode 100644 data/maps/LilycoveCity_ContestLobby/header.inc create mode 100644 data/maps/LilycoveCity_ContestLobby/map.json delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/map.json delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc delete mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/map.json delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/events.inc delete mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/header.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/map.json delete mode 100644 data/maps/LilycoveCity_Harbor/events.inc delete mode 100644 data/maps/LilycoveCity_Harbor/header.inc create mode 100644 data/maps/LilycoveCity_Harbor/map.json delete mode 100644 data/maps/LilycoveCity_House1/events.inc delete mode 100644 data/maps/LilycoveCity_House1/header.inc create mode 100644 data/maps/LilycoveCity_House1/map.json delete mode 100644 data/maps/LilycoveCity_House2/events.inc delete mode 100644 data/maps/LilycoveCity_House2/header.inc create mode 100644 data/maps/LilycoveCity_House2/map.json delete mode 100644 data/maps/LilycoveCity_House3/events.inc delete mode 100644 data/maps/LilycoveCity_House3/header.inc create mode 100644 data/maps/LilycoveCity_House3/map.json delete mode 100644 data/maps/LilycoveCity_House4/events.inc delete mode 100644 data/maps/LilycoveCity_House4/header.inc create mode 100644 data/maps/LilycoveCity_House4/map.json delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/map.json delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc delete mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/map.json delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/events.inc delete mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/header.inc create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/map.json delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc delete mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/map.json delete mode 100644 data/maps/LilycoveCity_UnusedMart/events.inc delete mode 100644 data/maps/LilycoveCity_UnusedMart/header.inc create mode 100644 data/maps/LilycoveCity_UnusedMart/map.json delete mode 100644 data/maps/LinkContestRoom1/events.inc delete mode 100644 data/maps/LinkContestRoom1/header.inc create mode 100644 data/maps/LinkContestRoom1/map.json delete mode 100644 data/maps/LinkContestRoom2/events.inc delete mode 100644 data/maps/LinkContestRoom2/header.inc create mode 100644 data/maps/LinkContestRoom2/map.json delete mode 100644 data/maps/LinkContestRoom3/events.inc delete mode 100644 data/maps/LinkContestRoom3/header.inc create mode 100644 data/maps/LinkContestRoom3/map.json delete mode 100644 data/maps/LinkContestRoom4/events.inc delete mode 100644 data/maps/LinkContestRoom4/header.inc create mode 100644 data/maps/LinkContestRoom4/map.json delete mode 100644 data/maps/LinkContestRoom5/events.inc delete mode 100644 data/maps/LinkContestRoom5/header.inc create mode 100644 data/maps/LinkContestRoom5/map.json delete mode 100644 data/maps/LinkContestRoom6/events.inc delete mode 100644 data/maps/LinkContestRoom6/header.inc create mode 100644 data/maps/LinkContestRoom6/map.json delete mode 100644 data/maps/LittlerootTown/connections.inc delete mode 100644 data/maps/LittlerootTown/events.inc delete mode 100644 data/maps/LittlerootTown/header.inc create mode 100644 data/maps/LittlerootTown/map.json delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/events.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/header.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/map.json delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/events.inc delete mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/header.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/map.json delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/events.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_1F/header.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/map.json delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/events.inc delete mode 100644 data/maps/LittlerootTown_MaysHouse_2F/header.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/map.json delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/events.inc delete mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/header.inc create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/map.json delete mode 100644 data/maps/MagmaHideout_1F/events.inc delete mode 100644 data/maps/MagmaHideout_1F/header.inc create mode 100644 data/maps/MagmaHideout_1F/map.json delete mode 100644 data/maps/MagmaHideout_2F_1R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_1R/header.inc create mode 100644 data/maps/MagmaHideout_2F_1R/map.json delete mode 100644 data/maps/MagmaHideout_2F_2R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_2R/header.inc create mode 100644 data/maps/MagmaHideout_2F_2R/map.json delete mode 100644 data/maps/MagmaHideout_2F_3R/events.inc delete mode 100644 data/maps/MagmaHideout_2F_3R/header.inc create mode 100644 data/maps/MagmaHideout_2F_3R/map.json delete mode 100644 data/maps/MagmaHideout_3F_1R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_1R/header.inc create mode 100644 data/maps/MagmaHideout_3F_1R/map.json delete mode 100644 data/maps/MagmaHideout_3F_2R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_2R/header.inc create mode 100644 data/maps/MagmaHideout_3F_2R/map.json delete mode 100644 data/maps/MagmaHideout_3F_3R/events.inc delete mode 100644 data/maps/MagmaHideout_3F_3R/header.inc create mode 100644 data/maps/MagmaHideout_3F_3R/map.json delete mode 100644 data/maps/MagmaHideout_4F/events.inc delete mode 100644 data/maps/MagmaHideout_4F/header.inc create mode 100644 data/maps/MagmaHideout_4F/map.json delete mode 100644 data/maps/MarineCave_End/events.inc delete mode 100644 data/maps/MarineCave_End/header.inc create mode 100644 data/maps/MarineCave_End/map.json delete mode 100644 data/maps/MarineCave_Entrance/events.inc delete mode 100644 data/maps/MarineCave_Entrance/header.inc create mode 100644 data/maps/MarineCave_Entrance/map.json delete mode 100644 data/maps/MauvilleCity/connections.inc delete mode 100644 data/maps/MauvilleCity/events.inc delete mode 100644 data/maps/MauvilleCity/header.inc create mode 100644 data/maps/MauvilleCity/map.json delete mode 100644 data/maps/MauvilleCity_BikeShop/events.inc delete mode 100644 data/maps/MauvilleCity_BikeShop/header.inc create mode 100644 data/maps/MauvilleCity_BikeShop/map.json delete mode 100644 data/maps/MauvilleCity_GameCorner/events.inc delete mode 100644 data/maps/MauvilleCity_GameCorner/header.inc create mode 100644 data/maps/MauvilleCity_GameCorner/map.json delete mode 100644 data/maps/MauvilleCity_Gym/events.inc delete mode 100644 data/maps/MauvilleCity_Gym/header.inc create mode 100644 data/maps/MauvilleCity_Gym/map.json delete mode 100644 data/maps/MauvilleCity_House1/events.inc delete mode 100644 data/maps/MauvilleCity_House1/header.inc create mode 100644 data/maps/MauvilleCity_House1/map.json delete mode 100644 data/maps/MauvilleCity_House2/events.inc delete mode 100644 data/maps/MauvilleCity_House2/header.inc create mode 100644 data/maps/MauvilleCity_House2/map.json delete mode 100644 data/maps/MauvilleCity_Mart/events.inc delete mode 100644 data/maps/MauvilleCity_Mart/header.inc create mode 100644 data/maps/MauvilleCity_Mart/map.json delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/MeteorFalls_1F_1R/events.inc delete mode 100644 data/maps/MeteorFalls_1F_1R/header.inc create mode 100644 data/maps/MeteorFalls_1F_1R/map.json delete mode 100644 data/maps/MeteorFalls_1F_2R/events.inc delete mode 100644 data/maps/MeteorFalls_1F_2R/header.inc create mode 100644 data/maps/MeteorFalls_1F_2R/map.json delete mode 100644 data/maps/MeteorFalls_B1F_1R/events.inc delete mode 100644 data/maps/MeteorFalls_B1F_1R/header.inc create mode 100644 data/maps/MeteorFalls_B1F_1R/map.json delete mode 100644 data/maps/MeteorFalls_B1F_2R/events.inc delete mode 100644 data/maps/MeteorFalls_B1F_2R/header.inc create mode 100644 data/maps/MeteorFalls_B1F_2R/map.json delete mode 100644 data/maps/MeteorFalls_StevensCave/events.inc delete mode 100644 data/maps/MeteorFalls_StevensCave/header.inc create mode 100644 data/maps/MeteorFalls_StevensCave/map.json delete mode 100644 data/maps/MirageTower_1F/events.inc delete mode 100644 data/maps/MirageTower_1F/header.inc create mode 100644 data/maps/MirageTower_1F/map.json delete mode 100644 data/maps/MirageTower_2F/events.inc delete mode 100644 data/maps/MirageTower_2F/header.inc create mode 100644 data/maps/MirageTower_2F/map.json delete mode 100644 data/maps/MirageTower_3F/events.inc delete mode 100644 data/maps/MirageTower_3F/header.inc create mode 100644 data/maps/MirageTower_3F/map.json delete mode 100644 data/maps/MirageTower_4F/events.inc delete mode 100644 data/maps/MirageTower_4F/header.inc create mode 100644 data/maps/MirageTower_4F/map.json delete mode 100644 data/maps/MossdeepCity/connections.inc delete mode 100644 data/maps/MossdeepCity/events.inc delete mode 100644 data/maps/MossdeepCity/header.inc create mode 100644 data/maps/MossdeepCity/map.json delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/events.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_1F/header.inc create mode 100644 data/maps/MossdeepCity_GameCorner_1F/map.json delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/events.inc delete mode 100644 data/maps/MossdeepCity_GameCorner_B1F/header.inc create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/map.json delete mode 100644 data/maps/MossdeepCity_Gym/events.inc delete mode 100644 data/maps/MossdeepCity_Gym/header.inc create mode 100644 data/maps/MossdeepCity_Gym/map.json delete mode 100644 data/maps/MossdeepCity_House1/events.inc delete mode 100644 data/maps/MossdeepCity_House1/header.inc create mode 100644 data/maps/MossdeepCity_House1/map.json delete mode 100644 data/maps/MossdeepCity_House2/events.inc delete mode 100644 data/maps/MossdeepCity_House2/header.inc create mode 100644 data/maps/MossdeepCity_House2/map.json delete mode 100644 data/maps/MossdeepCity_House3/events.inc delete mode 100644 data/maps/MossdeepCity_House3/header.inc create mode 100644 data/maps/MossdeepCity_House3/map.json delete mode 100644 data/maps/MossdeepCity_House4/events.inc delete mode 100644 data/maps/MossdeepCity_House4/header.inc create mode 100644 data/maps/MossdeepCity_House4/map.json delete mode 100644 data/maps/MossdeepCity_Mart/events.inc delete mode 100644 data/maps/MossdeepCity_Mart/header.inc create mode 100644 data/maps/MossdeepCity_Mart/map.json delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/events.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/header.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/map.json delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/events.inc delete mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/header.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/map.json delete mode 100644 data/maps/MossdeepCity_StevensHouse/events.inc delete mode 100644 data/maps/MossdeepCity_StevensHouse/header.inc create mode 100644 data/maps/MossdeepCity_StevensHouse/map.json delete mode 100644 data/maps/MtChimney/events.inc delete mode 100644 data/maps/MtChimney/header.inc create mode 100644 data/maps/MtChimney/map.json delete mode 100644 data/maps/MtChimney_CableCarStation/events.inc delete mode 100644 data/maps/MtChimney_CableCarStation/header.inc create mode 100644 data/maps/MtChimney_CableCarStation/map.json delete mode 100644 data/maps/MtPyre_1F/events.inc delete mode 100644 data/maps/MtPyre_1F/header.inc create mode 100644 data/maps/MtPyre_1F/map.json delete mode 100644 data/maps/MtPyre_2F/events.inc delete mode 100644 data/maps/MtPyre_2F/header.inc create mode 100644 data/maps/MtPyre_2F/map.json delete mode 100644 data/maps/MtPyre_3F/events.inc delete mode 100644 data/maps/MtPyre_3F/header.inc create mode 100644 data/maps/MtPyre_3F/map.json delete mode 100644 data/maps/MtPyre_4F/events.inc delete mode 100644 data/maps/MtPyre_4F/header.inc create mode 100644 data/maps/MtPyre_4F/map.json delete mode 100644 data/maps/MtPyre_5F/events.inc delete mode 100644 data/maps/MtPyre_5F/header.inc create mode 100644 data/maps/MtPyre_5F/map.json delete mode 100644 data/maps/MtPyre_6F/events.inc delete mode 100644 data/maps/MtPyre_6F/header.inc create mode 100644 data/maps/MtPyre_6F/map.json delete mode 100644 data/maps/MtPyre_Exterior/events.inc delete mode 100644 data/maps/MtPyre_Exterior/header.inc create mode 100644 data/maps/MtPyre_Exterior/map.json delete mode 100644 data/maps/MtPyre_Summit/events.inc delete mode 100644 data/maps/MtPyre_Summit/header.inc create mode 100644 data/maps/MtPyre_Summit/map.json delete mode 100644 data/maps/NavelRock_B1F/events.inc delete mode 100644 data/maps/NavelRock_B1F/header.inc create mode 100644 data/maps/NavelRock_B1F/map.json delete mode 100644 data/maps/NavelRock_Bottom/events.inc delete mode 100644 data/maps/NavelRock_Bottom/header.inc create mode 100644 data/maps/NavelRock_Bottom/map.json delete mode 100644 data/maps/NavelRock_Down01/events.inc delete mode 100644 data/maps/NavelRock_Down01/header.inc create mode 100644 data/maps/NavelRock_Down01/map.json delete mode 100644 data/maps/NavelRock_Down02/events.inc delete mode 100644 data/maps/NavelRock_Down02/header.inc create mode 100644 data/maps/NavelRock_Down02/map.json delete mode 100644 data/maps/NavelRock_Down03/events.inc delete mode 100644 data/maps/NavelRock_Down03/header.inc create mode 100644 data/maps/NavelRock_Down03/map.json delete mode 100644 data/maps/NavelRock_Down04/events.inc delete mode 100644 data/maps/NavelRock_Down04/header.inc create mode 100644 data/maps/NavelRock_Down04/map.json delete mode 100644 data/maps/NavelRock_Down05/events.inc delete mode 100644 data/maps/NavelRock_Down05/header.inc create mode 100644 data/maps/NavelRock_Down05/map.json delete mode 100644 data/maps/NavelRock_Down06/events.inc delete mode 100644 data/maps/NavelRock_Down06/header.inc create mode 100644 data/maps/NavelRock_Down06/map.json delete mode 100644 data/maps/NavelRock_Down07/events.inc delete mode 100644 data/maps/NavelRock_Down07/header.inc create mode 100644 data/maps/NavelRock_Down07/map.json delete mode 100644 data/maps/NavelRock_Down08/events.inc delete mode 100644 data/maps/NavelRock_Down08/header.inc create mode 100644 data/maps/NavelRock_Down08/map.json delete mode 100644 data/maps/NavelRock_Down09/events.inc delete mode 100644 data/maps/NavelRock_Down09/header.inc create mode 100644 data/maps/NavelRock_Down09/map.json delete mode 100644 data/maps/NavelRock_Down10/events.inc delete mode 100644 data/maps/NavelRock_Down10/header.inc create mode 100644 data/maps/NavelRock_Down10/map.json delete mode 100644 data/maps/NavelRock_Down11/events.inc delete mode 100644 data/maps/NavelRock_Down11/header.inc create mode 100644 data/maps/NavelRock_Down11/map.json delete mode 100644 data/maps/NavelRock_Entrance/events.inc delete mode 100644 data/maps/NavelRock_Entrance/header.inc create mode 100644 data/maps/NavelRock_Entrance/map.json delete mode 100644 data/maps/NavelRock_Exterior/events.inc delete mode 100644 data/maps/NavelRock_Exterior/header.inc create mode 100644 data/maps/NavelRock_Exterior/map.json delete mode 100644 data/maps/NavelRock_Fork/events.inc delete mode 100644 data/maps/NavelRock_Fork/header.inc create mode 100644 data/maps/NavelRock_Fork/map.json delete mode 100644 data/maps/NavelRock_Harbor/events.inc delete mode 100644 data/maps/NavelRock_Harbor/header.inc create mode 100644 data/maps/NavelRock_Harbor/map.json delete mode 100644 data/maps/NavelRock_Top/events.inc delete mode 100644 data/maps/NavelRock_Top/header.inc create mode 100644 data/maps/NavelRock_Top/map.json delete mode 100644 data/maps/NavelRock_Up1/events.inc delete mode 100644 data/maps/NavelRock_Up1/header.inc create mode 100644 data/maps/NavelRock_Up1/map.json delete mode 100644 data/maps/NavelRock_Up2/events.inc delete mode 100644 data/maps/NavelRock_Up2/header.inc create mode 100644 data/maps/NavelRock_Up2/map.json delete mode 100644 data/maps/NavelRock_Up3/events.inc delete mode 100644 data/maps/NavelRock_Up3/header.inc create mode 100644 data/maps/NavelRock_Up3/map.json delete mode 100644 data/maps/NavelRock_Up4/events.inc delete mode 100644 data/maps/NavelRock_Up4/header.inc create mode 100644 data/maps/NavelRock_Up4/map.json delete mode 100644 data/maps/NewMauville_Entrance/events.inc delete mode 100644 data/maps/NewMauville_Entrance/header.inc create mode 100644 data/maps/NewMauville_Entrance/map.json delete mode 100644 data/maps/NewMauville_Inside/events.inc delete mode 100644 data/maps/NewMauville_Inside/header.inc create mode 100644 data/maps/NewMauville_Inside/map.json delete mode 100644 data/maps/OldaleTown/connections.inc delete mode 100644 data/maps/OldaleTown/events.inc delete mode 100644 data/maps/OldaleTown/header.inc create mode 100644 data/maps/OldaleTown/map.json delete mode 100644 data/maps/OldaleTown_House1/events.inc delete mode 100644 data/maps/OldaleTown_House1/header.inc create mode 100644 data/maps/OldaleTown_House1/map.json delete mode 100644 data/maps/OldaleTown_House2/events.inc delete mode 100644 data/maps/OldaleTown_House2/header.inc create mode 100644 data/maps/OldaleTown_House2/map.json delete mode 100644 data/maps/OldaleTown_Mart/events.inc delete mode 100644 data/maps/OldaleTown_Mart/header.inc create mode 100644 data/maps/OldaleTown_Mart/map.json delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/OldaleTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/PacifidlogTown/connections.inc delete mode 100644 data/maps/PacifidlogTown/events.inc delete mode 100644 data/maps/PacifidlogTown/header.inc create mode 100644 data/maps/PacifidlogTown/map.json delete mode 100644 data/maps/PacifidlogTown_House1/events.inc delete mode 100644 data/maps/PacifidlogTown_House1/header.inc create mode 100644 data/maps/PacifidlogTown_House1/map.json delete mode 100644 data/maps/PacifidlogTown_House2/events.inc delete mode 100644 data/maps/PacifidlogTown_House2/header.inc create mode 100644 data/maps/PacifidlogTown_House2/map.json delete mode 100644 data/maps/PacifidlogTown_House3/events.inc delete mode 100644 data/maps/PacifidlogTown_House3/header.inc create mode 100644 data/maps/PacifidlogTown_House3/map.json delete mode 100644 data/maps/PacifidlogTown_House4/events.inc delete mode 100644 data/maps/PacifidlogTown_House4/header.inc create mode 100644 data/maps/PacifidlogTown_House4/map.json delete mode 100644 data/maps/PacifidlogTown_House5/events.inc delete mode 100644 data/maps/PacifidlogTown_House5/header.inc create mode 100644 data/maps/PacifidlogTown_House5/map.json delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/PetalburgCity/connections.inc delete mode 100644 data/maps/PetalburgCity/events.inc delete mode 100644 data/maps/PetalburgCity/header.inc create mode 100644 data/maps/PetalburgCity/map.json delete mode 100644 data/maps/PetalburgCity_Gym/events.inc delete mode 100644 data/maps/PetalburgCity_Gym/header.inc create mode 100644 data/maps/PetalburgCity_Gym/map.json delete mode 100644 data/maps/PetalburgCity_House1/events.inc delete mode 100644 data/maps/PetalburgCity_House1/header.inc create mode 100644 data/maps/PetalburgCity_House1/map.json delete mode 100644 data/maps/PetalburgCity_House2/events.inc delete mode 100644 data/maps/PetalburgCity_House2/header.inc create mode 100644 data/maps/PetalburgCity_House2/map.json delete mode 100644 data/maps/PetalburgCity_Mart/events.inc delete mode 100644 data/maps/PetalburgCity_Mart/header.inc create mode 100644 data/maps/PetalburgCity_Mart/map.json delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/PetalburgCity_WallysHouse/events.inc delete mode 100644 data/maps/PetalburgCity_WallysHouse/header.inc create mode 100644 data/maps/PetalburgCity_WallysHouse/map.json delete mode 100644 data/maps/PetalburgWoods/events.inc delete mode 100644 data/maps/PetalburgWoods/header.inc create mode 100644 data/maps/PetalburgWoods/map.json delete mode 100644 data/maps/RecordCorner/events.inc delete mode 100644 data/maps/RecordCorner/header.inc create mode 100644 data/maps/RecordCorner/map.json delete mode 100644 data/maps/Route101/connections.inc delete mode 100644 data/maps/Route101/events.inc delete mode 100644 data/maps/Route101/header.inc create mode 100644 data/maps/Route101/map.json delete mode 100644 data/maps/Route102/connections.inc delete mode 100644 data/maps/Route102/events.inc delete mode 100644 data/maps/Route102/header.inc create mode 100644 data/maps/Route102/map.json delete mode 100644 data/maps/Route103/connections.inc delete mode 100644 data/maps/Route103/events.inc delete mode 100644 data/maps/Route103/header.inc create mode 100644 data/maps/Route103/map.json delete mode 100644 data/maps/Route104/connections.inc delete mode 100644 data/maps/Route104/events.inc delete mode 100644 data/maps/Route104/header.inc create mode 100644 data/maps/Route104/map.json delete mode 100644 data/maps/Route104_MrBrineysHouse/events.inc delete mode 100644 data/maps/Route104_MrBrineysHouse/header.inc create mode 100644 data/maps/Route104_MrBrineysHouse/map.json delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/events.inc delete mode 100644 data/maps/Route104_PrettyPetalFlowerShop/header.inc create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/map.json delete mode 100644 data/maps/Route104_Prototype/events.inc delete mode 100644 data/maps/Route104_Prototype/header.inc create mode 100644 data/maps/Route104_Prototype/map.json delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc delete mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json delete mode 100644 data/maps/Route105/connections.inc delete mode 100644 data/maps/Route105/events.inc delete mode 100644 data/maps/Route105/header.inc create mode 100644 data/maps/Route105/map.json delete mode 100644 data/maps/Route106/connections.inc delete mode 100644 data/maps/Route106/events.inc delete mode 100644 data/maps/Route106/header.inc create mode 100644 data/maps/Route106/map.json delete mode 100644 data/maps/Route107/connections.inc delete mode 100644 data/maps/Route107/events.inc delete mode 100644 data/maps/Route107/header.inc create mode 100644 data/maps/Route107/map.json delete mode 100644 data/maps/Route108/connections.inc delete mode 100644 data/maps/Route108/events.inc delete mode 100644 data/maps/Route108/header.inc create mode 100644 data/maps/Route108/map.json delete mode 100644 data/maps/Route109/connections.inc delete mode 100644 data/maps/Route109/events.inc delete mode 100644 data/maps/Route109/header.inc create mode 100644 data/maps/Route109/map.json delete mode 100644 data/maps/Route109_SeashoreHouse/events.inc delete mode 100644 data/maps/Route109_SeashoreHouse/header.inc create mode 100644 data/maps/Route109_SeashoreHouse/map.json delete mode 100644 data/maps/Route110/connections.inc delete mode 100644 data/maps/Route110/events.inc delete mode 100644 data/maps/Route110/header.inc create mode 100644 data/maps/Route110/map.json delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc delete mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json delete mode 100644 data/maps/Route110_TrickHouseCorridor/events.inc delete mode 100644 data/maps/Route110_TrickHouseCorridor/header.inc create mode 100644 data/maps/Route110_TrickHouseCorridor/map.json delete mode 100644 data/maps/Route110_TrickHouseEnd/events.inc delete mode 100644 data/maps/Route110_TrickHouseEnd/header.inc create mode 100644 data/maps/Route110_TrickHouseEnd/map.json delete mode 100644 data/maps/Route110_TrickHouseEntrance/events.inc delete mode 100644 data/maps/Route110_TrickHouseEntrance/header.inc create mode 100644 data/maps/Route110_TrickHouseEntrance/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle1/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle1/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle1/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle2/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle2/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle2/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle3/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle3/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle3/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle4/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle4/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle4/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle5/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle5/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle5/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle6/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle6/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle6/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle7/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle7/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle7/map.json delete mode 100644 data/maps/Route110_TrickHousePuzzle8/events.inc delete mode 100644 data/maps/Route110_TrickHousePuzzle8/header.inc create mode 100644 data/maps/Route110_TrickHousePuzzle8/map.json delete mode 100644 data/maps/Route111/connections.inc delete mode 100644 data/maps/Route111/events.inc delete mode 100644 data/maps/Route111/header.inc create mode 100644 data/maps/Route111/map.json delete mode 100644 data/maps/Route111_OldLadysRestStop/events.inc delete mode 100644 data/maps/Route111_OldLadysRestStop/header.inc create mode 100644 data/maps/Route111_OldLadysRestStop/map.json delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/events.inc delete mode 100644 data/maps/Route111_WinstrateFamilysHouse/header.inc create mode 100644 data/maps/Route111_WinstrateFamilysHouse/map.json delete mode 100644 data/maps/Route112/connections.inc delete mode 100644 data/maps/Route112/events.inc delete mode 100644 data/maps/Route112/header.inc create mode 100644 data/maps/Route112/map.json delete mode 100644 data/maps/Route112_CableCarStation/events.inc delete mode 100644 data/maps/Route112_CableCarStation/header.inc create mode 100644 data/maps/Route112_CableCarStation/map.json delete mode 100644 data/maps/Route113/connections.inc delete mode 100644 data/maps/Route113/events.inc delete mode 100644 data/maps/Route113/header.inc create mode 100644 data/maps/Route113/map.json delete mode 100644 data/maps/Route113_GlassWorkshop/events.inc delete mode 100644 data/maps/Route113_GlassWorkshop/header.inc create mode 100644 data/maps/Route113_GlassWorkshop/map.json delete mode 100644 data/maps/Route114/connections.inc delete mode 100644 data/maps/Route114/events.inc delete mode 100644 data/maps/Route114/header.inc create mode 100644 data/maps/Route114/map.json delete mode 100644 data/maps/Route114_FossilManiacsHouse/events.inc delete mode 100644 data/maps/Route114_FossilManiacsHouse/header.inc create mode 100644 data/maps/Route114_FossilManiacsHouse/map.json delete mode 100644 data/maps/Route114_FossilManiacsTunnel/events.inc delete mode 100644 data/maps/Route114_FossilManiacsTunnel/header.inc create mode 100644 data/maps/Route114_FossilManiacsTunnel/map.json delete mode 100644 data/maps/Route114_LanettesHouse/events.inc delete mode 100644 data/maps/Route114_LanettesHouse/header.inc create mode 100644 data/maps/Route114_LanettesHouse/map.json delete mode 100644 data/maps/Route115/connections.inc delete mode 100644 data/maps/Route115/events.inc delete mode 100644 data/maps/Route115/header.inc create mode 100644 data/maps/Route115/map.json delete mode 100644 data/maps/Route116/connections.inc delete mode 100644 data/maps/Route116/events.inc delete mode 100644 data/maps/Route116/header.inc create mode 100644 data/maps/Route116/map.json delete mode 100644 data/maps/Route116_TunnelersRestHouse/events.inc delete mode 100644 data/maps/Route116_TunnelersRestHouse/header.inc create mode 100644 data/maps/Route116_TunnelersRestHouse/map.json delete mode 100644 data/maps/Route117/connections.inc delete mode 100644 data/maps/Route117/events.inc delete mode 100644 data/maps/Route117/header.inc create mode 100644 data/maps/Route117/map.json delete mode 100644 data/maps/Route117_PokemonDayCare/events.inc delete mode 100644 data/maps/Route117_PokemonDayCare/header.inc create mode 100644 data/maps/Route117_PokemonDayCare/map.json delete mode 100644 data/maps/Route118/connections.inc delete mode 100644 data/maps/Route118/events.inc delete mode 100644 data/maps/Route118/header.inc create mode 100644 data/maps/Route118/map.json delete mode 100644 data/maps/Route119/connections.inc delete mode 100644 data/maps/Route119/events.inc delete mode 100644 data/maps/Route119/header.inc create mode 100644 data/maps/Route119/map.json delete mode 100644 data/maps/Route119_House/events.inc delete mode 100644 data/maps/Route119_House/header.inc create mode 100644 data/maps/Route119_House/map.json delete mode 100644 data/maps/Route119_WeatherInstitute_1F/events.inc delete mode 100644 data/maps/Route119_WeatherInstitute_1F/header.inc create mode 100644 data/maps/Route119_WeatherInstitute_1F/map.json delete mode 100644 data/maps/Route119_WeatherInstitute_2F/events.inc delete mode 100644 data/maps/Route119_WeatherInstitute_2F/header.inc create mode 100644 data/maps/Route119_WeatherInstitute_2F/map.json delete mode 100644 data/maps/Route120/connections.inc delete mode 100644 data/maps/Route120/events.inc delete mode 100644 data/maps/Route120/header.inc create mode 100644 data/maps/Route120/map.json delete mode 100644 data/maps/Route121/connections.inc delete mode 100644 data/maps/Route121/events.inc delete mode 100644 data/maps/Route121/header.inc create mode 100644 data/maps/Route121/map.json delete mode 100644 data/maps/Route121_SafariZoneEntrance/events.inc delete mode 100644 data/maps/Route121_SafariZoneEntrance/header.inc create mode 100644 data/maps/Route121_SafariZoneEntrance/map.json delete mode 100644 data/maps/Route122/connections.inc delete mode 100644 data/maps/Route122/events.inc delete mode 100644 data/maps/Route122/header.inc create mode 100644 data/maps/Route122/map.json delete mode 100644 data/maps/Route123/connections.inc delete mode 100644 data/maps/Route123/events.inc delete mode 100644 data/maps/Route123/header.inc create mode 100644 data/maps/Route123/map.json delete mode 100644 data/maps/Route123_BerryMastersHouse/events.inc delete mode 100644 data/maps/Route123_BerryMastersHouse/header.inc create mode 100644 data/maps/Route123_BerryMastersHouse/map.json delete mode 100644 data/maps/Route124/connections.inc delete mode 100644 data/maps/Route124/events.inc delete mode 100644 data/maps/Route124/header.inc create mode 100644 data/maps/Route124/map.json delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/events.inc delete mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/header.inc create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/map.json delete mode 100644 data/maps/Route125/connections.inc delete mode 100644 data/maps/Route125/events.inc delete mode 100644 data/maps/Route125/header.inc create mode 100644 data/maps/Route125/map.json delete mode 100644 data/maps/Route126/connections.inc delete mode 100644 data/maps/Route126/events.inc delete mode 100644 data/maps/Route126/header.inc create mode 100644 data/maps/Route126/map.json delete mode 100644 data/maps/Route127/connections.inc delete mode 100644 data/maps/Route127/events.inc delete mode 100644 data/maps/Route127/header.inc create mode 100644 data/maps/Route127/map.json delete mode 100644 data/maps/Route128/connections.inc delete mode 100644 data/maps/Route128/events.inc delete mode 100644 data/maps/Route128/header.inc create mode 100644 data/maps/Route128/map.json delete mode 100644 data/maps/Route129/connections.inc delete mode 100644 data/maps/Route129/events.inc delete mode 100644 data/maps/Route129/header.inc create mode 100644 data/maps/Route129/map.json delete mode 100644 data/maps/Route130/connections.inc delete mode 100644 data/maps/Route130/events.inc delete mode 100644 data/maps/Route130/header.inc create mode 100644 data/maps/Route130/map.json delete mode 100644 data/maps/Route131/connections.inc delete mode 100644 data/maps/Route131/events.inc delete mode 100644 data/maps/Route131/header.inc create mode 100644 data/maps/Route131/map.json delete mode 100644 data/maps/Route132/connections.inc delete mode 100644 data/maps/Route132/events.inc delete mode 100644 data/maps/Route132/header.inc create mode 100644 data/maps/Route132/map.json delete mode 100644 data/maps/Route133/connections.inc delete mode 100644 data/maps/Route133/events.inc delete mode 100644 data/maps/Route133/header.inc create mode 100644 data/maps/Route133/map.json delete mode 100644 data/maps/Route134/connections.inc delete mode 100644 data/maps/Route134/events.inc delete mode 100644 data/maps/Route134/header.inc create mode 100644 data/maps/Route134/map.json delete mode 100644 data/maps/RustboroCity/connections.inc delete mode 100644 data/maps/RustboroCity/events.inc delete mode 100644 data/maps/RustboroCity/header.inc create mode 100644 data/maps/RustboroCity/map.json delete mode 100644 data/maps/RustboroCity_CuttersHouse/events.inc delete mode 100644 data/maps/RustboroCity_CuttersHouse/header.inc create mode 100644 data/maps/RustboroCity_CuttersHouse/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_1F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_1F/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_2F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_2F/map.json delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/events.inc delete mode 100644 data/maps/RustboroCity_DevonCorp_3F/header.inc create mode 100644 data/maps/RustboroCity_DevonCorp_3F/map.json delete mode 100644 data/maps/RustboroCity_Flat1_1F/events.inc delete mode 100644 data/maps/RustboroCity_Flat1_1F/header.inc create mode 100644 data/maps/RustboroCity_Flat1_1F/map.json delete mode 100644 data/maps/RustboroCity_Flat1_2F/events.inc delete mode 100644 data/maps/RustboroCity_Flat1_2F/header.inc create mode 100644 data/maps/RustboroCity_Flat1_2F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_1F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_1F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_1F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_2F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_2F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_2F/map.json delete mode 100644 data/maps/RustboroCity_Flat2_3F/events.inc delete mode 100644 data/maps/RustboroCity_Flat2_3F/header.inc create mode 100644 data/maps/RustboroCity_Flat2_3F/map.json delete mode 100644 data/maps/RustboroCity_Gym/events.inc delete mode 100644 data/maps/RustboroCity_Gym/header.inc create mode 100644 data/maps/RustboroCity_Gym/map.json delete mode 100644 data/maps/RustboroCity_House1/events.inc delete mode 100644 data/maps/RustboroCity_House1/header.inc create mode 100644 data/maps/RustboroCity_House1/map.json delete mode 100644 data/maps/RustboroCity_House2/events.inc delete mode 100644 data/maps/RustboroCity_House2/header.inc create mode 100644 data/maps/RustboroCity_House2/map.json delete mode 100644 data/maps/RustboroCity_House3/events.inc delete mode 100644 data/maps/RustboroCity_House3/header.inc create mode 100644 data/maps/RustboroCity_House3/map.json delete mode 100644 data/maps/RustboroCity_Mart/events.inc delete mode 100644 data/maps/RustboroCity_Mart/header.inc create mode 100644 data/maps/RustboroCity_Mart/map.json delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/RustboroCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/RustboroCity_PokemonSchool/events.inc delete mode 100644 data/maps/RustboroCity_PokemonSchool/header.inc create mode 100644 data/maps/RustboroCity_PokemonSchool/map.json delete mode 100644 data/maps/RusturfTunnel/events.inc delete mode 100644 data/maps/RusturfTunnel/header.inc create mode 100644 data/maps/RusturfTunnel/map.json delete mode 100644 data/maps/SSTidalCorridor/events.inc delete mode 100644 data/maps/SSTidalCorridor/header.inc create mode 100644 data/maps/SSTidalCorridor/map.json delete mode 100644 data/maps/SSTidalLowerDeck/events.inc delete mode 100644 data/maps/SSTidalLowerDeck/header.inc create mode 100644 data/maps/SSTidalLowerDeck/map.json delete mode 100644 data/maps/SSTidalRooms/events.inc delete mode 100644 data/maps/SSTidalRooms/header.inc create mode 100644 data/maps/SSTidalRooms/map.json delete mode 100644 data/maps/SafariZone_North/connections.inc delete mode 100644 data/maps/SafariZone_North/events.inc delete mode 100644 data/maps/SafariZone_North/header.inc create mode 100644 data/maps/SafariZone_North/map.json delete mode 100644 data/maps/SafariZone_Northeast/connections.inc delete mode 100644 data/maps/SafariZone_Northeast/events.inc delete mode 100644 data/maps/SafariZone_Northeast/header.inc create mode 100644 data/maps/SafariZone_Northeast/map.json delete mode 100644 data/maps/SafariZone_Northwest/connections.inc delete mode 100644 data/maps/SafariZone_Northwest/events.inc delete mode 100644 data/maps/SafariZone_Northwest/header.inc create mode 100644 data/maps/SafariZone_Northwest/map.json delete mode 100644 data/maps/SafariZone_RestHouse/events.inc delete mode 100644 data/maps/SafariZone_RestHouse/header.inc create mode 100644 data/maps/SafariZone_RestHouse/map.json delete mode 100644 data/maps/SafariZone_South/connections.inc delete mode 100644 data/maps/SafariZone_South/events.inc delete mode 100644 data/maps/SafariZone_South/header.inc create mode 100644 data/maps/SafariZone_South/map.json delete mode 100644 data/maps/SafariZone_Southeast/connections.inc delete mode 100644 data/maps/SafariZone_Southeast/events.inc delete mode 100644 data/maps/SafariZone_Southeast/header.inc create mode 100644 data/maps/SafariZone_Southeast/map.json delete mode 100644 data/maps/SafariZone_Southwest/connections.inc delete mode 100644 data/maps/SafariZone_Southwest/events.inc delete mode 100644 data/maps/SafariZone_Southwest/header.inc create mode 100644 data/maps/SafariZone_Southwest/map.json delete mode 100644 data/maps/ScorchedSlab/events.inc delete mode 100644 data/maps/ScorchedSlab/header.inc create mode 100644 data/maps/ScorchedSlab/map.json delete mode 100644 data/maps/SeafloorCavern_Entrance/events.inc delete mode 100644 data/maps/SeafloorCavern_Entrance/header.inc create mode 100644 data/maps/SeafloorCavern_Entrance/map.json delete mode 100644 data/maps/SeafloorCavern_Room1/events.inc delete mode 100644 data/maps/SeafloorCavern_Room1/header.inc create mode 100644 data/maps/SeafloorCavern_Room1/map.json delete mode 100644 data/maps/SeafloorCavern_Room2/events.inc delete mode 100644 data/maps/SeafloorCavern_Room2/header.inc create mode 100644 data/maps/SeafloorCavern_Room2/map.json delete mode 100644 data/maps/SeafloorCavern_Room3/events.inc delete mode 100644 data/maps/SeafloorCavern_Room3/header.inc create mode 100644 data/maps/SeafloorCavern_Room3/map.json delete mode 100644 data/maps/SeafloorCavern_Room4/events.inc delete mode 100644 data/maps/SeafloorCavern_Room4/header.inc create mode 100644 data/maps/SeafloorCavern_Room4/map.json delete mode 100644 data/maps/SeafloorCavern_Room5/events.inc delete mode 100644 data/maps/SeafloorCavern_Room5/header.inc create mode 100644 data/maps/SeafloorCavern_Room5/map.json delete mode 100644 data/maps/SeafloorCavern_Room6/events.inc delete mode 100644 data/maps/SeafloorCavern_Room6/header.inc create mode 100644 data/maps/SeafloorCavern_Room6/map.json delete mode 100644 data/maps/SeafloorCavern_Room7/events.inc delete mode 100644 data/maps/SeafloorCavern_Room7/header.inc create mode 100644 data/maps/SeafloorCavern_Room7/map.json delete mode 100644 data/maps/SeafloorCavern_Room8/events.inc delete mode 100644 data/maps/SeafloorCavern_Room8/header.inc create mode 100644 data/maps/SeafloorCavern_Room8/map.json delete mode 100644 data/maps/SeafloorCavern_Room9/events.inc delete mode 100644 data/maps/SeafloorCavern_Room9/header.inc create mode 100644 data/maps/SeafloorCavern_Room9/map.json delete mode 100644 data/maps/SealedChamber_InnerRoom/events.inc delete mode 100644 data/maps/SealedChamber_InnerRoom/header.inc create mode 100644 data/maps/SealedChamber_InnerRoom/map.json delete mode 100644 data/maps/SealedChamber_OuterRoom/events.inc delete mode 100644 data/maps/SealedChamber_OuterRoom/header.inc create mode 100644 data/maps/SealedChamber_OuterRoom/map.json delete mode 100644 data/maps/SecretBase_BlueCave1/events.inc delete mode 100644 data/maps/SecretBase_BlueCave1/header.inc create mode 100644 data/maps/SecretBase_BlueCave1/map.json delete mode 100644 data/maps/SecretBase_BlueCave2/events.inc delete mode 100644 data/maps/SecretBase_BlueCave2/header.inc create mode 100644 data/maps/SecretBase_BlueCave2/map.json delete mode 100644 data/maps/SecretBase_BlueCave3/events.inc delete mode 100644 data/maps/SecretBase_BlueCave3/header.inc create mode 100644 data/maps/SecretBase_BlueCave3/map.json delete mode 100644 data/maps/SecretBase_BlueCave4/events.inc delete mode 100644 data/maps/SecretBase_BlueCave4/header.inc create mode 100644 data/maps/SecretBase_BlueCave4/map.json delete mode 100644 data/maps/SecretBase_BrownCave1/events.inc delete mode 100644 data/maps/SecretBase_BrownCave1/header.inc create mode 100644 data/maps/SecretBase_BrownCave1/map.json delete mode 100644 data/maps/SecretBase_BrownCave2/events.inc delete mode 100644 data/maps/SecretBase_BrownCave2/header.inc create mode 100644 data/maps/SecretBase_BrownCave2/map.json delete mode 100644 data/maps/SecretBase_BrownCave3/events.inc delete mode 100644 data/maps/SecretBase_BrownCave3/header.inc create mode 100644 data/maps/SecretBase_BrownCave3/map.json delete mode 100644 data/maps/SecretBase_BrownCave4/events.inc delete mode 100644 data/maps/SecretBase_BrownCave4/header.inc create mode 100644 data/maps/SecretBase_BrownCave4/map.json delete mode 100644 data/maps/SecretBase_RedCave1/events.inc delete mode 100644 data/maps/SecretBase_RedCave1/header.inc create mode 100644 data/maps/SecretBase_RedCave1/map.json delete mode 100644 data/maps/SecretBase_RedCave2/events.inc delete mode 100644 data/maps/SecretBase_RedCave2/header.inc create mode 100644 data/maps/SecretBase_RedCave2/map.json delete mode 100644 data/maps/SecretBase_RedCave3/events.inc delete mode 100644 data/maps/SecretBase_RedCave3/header.inc create mode 100644 data/maps/SecretBase_RedCave3/map.json delete mode 100644 data/maps/SecretBase_RedCave4/events.inc delete mode 100644 data/maps/SecretBase_RedCave4/header.inc create mode 100644 data/maps/SecretBase_RedCave4/map.json delete mode 100644 data/maps/SecretBase_Shrub1/events.inc delete mode 100644 data/maps/SecretBase_Shrub1/header.inc create mode 100644 data/maps/SecretBase_Shrub1/map.json delete mode 100644 data/maps/SecretBase_Shrub2/events.inc delete mode 100644 data/maps/SecretBase_Shrub2/header.inc create mode 100644 data/maps/SecretBase_Shrub2/map.json delete mode 100644 data/maps/SecretBase_Shrub3/events.inc delete mode 100644 data/maps/SecretBase_Shrub3/header.inc create mode 100644 data/maps/SecretBase_Shrub3/map.json delete mode 100644 data/maps/SecretBase_Shrub4/events.inc delete mode 100644 data/maps/SecretBase_Shrub4/header.inc create mode 100644 data/maps/SecretBase_Shrub4/map.json delete mode 100644 data/maps/SecretBase_Tree1/events.inc delete mode 100644 data/maps/SecretBase_Tree1/header.inc create mode 100644 data/maps/SecretBase_Tree1/map.json delete mode 100644 data/maps/SecretBase_Tree2/events.inc delete mode 100644 data/maps/SecretBase_Tree2/header.inc create mode 100644 data/maps/SecretBase_Tree2/map.json delete mode 100644 data/maps/SecretBase_Tree3/events.inc delete mode 100644 data/maps/SecretBase_Tree3/header.inc create mode 100644 data/maps/SecretBase_Tree3/map.json delete mode 100644 data/maps/SecretBase_Tree4/events.inc delete mode 100644 data/maps/SecretBase_Tree4/header.inc create mode 100644 data/maps/SecretBase_Tree4/map.json delete mode 100644 data/maps/SecretBase_YellowCave1/events.inc delete mode 100644 data/maps/SecretBase_YellowCave1/header.inc create mode 100644 data/maps/SecretBase_YellowCave1/map.json delete mode 100644 data/maps/SecretBase_YellowCave2/events.inc delete mode 100644 data/maps/SecretBase_YellowCave2/header.inc create mode 100644 data/maps/SecretBase_YellowCave2/map.json delete mode 100644 data/maps/SecretBase_YellowCave3/events.inc delete mode 100644 data/maps/SecretBase_YellowCave3/header.inc create mode 100644 data/maps/SecretBase_YellowCave3/map.json delete mode 100644 data/maps/SecretBase_YellowCave4/events.inc delete mode 100644 data/maps/SecretBase_YellowCave4/header.inc create mode 100644 data/maps/SecretBase_YellowCave4/map.json delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/events.inc delete mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/header.inc create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/map.json delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/events.inc delete mode 100644 data/maps/ShoalCave_HighTideInnerRoom/header.inc create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideIceRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideIceRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideInnerRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideLowerRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/map.json delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/events.inc delete mode 100644 data/maps/ShoalCave_LowTideStairsRoom/header.inc create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/map.json delete mode 100644 data/maps/SingleBattleColosseum/events.inc delete mode 100644 data/maps/SingleBattleColosseum/header.inc create mode 100644 data/maps/SingleBattleColosseum/map.json delete mode 100644 data/maps/SkyPillar_1F/events.inc delete mode 100644 data/maps/SkyPillar_1F/header.inc create mode 100644 data/maps/SkyPillar_1F/map.json delete mode 100644 data/maps/SkyPillar_2F/events.inc delete mode 100644 data/maps/SkyPillar_2F/header.inc create mode 100644 data/maps/SkyPillar_2F/map.json delete mode 100644 data/maps/SkyPillar_3F/events.inc delete mode 100644 data/maps/SkyPillar_3F/header.inc create mode 100644 data/maps/SkyPillar_3F/map.json delete mode 100644 data/maps/SkyPillar_4F/events.inc delete mode 100644 data/maps/SkyPillar_4F/header.inc create mode 100644 data/maps/SkyPillar_4F/map.json delete mode 100644 data/maps/SkyPillar_5F/events.inc delete mode 100644 data/maps/SkyPillar_5F/header.inc create mode 100644 data/maps/SkyPillar_5F/map.json delete mode 100644 data/maps/SkyPillar_Entrance/events.inc delete mode 100644 data/maps/SkyPillar_Entrance/header.inc create mode 100644 data/maps/SkyPillar_Entrance/map.json delete mode 100644 data/maps/SkyPillar_Outside/events.inc delete mode 100644 data/maps/SkyPillar_Outside/header.inc create mode 100644 data/maps/SkyPillar_Outside/map.json delete mode 100644 data/maps/SkyPillar_Top/events.inc delete mode 100644 data/maps/SkyPillar_Top/header.inc create mode 100644 data/maps/SkyPillar_Top/map.json delete mode 100644 data/maps/SlateportCity/connections.inc delete mode 100644 data/maps/SlateportCity/events.inc delete mode 100644 data/maps/SlateportCity/header.inc create mode 100644 data/maps/SlateportCity/map.json delete mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/header.inc create mode 100644 data/maps/SlateportCity_BattleTentBattleRoom/map.json delete mode 100644 data/maps/SlateportCity_BattleTentCorridor/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentCorridor/header.inc create mode 100644 data/maps/SlateportCity_BattleTentCorridor/map.json delete mode 100644 data/maps/SlateportCity_BattleTentLobby/events.inc delete mode 100644 data/maps/SlateportCity_BattleTentLobby/header.inc create mode 100644 data/maps/SlateportCity_BattleTentLobby/map.json delete mode 100644 data/maps/SlateportCity_Harbor/events.inc delete mode 100644 data/maps/SlateportCity_Harbor/header.inc create mode 100644 data/maps/SlateportCity_Harbor/map.json delete mode 100644 data/maps/SlateportCity_House1/events.inc delete mode 100644 data/maps/SlateportCity_House1/header.inc create mode 100644 data/maps/SlateportCity_House1/map.json delete mode 100644 data/maps/SlateportCity_House2/events.inc delete mode 100644 data/maps/SlateportCity_House2/header.inc create mode 100644 data/maps/SlateportCity_House2/map.json delete mode 100644 data/maps/SlateportCity_Mart/events.inc delete mode 100644 data/maps/SlateportCity_Mart/header.inc create mode 100644 data/maps/SlateportCity_Mart/map.json delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/events.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/header.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/map.json delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/events.inc delete mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/header.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/map.json delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SlateportCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SlateportCity_PokemonFanClub/events.inc delete mode 100644 data/maps/SlateportCity_PokemonFanClub/header.inc create mode 100644 data/maps/SlateportCity_PokemonFanClub/map.json delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/events.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_1F/header.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/map.json delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/events.inc delete mode 100644 data/maps/SlateportCity_SternsShipyard_2F/header.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/map.json delete mode 100644 data/maps/SootopolisCity/connections.inc delete mode 100644 data/maps/SootopolisCity/events.inc delete mode 100644 data/maps/SootopolisCity/header.inc create mode 100644 data/maps/SootopolisCity/map.json delete mode 100644 data/maps/SootopolisCity_Gym_1F/events.inc delete mode 100644 data/maps/SootopolisCity_Gym_1F/header.inc create mode 100644 data/maps/SootopolisCity_Gym_1F/map.json delete mode 100644 data/maps/SootopolisCity_Gym_B1F/events.inc delete mode 100644 data/maps/SootopolisCity_Gym_B1F/header.inc create mode 100644 data/maps/SootopolisCity_Gym_B1F/map.json delete mode 100644 data/maps/SootopolisCity_House1/events.inc delete mode 100644 data/maps/SootopolisCity_House1/header.inc create mode 100644 data/maps/SootopolisCity_House1/map.json delete mode 100644 data/maps/SootopolisCity_House2/events.inc delete mode 100644 data/maps/SootopolisCity_House2/header.inc create mode 100644 data/maps/SootopolisCity_House2/map.json delete mode 100644 data/maps/SootopolisCity_House3/events.inc delete mode 100644 data/maps/SootopolisCity_House3/header.inc create mode 100644 data/maps/SootopolisCity_House3/map.json delete mode 100644 data/maps/SootopolisCity_House4/events.inc delete mode 100644 data/maps/SootopolisCity_House4/header.inc create mode 100644 data/maps/SootopolisCity_House4/map.json delete mode 100644 data/maps/SootopolisCity_House5/events.inc delete mode 100644 data/maps/SootopolisCity_House5/header.inc create mode 100644 data/maps/SootopolisCity_House5/map.json delete mode 100644 data/maps/SootopolisCity_House6/events.inc delete mode 100644 data/maps/SootopolisCity_House6/header.inc create mode 100644 data/maps/SootopolisCity_House6/map.json delete mode 100644 data/maps/SootopolisCity_House7/events.inc delete mode 100644 data/maps/SootopolisCity_House7/header.inc create mode 100644 data/maps/SootopolisCity_House7/map.json delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc delete mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc create mode 100644 data/maps/SootopolisCity_LotadAndSeedotHouse/map.json delete mode 100644 data/maps/SootopolisCity_Mart/events.inc delete mode 100644 data/maps/SootopolisCity_Mart/header.inc create mode 100644 data/maps/SootopolisCity_Mart/map.json delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc delete mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc create mode 100644 data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/events.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/header.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/map.json delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/events.inc delete mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/header.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/map.json delete mode 100644 data/maps/SouthernIsland_Exterior/events.inc delete mode 100644 data/maps/SouthernIsland_Exterior/header.inc create mode 100644 data/maps/SouthernIsland_Exterior/map.json delete mode 100644 data/maps/SouthernIsland_Interior/events.inc delete mode 100644 data/maps/SouthernIsland_Interior/header.inc create mode 100644 data/maps/SouthernIsland_Interior/map.json delete mode 100644 data/maps/TerraCave_End/events.inc delete mode 100644 data/maps/TerraCave_End/header.inc create mode 100644 data/maps/TerraCave_End/map.json delete mode 100644 data/maps/TerraCave_Entrance/events.inc delete mode 100644 data/maps/TerraCave_Entrance/header.inc create mode 100644 data/maps/TerraCave_Entrance/map.json delete mode 100644 data/maps/TradeCenter/events.inc delete mode 100644 data/maps/TradeCenter/header.inc create mode 100644 data/maps/TradeCenter/map.json delete mode 100644 data/maps/TrainerHill_1F/events.inc delete mode 100644 data/maps/TrainerHill_1F/header.inc create mode 100644 data/maps/TrainerHill_1F/map.json delete mode 100644 data/maps/TrainerHill_2F/events.inc delete mode 100644 data/maps/TrainerHill_2F/header.inc create mode 100644 data/maps/TrainerHill_2F/map.json delete mode 100644 data/maps/TrainerHill_3F/events.inc delete mode 100644 data/maps/TrainerHill_3F/header.inc create mode 100644 data/maps/TrainerHill_3F/map.json delete mode 100644 data/maps/TrainerHill_4F/events.inc delete mode 100644 data/maps/TrainerHill_4F/header.inc create mode 100644 data/maps/TrainerHill_4F/map.json delete mode 100644 data/maps/TrainerHill_Elevator/events.inc delete mode 100644 data/maps/TrainerHill_Elevator/header.inc create mode 100644 data/maps/TrainerHill_Elevator/map.json delete mode 100644 data/maps/TrainerHill_Entrance/events.inc delete mode 100644 data/maps/TrainerHill_Entrance/header.inc create mode 100644 data/maps/TrainerHill_Entrance/map.json delete mode 100644 data/maps/TrainerHill_Roof/events.inc delete mode 100644 data/maps/TrainerHill_Roof/header.inc create mode 100644 data/maps/TrainerHill_Roof/map.json delete mode 100644 data/maps/Underwater1/connections.inc delete mode 100644 data/maps/Underwater1/events.inc delete mode 100644 data/maps/Underwater1/header.inc create mode 100644 data/maps/Underwater1/map.json delete mode 100644 data/maps/Underwater2/connections.inc delete mode 100644 data/maps/Underwater2/events.inc delete mode 100644 data/maps/Underwater2/header.inc create mode 100644 data/maps/Underwater2/map.json delete mode 100644 data/maps/Underwater3/connections.inc delete mode 100644 data/maps/Underwater3/events.inc delete mode 100644 data/maps/Underwater3/header.inc create mode 100644 data/maps/Underwater3/map.json delete mode 100644 data/maps/Underwater4/connections.inc delete mode 100644 data/maps/Underwater4/events.inc delete mode 100644 data/maps/Underwater4/header.inc create mode 100644 data/maps/Underwater4/map.json delete mode 100644 data/maps/Underwater5/connections.inc delete mode 100644 data/maps/Underwater5/events.inc delete mode 100644 data/maps/Underwater5/header.inc create mode 100644 data/maps/Underwater5/map.json delete mode 100644 data/maps/Underwater6/connections.inc delete mode 100644 data/maps/Underwater6/events.inc delete mode 100644 data/maps/Underwater6/header.inc create mode 100644 data/maps/Underwater6/map.json delete mode 100644 data/maps/Underwater7/connections.inc delete mode 100644 data/maps/Underwater7/events.inc delete mode 100644 data/maps/Underwater7/header.inc create mode 100644 data/maps/Underwater7/map.json delete mode 100644 data/maps/Underwater_MarineCave/events.inc delete mode 100644 data/maps/Underwater_MarineCave/header.inc create mode 100644 data/maps/Underwater_MarineCave/map.json delete mode 100644 data/maps/Underwater_Route134/events.inc delete mode 100644 data/maps/Underwater_Route134/header.inc create mode 100644 data/maps/Underwater_Route134/map.json delete mode 100644 data/maps/Underwater_SeafloorCavern/events.inc delete mode 100644 data/maps/Underwater_SeafloorCavern/header.inc create mode 100644 data/maps/Underwater_SeafloorCavern/map.json delete mode 100644 data/maps/Underwater_SealedChamber/events.inc delete mode 100644 data/maps/Underwater_SealedChamber/header.inc create mode 100644 data/maps/Underwater_SealedChamber/map.json delete mode 100644 data/maps/Underwater_SootopolisCity/events.inc delete mode 100644 data/maps/Underwater_SootopolisCity/header.inc create mode 100644 data/maps/Underwater_SootopolisCity/map.json delete mode 100644 data/maps/UnionRoom/events.inc delete mode 100644 data/maps/UnionRoom/header.inc create mode 100644 data/maps/UnionRoom/map.json delete mode 100644 data/maps/UnknownMap_25_29/events.inc delete mode 100644 data/maps/UnknownMap_25_29/header.inc create mode 100644 data/maps/UnknownMap_25_29/map.json delete mode 100644 data/maps/UnknownMap_25_30/events.inc delete mode 100644 data/maps/UnknownMap_25_30/header.inc create mode 100644 data/maps/UnknownMap_25_30/map.json delete mode 100644 data/maps/UnknownMap_25_31/events.inc delete mode 100644 data/maps/UnknownMap_25_31/header.inc create mode 100644 data/maps/UnknownMap_25_31/map.json delete mode 100644 data/maps/UnknownMap_25_32/events.inc delete mode 100644 data/maps/UnknownMap_25_32/header.inc create mode 100644 data/maps/UnknownMap_25_32/map.json delete mode 100644 data/maps/UnknownMap_25_33/events.inc delete mode 100644 data/maps/UnknownMap_25_33/header.inc create mode 100644 data/maps/UnknownMap_25_33/map.json delete mode 100644 data/maps/UnknownMap_25_34/events.inc delete mode 100644 data/maps/UnknownMap_25_34/header.inc create mode 100644 data/maps/UnknownMap_25_34/map.json delete mode 100644 data/maps/VerdanturfTown/connections.inc delete mode 100644 data/maps/VerdanturfTown/events.inc delete mode 100644 data/maps/VerdanturfTown/header.inc create mode 100644 data/maps/VerdanturfTown/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentBattleRoom/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentCorridor/map.json delete mode 100644 data/maps/VerdanturfTown_BattleTentLobby/events.inc delete mode 100644 data/maps/VerdanturfTown_BattleTentLobby/header.inc create mode 100644 data/maps/VerdanturfTown_BattleTentLobby/map.json delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc delete mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/map.json delete mode 100644 data/maps/VerdanturfTown_House/events.inc delete mode 100644 data/maps/VerdanturfTown_House/header.inc create mode 100644 data/maps/VerdanturfTown_House/map.json delete mode 100644 data/maps/VerdanturfTown_Mart/events.inc delete mode 100644 data/maps/VerdanturfTown_Mart/header.inc create mode 100644 data/maps/VerdanturfTown_Mart/map.json delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/events.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/header.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/map.json delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/events.inc delete mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/header.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/map.json delete mode 100644 data/maps/VerdanturfTown_WandasHouse/events.inc delete mode 100644 data/maps/VerdanturfTown_WandasHouse/header.inc create mode 100644 data/maps/VerdanturfTown_WandasHouse/map.json delete mode 100644 data/maps/VictoryRoad_1F/events.inc delete mode 100644 data/maps/VictoryRoad_1F/header.inc create mode 100644 data/maps/VictoryRoad_1F/map.json delete mode 100644 data/maps/VictoryRoad_B1F/events.inc delete mode 100644 data/maps/VictoryRoad_B1F/header.inc create mode 100644 data/maps/VictoryRoad_B1F/map.json delete mode 100644 data/maps/VictoryRoad_B2F/events.inc delete mode 100644 data/maps/VictoryRoad_B2F/header.inc create mode 100644 data/maps/VictoryRoad_B2F/map.json delete mode 100644 data/maps/connections.inc delete mode 100644 data/maps/groups.inc delete mode 100644 data/maps/headers.inc create mode 100644 data/maps/map_groups.json create mode 100755 include/constants/map_groups.h create mode 100755 map_data_rules.mk create mode 100755 tools/mapjson/mapjson.py diff --git a/Makefile b/Makefile index 32cc9df73..cb9ce27bb 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ SCANINC := tools/scaninc/scaninc$(EXE) PREPROC := tools/preproc/preproc$(EXE) RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE) FIX := tools/gbafix/gbafix$(EXE) +MAPJSON := python tools/mapjson/mapjson.py # Clear the default suffixes .SUFFIXES: @@ -97,12 +98,16 @@ clean: tidy rm -f sound/direct_sound_samples/*.bin rm -f $(SONG_OBJS) $(MID_OBJS) $(MID_SUBDIR)/*.s find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} + + rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc + rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc + find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} + tidy: rm -f $(ROM) $(ELF) $(MAP) rm -r build/* include graphics_file_rules.mk +include map_data_rules.mk include spritesheet_rules.mk include songs.mk @@ -121,6 +126,7 @@ include songs.mk sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress sound/%.bin: sound/%.aif ; $(AIF) $< $@ + $(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc $(C_BUILDDIR)/libc.o: CFLAGS := -O2 diff --git a/data/event_scripts.s b/data/event_scripts.s index 3c3c38eb9..fbee3987c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ #include "constants/flags.h" #include "constants/items.h" #include "constants/heal_locations.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" diff --git a/data/layouts.inc b/data/layouts.inc deleted file mode 100755 index 97b3b97c8..000000000 --- a/data/layouts.inc +++ /dev/null @@ -1,441 +0,0 @@ - .include "data/layouts/PetalburgCity/layout.inc" - .include "data/layouts/SlateportCity/layout.inc" - .include "data/layouts/MauvilleCity/layout.inc" - .include "data/layouts/RustboroCity/layout.inc" - .include "data/layouts/FortreeCity/layout.inc" - .include "data/layouts/LilycoveCity/layout.inc" - .include "data/layouts/MossdeepCity/layout.inc" - .include "data/layouts/SootopolisCity/layout.inc" - .include "data/layouts/EverGrandeCity/layout.inc" - .include "data/layouts/LittlerootTown/layout.inc" - .include "data/layouts/OldaleTown/layout.inc" - .include "data/layouts/DewfordTown/layout.inc" - .include "data/layouts/LavaridgeTown/layout.inc" - .include "data/layouts/FallarborTown/layout.inc" - .include "data/layouts/VerdanturfTown/layout.inc" - .include "data/layouts/PacifidlogTown/layout.inc" - .include "data/layouts/Route101/layout.inc" - .include "data/layouts/Route102/layout.inc" - .include "data/layouts/Route103/layout.inc" - .include "data/layouts/Route104/layout.inc" - .include "data/layouts/Route105/layout.inc" - .include "data/layouts/Route106/layout.inc" - .include "data/layouts/Route107/layout.inc" - .include "data/layouts/Route108/layout.inc" - .include "data/layouts/Route109/layout.inc" - .include "data/layouts/Route110/layout.inc" - .include "data/layouts/Route111/layout.inc" - .include "data/layouts/Route112/layout.inc" - .include "data/layouts/Route113/layout.inc" - .include "data/layouts/Route114/layout.inc" - .include "data/layouts/Route115/layout.inc" - .include "data/layouts/Route116/layout.inc" - .include "data/layouts/Route117/layout.inc" - .include "data/layouts/Route118/layout.inc" - .include "data/layouts/Route119/layout.inc" - .include "data/layouts/Route120/layout.inc" - .include "data/layouts/Route121/layout.inc" - .include "data/layouts/Route122/layout.inc" - .include "data/layouts/Route123/layout.inc" - .include "data/layouts/Route124/layout.inc" - .include "data/layouts/Route125/layout.inc" - .include "data/layouts/Route126/layout.inc" - .include "data/layouts/Route127/layout.inc" - .include "data/layouts/Route128/layout.inc" - .include "data/layouts/Route129/layout.inc" - .include "data/layouts/UnknownMap_08417FC4/layout.inc" - .include "data/layouts/Route131/layout.inc" - .include "data/layouts/Route132/layout.inc" - .include "data/layouts/Route133/layout.inc" - .include "data/layouts/Route134/layout.inc" - .include "data/layouts/Underwater2/layout.inc" - .include "data/layouts/Underwater3/layout.inc" - .include "data/layouts/Underwater4/layout.inc" - .include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc" - .include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc" - .include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc" - .include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc" - .include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc" - .include "data/layouts/House1/layout.inc" - .include "data/layouts/House2/layout.inc" - .include "data/layouts/PokemonCenter_1F/layout.inc" - .include "data/layouts/PokemonCenter_2F/layout.inc" - .include "data/layouts/Mart/layout.inc" - .include "data/layouts/House3/layout.inc" - .include "data/layouts/DewfordTown_Gym/layout.inc" - .include "data/layouts/DewfordTown_Hall/layout.inc" - .include "data/layouts/House4/layout.inc" - .include "data/layouts/LavaridgeTown_HerbShop/layout.inc" - .include "data/layouts/LavaridgeTown_Gym_1F/layout.inc" - .include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc" - .include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc" - .include "data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc" - .include "data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc" - .include "data/layouts/LilycoveCity_House2/layout.inc" - .include "data/layouts/UnknownMap_08428450/layout.inc" - .include "data/layouts/VerdanturfTown_WandasHouse/layout.inc" - .include "data/layouts/PacifidlogTown_House1/layout.inc" - .include "data/layouts/PacifidlogTown_House2/layout.inc" - .include "data/layouts/PetalburgCity_Gym/layout.inc" - .include "data/layouts/HouseWithBed/layout.inc" - .include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc" - .include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc" - .include "data/layouts/UnknownMap_084294C4/layout.inc" - .include "data/layouts/UnknownMap_084294E8/layout.inc" - .include "data/layouts/SlateportCity_PokemonFanClub/layout.inc" - .include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc" - .include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc" - .include "data/layouts/Harbor/layout.inc" - .include "data/layouts/MauvilleCity_Gym/layout.inc" - .include "data/layouts/MauvilleCity_BikeShop/layout.inc" - .include "data/layouts/MauvilleCity_GameCorner/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc" - .include "data/layouts/RustboroCity_Gym/layout.inc" - .include "data/layouts/RustboroCity_PokemonSchool/layout.inc" - .include "data/layouts/RustboroCity_House/layout.inc" - .include "data/layouts/RustboroCity_House1/layout.inc" - .include "data/layouts/RustboroCity_CuttersHouse/layout.inc" - .include "data/layouts/FortreeCity_House1/layout.inc" - .include "data/layouts/FortreeCity_Gym/layout.inc" - .include "data/layouts/FortreeCity_House2/layout.inc" - .include "data/layouts/Route104_MrBrineysHouse/layout.inc" - .include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc" - .include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc" - .include "data/layouts/LilycoveCity_ContestLobby/layout.inc" - .include "data/layouts/LilycoveCity_ContestHall/layout.inc" - .include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc" - .include "data/layouts/MossdeepCity_Gym/layout.inc" - .include "data/layouts/SootopolisCity_Gym_1F/layout.inc" - .include "data/layouts/SootopolisCity_Gym_B1F/layout.inc" - .include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc" - .include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc" - .include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc" - .include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc" - .include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc" - .include "data/layouts/EverGrandeCity_ShortHall/layout.inc" - .include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc" - .include "data/layouts/CableCarStation/layout.inc" - .include "data/layouts/Route114_FossilManiacsHouse/layout.inc" - .include "data/layouts/Route114_FossilManiacsTunnel/layout.inc" - .include "data/layouts/Route114_LanettesHouse/layout.inc" - .include "data/layouts/Route116_TunnelersRestHouse/layout.inc" - .include "data/layouts/Route117_PokemonDayCare/layout.inc" - .include "data/layouts/Route121_SafariZoneEntrance/layout.inc" - .include "data/layouts/MeteorFalls_1F_1R/layout.inc" - .include "data/layouts/MeteorFalls_1F_2R/layout.inc" - .include "data/layouts/MeteorFalls_B1F_1R/layout.inc" - .include "data/layouts/MeteorFalls_B1F_2R/layout.inc" - .include "data/layouts/RusturfTunnel/layout.inc" - .include "data/layouts/Underwater_SootopolisCity/layout.inc" - .include "data/layouts/DesertRuins/layout.inc" - .include "data/layouts/GraniteCave_1F/layout.inc" - .include "data/layouts/GraniteCave_B1F/layout.inc" - .include "data/layouts/GraniteCave_B2F/layout.inc" - .include "data/layouts/PetalburgWoods/layout.inc" - .include "data/layouts/MtChimney/layout.inc" - .include "data/layouts/MtPyre_1F/layout.inc" - .include "data/layouts/MtPyre_2F/layout.inc" - .include "data/layouts/MtPyre_3F/layout.inc" - .include "data/layouts/MtPyre_4F/layout.inc" - .include "data/layouts/MtPyre_5F/layout.inc" - .include "data/layouts/MtPyre_6F/layout.inc" - .include "data/layouts/AquaHideout_1F/layout.inc" - .include "data/layouts/AquaHideout_B1F/layout.inc" - .include "data/layouts/AquaHideout_B2F/layout.inc" - .include "data/layouts/Underwater_SeafloorCavern/layout.inc" - .include "data/layouts/SeafloorCavern_Entrance/layout.inc" - .include "data/layouts/SeafloorCavern_Room1/layout.inc" - .include "data/layouts/SeafloorCavern_Room2/layout.inc" - .include "data/layouts/SeafloorCavern_Room3/layout.inc" - .include "data/layouts/SeafloorCavern_Room4/layout.inc" - .include "data/layouts/SeafloorCavern_Room5/layout.inc" - .include "data/layouts/SeafloorCavern_Room6/layout.inc" - .include "data/layouts/SeafloorCavern_Room7/layout.inc" - .include "data/layouts/SeafloorCavern_Room8/layout.inc" - .include "data/layouts/SeafloorCavern_Room9/layout.inc" - .include "data/layouts/CaveOfOrigin_Entrance/layout.inc" - .include "data/layouts/CaveOfOrigin_1F/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc" - .include "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc" - .include "data/layouts/CaveOfOrigin_B1F/layout.inc" - .include "data/layouts/VictoryRoad_1F/layout.inc" - .include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc" - .include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc" - .include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc" - .include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc" - .include "data/layouts/UnknownMap_0843E6C0/layout.inc" - .include "data/layouts/UnknownMap_0843E6E4/layout.inc" - .include "data/layouts/UnknownMap_0843E708/layout.inc" - .include "data/layouts/UnknownMap_0843E72C/layout.inc" - .include "data/layouts/UnknownMap_0843E750/layout.inc" - .include "data/layouts/UnknownMap_0843E774/layout.inc" - .include "data/layouts/UnknownMap_0843E798/layout.inc" - .include "data/layouts/UnknownMap_0843E7BC/layout.inc" - .include "data/layouts/UnknownMap_0843E7E0/layout.inc" - .include "data/layouts/UnknownMap_0843E804/layout.inc" - .include "data/layouts/UnknownMap_0843E828/layout.inc" - .include "data/layouts/UnknownMap_0843E84C/layout.inc" - .include "data/layouts/UnknownMap_0843E870/layout.inc" - .include "data/layouts/UnknownMap_0843E894/layout.inc" - .include "data/layouts/NewMauville_Entrance/layout.inc" - .include "data/layouts/NewMauville_Inside/layout.inc" - .include "data/layouts/AbandonedShip_Deck/layout.inc" - .include "data/layouts/AbandonedShip_Corridors_1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms_1F/layout.inc" - .include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Underwater1/layout.inc" - .include "data/layouts/AbandonedShip_Room_B1F/layout.inc" - .include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc" - .include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc" - .include "data/layouts/AbandonedShip_Underwater2/layout.inc" - .include "data/layouts/SecretBase_RedCave1/layout.inc" - .include "data/layouts/SecretBase_BrownCave1/layout.inc" - .include "data/layouts/SecretBase_BlueCave1/layout.inc" - .include "data/layouts/SecretBase_YellowCave1/layout.inc" - .include "data/layouts/SecretBase_Tree1/layout.inc" - .include "data/layouts/SecretBase_Shrub1/layout.inc" - .include "data/layouts/SecretBase_RedCave2/layout.inc" - .include "data/layouts/SecretBase_BrownCave2/layout.inc" - .include "data/layouts/SecretBase_BlueCave2/layout.inc" - .include "data/layouts/SecretBase_YellowCave2/layout.inc" - .include "data/layouts/SecretBase_Tree2/layout.inc" - .include "data/layouts/SecretBase_Shrub2/layout.inc" - .include "data/layouts/SecretBase_RedCave3/layout.inc" - .include "data/layouts/SecretBase_BrownCave3/layout.inc" - .include "data/layouts/SecretBase_BlueCave3/layout.inc" - .include "data/layouts/SecretBase_YellowCave3/layout.inc" - .include "data/layouts/SecretBase_Tree3/layout.inc" - .include "data/layouts/SecretBase_Shrub3/layout.inc" - .include "data/layouts/SecretBase_RedCave4/layout.inc" - .include "data/layouts/SecretBase_BrownCave4/layout.inc" - .include "data/layouts/SecretBase_BlueCave4/layout.inc" - .include "data/layouts/SecretBase_YellowCave4/layout.inc" - .include "data/layouts/SecretBase_Tree4/layout.inc" - .include "data/layouts/SecretBase_Shrub4/layout.inc" - .include "data/layouts/SingleBattleColosseum/layout.inc" - .include "data/layouts/TradeCenter/layout.inc" - .include "data/layouts/RecordCorner/layout.inc" - .include "data/layouts/DoubleBattleColosseum/layout.inc" - .include "data/layouts/LinkContestRoom1/layout.inc" - .include "data/layouts/UnknownMap_25_29/layout.inc" - .include "data/layouts/UnknownMap_25_30/layout.inc" - .include "data/layouts/UnknownMap_25_31/layout.inc" - .include "data/layouts/UnknownMap_25_32/layout.inc" - .include "data/layouts/UnknownMap_25_33/layout.inc" - .include "data/layouts/UnknownMap_25_34/layout.inc" - .include "data/layouts/LinkContestRoom2/layout.inc" - .include "data/layouts/LinkContestRoom3/layout.inc" - .include "data/layouts/LinkContestRoom4/layout.inc" - .include "data/layouts/LinkContestRoom5/layout.inc" - .include "data/layouts/LinkContestRoom6/layout.inc" - .include "data/layouts/InsideOfTruck/layout.inc" - .include "data/layouts/SafariZone_Northwest/layout.inc" - .include "data/layouts/SafariZone_North/layout.inc" - .include "data/layouts/SafariZone_Southwest/layout.inc" - .include "data/layouts/SafariZone_South/layout.inc" - .include "data/layouts/UnknownMap_08447028/layout.inc" - .include "data/layouts/Route109_SeashoreHouse/layout.inc" - .include "data/layouts/Route110_TrickHouseEntrance/layout.inc" - .include "data/layouts/Route110_TrickHouseEnd/layout.inc" - .include "data/layouts/Route110_TrickHouseCorridor/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle1/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle2/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle3/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle4/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle5/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle6/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle7/layout.inc" - .include "data/layouts/Route110_TrickHousePuzzle8/layout.inc" - .include "data/layouts/FortreeCity_DecorationShop/layout.inc" - .include "data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc" - .include "data/layouts/Route130/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerLobby/layout.inc" - .include "data/layouts/BattleFrontier_OutsideWest/layout.inc" - .include "data/layouts/BattleElevator/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" - .include "data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc" - .include "data/layouts/Route119_WeatherInstitute_1F/layout.inc" - .include "data/layouts/Route119_WeatherInstitute_2F/layout.inc" - .include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc" - .include "data/layouts/Underwater1/layout.inc" - .include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc" - .include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc" - .include "data/layouts/SSTidalCorridor/layout.inc" - .include "data/layouts/SSTidalLowerDeck/layout.inc" - .include "data/layouts/SSTidalRooms/layout.inc" - .include "data/layouts/IslandCave/layout.inc" - .include "data/layouts/AncientTomb/layout.inc" - .include "data/layouts/Underwater_Route134/layout.inc" - .include "data/layouts/Underwater_SealedChamber/layout.inc" - .include "data/layouts/SealedChamber_OuterRoom/layout.inc" - .include "data/layouts/VictoryRoad_B1F/layout.inc" - .include "data/layouts/VictoryRoad_B2F/layout.inc" - .include "data/layouts/Route104_Prototype/layout.inc" - .include "data/layouts/GraniteCave_StevensRoom/layout.inc" - .include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc" - .include "data/layouts/SouthernIsland_Exterior/layout.inc" - .include "data/layouts/SouthernIsland_Interior/layout.inc" - .include "data/layouts/JaggedPass/layout.inc" - .include "data/layouts/FieryPath/layout.inc" - .include "data/layouts/RustboroCity_Flat2_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat2_2F/layout.inc" - .include "data/layouts/RustboroCity_Flat2_3F/layout.inc" - .include "data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc" - .include "data/layouts/EverGrandeCity_HallOfFame/layout.inc" - .include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc" - .include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc" - .include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc" - .include "data/layouts/MtPyre_Exterior/layout.inc" - .include "data/layouts/MtPyre_Summit/layout.inc" - .include "data/layouts/SealedChamber_InnerRoom/layout.inc" - .include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc" - .include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc" - .include "data/layouts/SootopolisCity_House1/layout.inc" - .include "data/layouts/SootopolisCity_House2/layout.inc" - .include "data/layouts/SootopolisCity_House3/layout.inc" - .include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc" - .include "data/layouts/ScorchedSlab/layout.inc" - .include "data/layouts/UnknownMap_0845A394/layout.inc" - .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" - .include "data/layouts/EverGrandeCity_Hall4/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap1/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap2/layout.inc" - .include "data/layouts/AquaHideout_UnusedRubyMap3/layout.inc" - .include "data/layouts/UnknownMap_0845D470/layout.inc" - .include "data/layouts/SkyPillar_Entrance/layout.inc" - .include "data/layouts/SkyPillar_Outside/layout.inc" - .include "data/layouts/SkyPillar_1F/layout.inc" - .include "data/layouts/SkyPillar_2F/layout.inc" - .include "data/layouts/SkyPillar_3F/layout.inc" - .include "data/layouts/SkyPillar_4F/layout.inc" - .include "data/layouts/UnknownMap_0845ECB4/layout.inc" - .include "data/layouts/MossdeepCity_StevensHouse/layout.inc" - .include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc" - .include "data/layouts/SafariZone_RestHouse/layout.inc" - .include "data/layouts/SkyPillar_5F/layout.inc" - .include "data/layouts/SkyPillar_Top/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc" - .include "data/layouts/MagmaHideout_1F/layout.inc" - .include "data/layouts/MagmaHideout_2F_1R/layout.inc" - .include "data/layouts/MagmaHideout_2F_2R/layout.inc" - .include "data/layouts/MagmaHideout_3F_1R/layout.inc" - .include "data/layouts/MagmaHideout_3F_2R/layout.inc" - .include "data/layouts/MagmaHideout_4F/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_OutsideEast/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc" - .include "data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc" - .include "data/layouts/UnknownMap_08469200/layout.inc" - .include "data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc" - .include "data/layouts/UnknownMap_084693AC/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc" - .include "data/layouts/BattlePyramidSquare01/layout.inc" - .include "data/layouts/BattlePyramidSquare02/layout.inc" - .include "data/layouts/BattlePyramidSquare03/layout.inc" - .include "data/layouts/BattlePyramidSquare04/layout.inc" - .include "data/layouts/BattlePyramidSquare05/layout.inc" - .include "data/layouts/BattlePyramidSquare06/layout.inc" - .include "data/layouts/BattlePyramidSquare07/layout.inc" - .include "data/layouts/BattlePyramidSquare08/layout.inc" - .include "data/layouts/BattlePyramidSquare09/layout.inc" - .include "data/layouts/BattlePyramidSquare10/layout.inc" - .include "data/layouts/BattlePyramidSquare11/layout.inc" - .include "data/layouts/BattlePyramidSquare12/layout.inc" - .include "data/layouts/BattlePyramidSquare13/layout.inc" - .include "data/layouts/BattlePyramidSquare14/layout.inc" - .include "data/layouts/BattlePyramidSquare15/layout.inc" - .include "data/layouts/BattlePyramidSquare16/layout.inc" - .include "data/layouts/BattleFrontier_BattlePyramidTop/layout.inc" - .include "data/layouts/MagmaHideout_3F_3R/layout.inc" - .include "data/layouts/MagmaHideout_2F_3R/layout.inc" - .include "data/layouts/MirageTower_1F/layout.inc" - .include "data/layouts/MirageTower_2F/layout.inc" - .include "data/layouts/MirageTower_3F/layout.inc" - .include "data/layouts/BattleTentLobby/layout.inc" - .include "data/layouts/BattleTentCorridor/layout.inc" - .include "data/layouts/BattleTentBattleRoom/layout.inc" - .include "data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc" - .include "data/layouts/MirageTower_4F/layout.inc" - .include "data/layouts/DesertUnderpass/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc" - .include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc" - .include "data/layouts/Route111_NoMirageTower/layout.inc" - .include "data/layouts/UnionRoom/layout.inc" - .include "data/layouts/SafariZone_Northeast/layout.inc" - .include "data/layouts/SafariZone_Southeast/layout.inc" - .include "data/layouts/BattleFrontier_RankingHall/layout.inc" - .include "data/layouts/BattleFrontier_Lounge1/layout.inc" - .include "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc" - .include "data/layouts/BattleFrontier_ReceptionGate/layout.inc" - .include "data/layouts/ArtisanCave_B1F/layout.inc" - .include "data/layouts/ArtisanCave_1F/layout.inc" - .include "data/layouts/FarawayIsland_Entrance/layout.inc" - .include "data/layouts/FarawayIsland_Interior/layout.inc" - .include "data/layouts/BirthIsland_Exterior/layout.inc" - .include "data/layouts/IslandHarbor/layout.inc" - .include "data/layouts/Underwater_MarineCave/layout.inc" - .include "data/layouts/MarineCave_Entrance/layout.inc" - .include "data/layouts/TerraCave_Entrance/layout.inc" - .include "data/layouts/TerraCave_End/layout.inc" - .include "data/layouts/Underwater6/layout.inc" - .include "data/layouts/Underwater7/layout.inc" - .include "data/layouts/Underwater5/layout.inc" - .include "data/layouts/MarineCave_End/layout.inc" - .include "data/layouts/TrainerHill_Entrance/layout.inc" - .include "data/layouts/TrainerHill_1F/layout.inc" - .include "data/layouts/TrainerHill_2F/layout.inc" - .include "data/layouts/TrainerHill_3F/layout.inc" - .include "data/layouts/TrainerHill_4F/layout.inc" - .include "data/layouts/TrainerHill_Roof/layout.inc" - .include "data/layouts/AlteringCave/layout.inc" - .include "data/layouts/NavelRock_Exterior/layout.inc" - .include "data/layouts/NavelRock_Entrance/layout.inc" - .include "data/layouts/NavelRock_Top/layout.inc" - .include "data/layouts/NavelRock_Bottom/layout.inc" - .include "data/layouts/NavelRock_LadderRoom1/layout.inc" - .include "data/layouts/NavelRock_LadderRoom2/layout.inc" - .include "data/layouts/NavelRock_B1F/layout.inc" - .include "data/layouts/NavelRock_Fork/layout.inc" - .include "data/layouts/BattleFrontier_Lounge2/layout.inc" - .include "data/layouts/BattleFrontier_ScottsHouse/layout.inc" - .include "data/layouts/MeteorFalls_StevensCave/layout.inc" - .include "data/layouts/UnknownMap_08480DAC/layout.inc" - .include "data/layouts/UnknownMap_08480F54/layout.inc" - .include "data/layouts/UnknownMap_084810FC/layout.inc" - .include "data/layouts/UnknownMap_084812A4/layout.inc" - .include "data/layouts/UnknownMap_0848144C/layout.inc" - .include "data/layouts/UnknownMap_084815F4/layout.inc" - .include "data/layouts/UnknownMap_08481B24/layout.inc" - .include "data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc" - .include "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc" - .include "data/layouts/UnknownMap_08481DBC/layout.inc" diff --git a/data/layouts/.gitignore b/data/layouts/.gitignore new file mode 100755 index 000000000..eaa83a6f1 --- /dev/null +++ b/data/layouts/.gitignore @@ -0,0 +1,2 @@ +layouts.inc +layouts_table.inc diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc deleted file mode 100644 index d9e122ef2..000000000 --- a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_CaptainsOffice_MapBorder:: - .incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin" - -AbandonedShip_CaptainsOffice_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin" - - .align 2 -AbandonedShip_CaptainsOffice_Layout:: - .4byte 0x9 - .4byte 0x7 - .4byte AbandonedShip_CaptainsOffice_MapBorder - .4byte AbandonedShip_CaptainsOffice_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc deleted file mode 100644 index d5fd22578..000000000 --- a/data/layouts/AbandonedShip_Corridors_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin" - -AbandonedShip_Corridors_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin" - - .align 2 -AbandonedShip_Corridors_1F_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte AbandonedShip_Corridors_1F_MapBorder - .4byte AbandonedShip_Corridors_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc deleted file mode 100644 index 7299aa6f8..000000000 --- a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin" - -AbandonedShip_Corridors_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin" - - .align 2 -AbandonedShip_Corridors_B1F_Layout:: - .4byte 0xd - .4byte 0xa - .4byte AbandonedShip_Corridors_B1F_MapBorder - .4byte AbandonedShip_Corridors_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc deleted file mode 100644 index 7f0baaaec..000000000 --- a/data/layouts/AbandonedShip_Deck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Deck_MapBorder:: - .incbin "data/layouts/AbandonedShip_Deck/border.bin" - -AbandonedShip_Deck_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Deck/map.bin" - - .align 2 -AbandonedShip_Deck_Layout:: - .4byte 0x17 - .4byte 0x15 - .4byte AbandonedShip_Deck_MapBorder - .4byte AbandonedShip_Deck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc deleted file mode 100644 index 0ee7aa755..000000000 --- a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapBorder:: - .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin" - -AbandonedShip_HiddenFloorCorridors_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" - - .align 2 -AbandonedShip_HiddenFloorCorridors_Layout:: - .4byte 0xd - .4byte 0xb - .4byte AbandonedShip_HiddenFloorCorridors_MapBorder - .4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc deleted file mode 100644 index bf2f758d7..000000000 --- a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorRooms_MapBorder:: - .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin" - -AbandonedShip_HiddenFloorRooms_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" - - .align 2 -AbandonedShip_HiddenFloorRooms_Layout:: - .4byte 0x2c - .4byte 0xf - .4byte AbandonedShip_HiddenFloorRooms_MapBorder - .4byte AbandonedShip_HiddenFloorRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc deleted file mode 100644 index fdd5b395d..000000000 --- a/data/layouts/AbandonedShip_Room_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Room_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Room_B1F/border.bin" - -AbandonedShip_Room_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Room_B1F/map.bin" - - .align 2 -AbandonedShip_Room_B1F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte AbandonedShip_Room_B1F_MapBorder - .4byte AbandonedShip_Room_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc deleted file mode 100644 index d15652cc0..000000000 --- a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin" - -AbandonedShip_Rooms2_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_1F_Layout:: - .4byte 0x9 - .4byte 0x11 - .4byte AbandonedShip_Rooms2_1F_MapBorder - .4byte AbandonedShip_Rooms2_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc deleted file mode 100644 index d99e43f47..000000000 --- a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin" - -AbandonedShip_Rooms2_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms2_B1F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte AbandonedShip_Rooms2_B1F_MapBorder - .4byte AbandonedShip_Rooms2_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc deleted file mode 100644 index 63e4a716a..000000000 --- a/data/layouts/AbandonedShip_Rooms_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin" - -AbandonedShip_Rooms_1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin" - - .align 2 -AbandonedShip_Rooms_1F_Layout:: - .4byte 0x12 - .4byte 0x11 - .4byte AbandonedShip_Rooms_1F_MapBorder - .4byte AbandonedShip_Rooms_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc deleted file mode 100644 index ab688d668..000000000 --- a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_B1F_MapBorder:: - .incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin" - -AbandonedShip_Rooms_B1F_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin" - - .align 2 -AbandonedShip_Rooms_B1F_Layout:: - .4byte 0x1b - .4byte 0x8 - .4byte AbandonedShip_Rooms_B1F_MapBorder - .4byte AbandonedShip_Rooms_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc deleted file mode 100644 index 8fa1b1485..000000000 --- a/data/layouts/AbandonedShip_Underwater1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater1_MapBorder:: - .incbin "data/layouts/AbandonedShip_Underwater1/border.bin" - -AbandonedShip_Underwater1_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Underwater1/map.bin" - - .align 2 -AbandonedShip_Underwater1_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte AbandonedShip_Underwater1_MapBorder - .4byte AbandonedShip_Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc deleted file mode 100644 index feea82d16..000000000 --- a/data/layouts/AbandonedShip_Underwater2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater2_MapBorder:: - .incbin "data/layouts/AbandonedShip_Underwater2/border.bin" - -AbandonedShip_Underwater2_MapBlockdata:: - .incbin "data/layouts/AbandonedShip_Underwater2/map.bin" - - .align 2 -AbandonedShip_Underwater2_Layout:: - .4byte 0x15 - .4byte 0x7 - .4byte AbandonedShip_Underwater2_MapBorder - .4byte AbandonedShip_Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/AlteringCave/layout.inc b/data/layouts/AlteringCave/layout.inc deleted file mode 100644 index 9f03e7d87..000000000 --- a/data/layouts/AlteringCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave_MapBorder:: - .incbin "data/layouts/AlteringCave/border.bin" - -AlteringCave_MapBlockdata:: - .incbin "data/layouts/AlteringCave/map.bin" - - .align 2 -AlteringCave_Layout:: - .4byte 0x20 - .4byte 0x18 - .4byte AlteringCave_MapBorder - .4byte AlteringCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc deleted file mode 100644 index ad173f936..000000000 --- a/data/layouts/AncientTomb/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb_MapBorder:: - .incbin "data/layouts/AncientTomb/border.bin" - -AncientTomb_MapBlockdata:: - .incbin "data/layouts/AncientTomb/map.bin" - - .align 2 -AncientTomb_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte AncientTomb_MapBorder - .4byte AncientTomb_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc deleted file mode 100644 index 5508a668b..000000000 --- a/data/layouts/AquaHideout_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_1F_MapBorder:: - .incbin "data/layouts/AquaHideout_1F/border.bin" - -AquaHideout_1F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_1F/map.bin" - - .align 2 -AquaHideout_1F_Layout:: - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_1F_MapBorder - .4byte AquaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc deleted file mode 100644 index 0889e548a..000000000 --- a/data/layouts/AquaHideout_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B1F_MapBorder:: - .incbin "data/layouts/AquaHideout_B1F/border.bin" - -AquaHideout_B1F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_B1F/map.bin" - - .align 2 -AquaHideout_B1F_Layout:: - .4byte 0x33 - .4byte 0x18 - .4byte AquaHideout_B1F_MapBorder - .4byte AquaHideout_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc deleted file mode 100644 index 9e335e5d9..000000000 --- a/data/layouts/AquaHideout_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B2F_MapBorder:: - .incbin "data/layouts/AquaHideout_B2F/border.bin" - -AquaHideout_B2F_MapBlockdata:: - .incbin "data/layouts/AquaHideout_B2F/map.bin" - - .align 2 -AquaHideout_B2F_Layout:: - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_B2F_MapBorder - .4byte AquaHideout_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc deleted file mode 100644 index 05862b275..000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap1/border.bin" - -AquaHideout_UnusedRubyMap1_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap1_Layout:: - .4byte 0x1c - .4byte 0x1e - .4byte AquaHideout_UnusedRubyMap1_MapBorder - .4byte AquaHideout_UnusedRubyMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc deleted file mode 100644 index e9e08ab97..000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap2/border.bin" - -AquaHideout_UnusedRubyMap2_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap2_Layout:: - .4byte 0x3e - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap2_MapBorder - .4byte AquaHideout_UnusedRubyMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc b/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc deleted file mode 100644 index 44b35666f..000000000 --- a/data/layouts/AquaHideout_UnusedRubyMap3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapBorder:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap3/border.bin" - -AquaHideout_UnusedRubyMap3_MapBlockdata:: - .incbin "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" - - .align 2 -AquaHideout_UnusedRubyMap3_Layout:: - .4byte 0x22 - .4byte 0x18 - .4byte AquaHideout_UnusedRubyMap3_MapBorder - .4byte AquaHideout_UnusedRubyMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/ArtisanCave_1F/layout.inc b/data/layouts/ArtisanCave_1F/layout.inc deleted file mode 100644 index b32eef422..000000000 --- a/data/layouts/ArtisanCave_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_1F_MapBorder:: - .incbin "data/layouts/ArtisanCave_1F/border.bin" - -ArtisanCave_1F_MapBlockdata:: - .incbin "data/layouts/ArtisanCave_1F/map.bin" - - .align 2 -ArtisanCave_1F_Layout:: - .4byte 0x15 - .4byte 0x16 - .4byte ArtisanCave_1F_MapBorder - .4byte ArtisanCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ArtisanCave_B1F/layout.inc b/data/layouts/ArtisanCave_B1F/layout.inc deleted file mode 100644 index 2640303e3..000000000 --- a/data/layouts/ArtisanCave_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_B1F_MapBorder:: - .incbin "data/layouts/ArtisanCave_B1F/border.bin" - -ArtisanCave_B1F_MapBlockdata:: - .incbin "data/layouts/ArtisanCave_B1F/map.bin" - - .align 2 -ArtisanCave_B1F_Layout:: - .4byte 0x2e - .4byte 0x36 - .4byte ArtisanCave_B1F_MapBorder - .4byte ArtisanCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/BattleElevator/layout.inc b/data/layouts/BattleElevator/layout.inc deleted file mode 100644 index 374af9ffa..000000000 --- a/data/layouts/BattleElevator/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleElevator_MapBorder:: - .incbin "data/layouts/BattleElevator/border.bin" - -BattleElevator_MapBlockdata:: - .incbin "data/layouts/BattleElevator/map.bin" - - .align 2 -BattleElevator_Layout:: - .4byte 0x5 - .4byte 0x7 - .4byte BattleElevator_MapBorder - .4byte BattleElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc deleted file mode 100644 index 89f799d84..000000000 --- a/data/layouts/BattleFrontier_BattleArenaBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin" - -BattleFrontier_BattleArenaBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleArenaBattleRoom_Layout:: - .4byte 0x10 - .4byte 0xb - .4byte BattleFrontier_BattleArenaBattleRoom_MapBorder - .4byte BattleFrontier_BattleArenaBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - diff --git a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc b/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc deleted file mode 100644 index 8961ed778..000000000 --- a/data/layouts/BattleFrontier_BattleArenaCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin" - -BattleFrontier_BattleArenaCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" - - .align 2 -BattleFrontier_BattleArenaCorridor_Layout:: - .4byte 0x12 - .4byte 0xe - .4byte BattleFrontier_BattleArenaCorridor_MapBorder - .4byte BattleFrontier_BattleArenaCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - diff --git a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc b/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc deleted file mode 100644 index 305fcc0d9..000000000 --- a/data/layouts/BattleFrontier_BattleArenaLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleArenaLobby/border.bin" - -BattleFrontier_BattleArenaLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" - - .align 2 -BattleFrontier_BattleArenaLobby_Layout:: - .4byte 0x10 - .4byte 0xd - .4byte BattleFrontier_BattleArenaLobby_MapBorder - .4byte BattleFrontier_BattleArenaLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleArena - diff --git a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc deleted file mode 100644 index a4991ae0c..000000000 --- a/data/layouts/BattleFrontier_BattleDomeBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin" - -BattleFrontier_BattleDomeBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomeBattleRoom_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte BattleFrontier_BattleDomeBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomeBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc b/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc deleted file mode 100644 index 7f3c93b82..000000000 --- a/data/layouts/BattleFrontier_BattleDomeCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin" - -BattleFrontier_BattleDomeCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" - - .align 2 -BattleFrontier_BattleDomeCorridor_Layout:: - .4byte 0x30 - .4byte 0x7 - .4byte BattleFrontier_BattleDomeCorridor_MapBorder - .4byte BattleFrontier_BattleDomeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc b/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc deleted file mode 100644 index 2553e7098..000000000 --- a/data/layouts/BattleFrontier_BattleDomeLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomeLobby/border.bin" - -BattleFrontier_BattleDomeLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" - - .align 2 -BattleFrontier_BattleDomeLobby_Layout:: - .4byte 0x17 - .4byte 0x11 - .4byte BattleFrontier_BattleDomeLobby_MapBorder - .4byte BattleFrontier_BattleDomeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc deleted file mode 100644 index 8c0fe2ce5..000000000 --- a/data/layouts/BattleFrontier_BattleDomePreBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin" - -BattleFrontier_BattleDomePreBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleDomePreBattleRoom_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBorder - .4byte BattleFrontier_BattleDomePreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleDome - diff --git a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc deleted file mode 100644 index 21ba6a015..000000000 --- a/data/layouts/BattleFrontier_BattleFactoryBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin" - -BattleFrontier_BattleFactoryBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryBattleRoom_Layout:: - .4byte 0xd - .4byte 0xc - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - diff --git a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc b/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc deleted file mode 100644 index cc0a33611..000000000 --- a/data/layouts/BattleFrontier_BattleFactoryLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin" - -BattleFrontier_BattleFactoryLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" - - .align 2 -BattleFrontier_BattleFactoryLobby_Layout:: - .4byte 0x13 - .4byte 0xc - .4byte BattleFrontier_BattleFactoryLobby_MapBorder - .4byte BattleFrontier_BattleFactoryLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - diff --git a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc deleted file mode 100644 index fc4fc49bc..000000000 --- a/data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin" - -BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleFactoryPreBattleRoom_Layout:: - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBorder - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFactory - diff --git a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc deleted file mode 100644 index 3d9acc3c4..000000000 --- a/data/layouts/BattleFrontier_BattlePalaceBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin" - -BattleFrontier_BattlePalaceBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattlePalaceBattleRoom_Layout:: - .4byte 0xf - .4byte 0xa - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBorder - .4byte BattleFrontier_BattlePalaceBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - diff --git a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc deleted file mode 100644 index 2d16216c5..000000000 --- a/data/layouts/BattleFrontier_BattlePalaceCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin" - -BattleFrontier_BattlePalaceCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePalaceCorridor_Layout:: - .4byte 0x11 - .4byte 0xe - .4byte BattleFrontier_BattlePalaceCorridor_MapBorder - .4byte BattleFrontier_BattlePalaceCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattlePalace - diff --git a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc b/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc deleted file mode 100644 index f9a1dad7b..000000000 --- a/data/layouts/BattleFrontier_BattlePalaceLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin" - -BattleFrontier_BattlePalaceLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" - - .align 2 -BattleFrontier_BattlePalaceLobby_Layout:: - .4byte 0x19 - .4byte 0xc - .4byte BattleFrontier_BattlePalaceLobby_MapBorder - .4byte BattleFrontier_BattlePalaceLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePalace - diff --git a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc b/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc deleted file mode 100644 index 1d6d21778..000000000 --- a/data/layouts/BattleFrontier_BattlePikeCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin" - -BattleFrontier_BattlePikeCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" - - .align 2 -BattleFrontier_BattlePikeCorridor_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte BattleFrontier_BattlePikeCorridor_MapBorder - .4byte BattleFrontier_BattlePikeCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc b/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc deleted file mode 100644 index 3a5cd3538..000000000 --- a/data/layouts/BattleFrontier_BattlePikeLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeLobby/border.bin" - -BattleFrontier_BattlePikeLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" - - .align 2 -BattleFrontier_BattlePikeLobby_Layout:: - .4byte 0xb - .4byte 0xd - .4byte BattleFrontier_BattlePikeLobby_MapBorder - .4byte BattleFrontier_BattlePikeLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc deleted file mode 100644 index 466ad0ff4..000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin" - -BattleFrontier_BattlePikeRandomRoom1_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom1_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc deleted file mode 100644 index 1c7fb35d4..000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin" - -BattleFrontier_BattlePikeRandomRoom2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom2_Layout:: - .4byte 0x5 - .4byte 0x8 - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc b/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc deleted file mode 100644 index ce17a0bf6..000000000 --- a/data/layouts/BattleFrontier_BattlePikeRandomRoom3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin" - -BattleFrontier_BattlePikeRandomRoom3_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" - - .align 2 -BattleFrontier_BattlePikeRandomRoom3_Layout:: - .4byte 0x9 - .4byte 0x14 - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBorder - .4byte BattleFrontier_BattlePikeRandomRoom3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc b/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc deleted file mode 100644 index d7a082d13..000000000 --- a/data/layouts/BattleFrontier_BattlePikeThreePathRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin" - -BattleFrontier_BattlePikeThreePathRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" - - .align 2 -BattleFrontier_BattlePikeThreePathRoom_Layout:: - .4byte 0xd - .4byte 0xb - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBorder - .4byte BattleFrontier_BattlePikeThreePathRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc b/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc deleted file mode 100644 index a65e7928b..000000000 --- a/data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin" - -BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" - - .align 2 -BattleFrontier_BattlePointExchangeServiceCorner_Layout:: - .4byte 0xf - .4byte 0xb - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBorder - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc b/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc deleted file mode 100644 index a9e779ddb..000000000 --- a/data/layouts/BattleFrontier_BattlePyramidEmptySquare/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin" - -BattleFrontier_BattlePyramidEmptySquare_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" - - .align 2 -BattleFrontier_BattlePyramidEmptySquare_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBorder - .4byte BattleFrontier_BattlePyramidEmptySquare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc b/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc deleted file mode 100644 index 28575776a..000000000 --- a/data/layouts/BattleFrontier_BattlePyramidLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin" - -BattleFrontier_BattlePyramidLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" - - .align 2 -BattleFrontier_BattlePyramidLobby_Layout:: - .4byte 0xf - .4byte 0x12 - .4byte BattleFrontier_BattlePyramidLobby_MapBorder - .4byte BattleFrontier_BattlePyramidLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc b/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc deleted file mode 100644 index 4657c37a3..000000000 --- a/data/layouts/BattleFrontier_BattlePyramidTop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidTop_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattlePyramidTop/border.bin" - -BattleFrontier_BattlePyramidTop_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" - - .align 2 -BattleFrontier_BattlePyramidTop_Layout:: - .4byte 0x22 - .4byte 0x17 - .4byte BattleFrontier_BattlePyramidTop_MapBorder - .4byte BattleFrontier_BattlePyramidTop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc deleted file mode 100644 index 3d498239a..000000000 --- a/data/layouts/BattleFrontier_BattleTowerBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin" - -BattleFrontier_BattleTowerBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerBattleRoom_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte BattleFrontier_BattleTowerBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc deleted file mode 100644 index 56335aa23..000000000 --- a/data/layouts/BattleFrontier_BattleTowerCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin" - -BattleFrontier_BattleTowerCorridor_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor_Layout:: - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor_MapBorder - .4byte BattleFrontier_BattleTowerCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc b/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc deleted file mode 100644 index 7dba3777c..000000000 --- a/data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin" - -BattleFrontier_BattleTowerCorridor2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" - - .align 2 -BattleFrontier_BattleTowerCorridor2_Layout:: - .4byte 0x11 - .4byte 0x5 - .4byte BattleFrontier_BattleTowerCorridor2_MapBorder - .4byte BattleFrontier_BattleTowerCorridor2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc b/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc deleted file mode 100644 index 790ff3bcd..000000000 --- a/data/layouts/BattleFrontier_BattleTowerLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerLobby_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerLobby/border.bin" - -BattleFrontier_BattleTowerLobby_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" - - .align 2 -BattleFrontier_BattleTowerLobby_Layout:: - .4byte 0x19 - .4byte 0xa - .4byte BattleFrontier_BattleTowerLobby_MapBorder - .4byte BattleFrontier_BattleTowerLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc b/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc deleted file mode 100644 index df5615873..000000000 --- a/data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapBorder:: - .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin" - -BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" - - .align 2 -BattleFrontier_BattleTowerMultiBattleRoom_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBorder - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_Lounge1/layout.inc b/data/layouts/BattleFrontier_Lounge1/layout.inc deleted file mode 100644 index c25b3b2a0..000000000 --- a/data/layouts/BattleFrontier_Lounge1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge1_MapBorder:: - .incbin "data/layouts/BattleFrontier_Lounge1/border.bin" - -BattleFrontier_Lounge1_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_Lounge1/map.bin" - - .align 2 -BattleFrontier_Lounge1_Layout:: - .4byte 0xd - .4byte 0x8 - .4byte BattleFrontier_Lounge1_MapBorder - .4byte BattleFrontier_Lounge1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_Lounge2/layout.inc b/data/layouts/BattleFrontier_Lounge2/layout.inc deleted file mode 100644 index b735b4994..000000000 --- a/data/layouts/BattleFrontier_Lounge2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge2_MapBorder:: - .incbin "data/layouts/BattleFrontier_Lounge2/border.bin" - -BattleFrontier_Lounge2_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_Lounge2/map.bin" - - .align 2 -BattleFrontier_Lounge2_Layout:: - .4byte 0x9 - .4byte 0xa - .4byte BattleFrontier_Lounge2_MapBorder - .4byte BattleFrontier_Lounge2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_OutsideEast/layout.inc b/data/layouts/BattleFrontier_OutsideEast/layout.inc deleted file mode 100644 index ddaf20446..000000000 --- a/data/layouts/BattleFrontier_OutsideEast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideEast_MapBorder:: - .incbin "data/layouts/BattleFrontier_OutsideEast/border.bin" - -BattleFrontier_OutsideEast_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_OutsideEast/map.bin" - - .align 2 -BattleFrontier_OutsideEast_Layout:: - .4byte 0x48 - .4byte 0x48 - .4byte BattleFrontier_OutsideEast_MapBorder - .4byte BattleFrontier_OutsideEast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideEast - diff --git a/data/layouts/BattleFrontier_OutsideWest/layout.inc b/data/layouts/BattleFrontier_OutsideWest/layout.inc deleted file mode 100644 index a506e554f..000000000 --- a/data/layouts/BattleFrontier_OutsideWest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideWest_MapBorder:: - .incbin "data/layouts/BattleFrontier_OutsideWest/border.bin" - -BattleFrontier_OutsideWest_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_OutsideWest/map.bin" - - .align 2 -BattleFrontier_OutsideWest_Layout:: - .4byte 0x38 - .4byte 0x48 - .4byte BattleFrontier_OutsideWest_MapBorder - .4byte BattleFrontier_OutsideWest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontierOutsideWest - diff --git a/data/layouts/BattleFrontier_RankingHall/layout.inc b/data/layouts/BattleFrontier_RankingHall/layout.inc deleted file mode 100644 index d7615e693..000000000 --- a/data/layouts/BattleFrontier_RankingHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_RankingHall_MapBorder:: - .incbin "data/layouts/BattleFrontier_RankingHall/border.bin" - -BattleFrontier_RankingHall_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_RankingHall/map.bin" - - .align 2 -BattleFrontier_RankingHall_Layout:: - .4byte 0x35 - .4byte 0xf - .4byte BattleFrontier_RankingHall_MapBorder - .4byte BattleFrontier_RankingHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontierRankingHall - diff --git a/data/layouts/BattleFrontier_ReceptionGate/layout.inc b/data/layouts/BattleFrontier_ReceptionGate/layout.inc deleted file mode 100644 index 3dd4aeaa5..000000000 --- a/data/layouts/BattleFrontier_ReceptionGate/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ReceptionGate_MapBorder:: - .incbin "data/layouts/BattleFrontier_ReceptionGate/border.bin" - -BattleFrontier_ReceptionGate_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_ReceptionGate/map.bin" - - .align 2 -BattleFrontier_ReceptionGate_Layout:: - .4byte 0x9 - .4byte 0xe - .4byte BattleFrontier_ReceptionGate_MapBorder - .4byte BattleFrontier_ReceptionGate_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattleFrontier_ScottsHouse/layout.inc b/data/layouts/BattleFrontier_ScottsHouse/layout.inc deleted file mode 100644 index f08737109..000000000 --- a/data/layouts/BattleFrontier_ScottsHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ScottsHouse_MapBorder:: - .incbin "data/layouts/BattleFrontier_ScottsHouse/border.bin" - -BattleFrontier_ScottsHouse_MapBlockdata:: - .incbin "data/layouts/BattleFrontier_ScottsHouse/map.bin" - - .align 2 -BattleFrontier_ScottsHouse_Layout:: - .4byte 0x6 - .4byte 0x8 - .4byte BattleFrontier_ScottsHouse_MapBorder - .4byte BattleFrontier_ScottsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/BattlePyramidSquare01/layout.inc b/data/layouts/BattlePyramidSquare01/layout.inc deleted file mode 100644 index fe710cc40..000000000 --- a/data/layouts/BattlePyramidSquare01/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare01_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare01/border.bin" - -BattlePyramidSquare01_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare01/map.bin" - - .align 2 -BattlePyramidSquare01_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare01_MapBorder - .4byte BattlePyramidSquare01_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare02/layout.inc b/data/layouts/BattlePyramidSquare02/layout.inc deleted file mode 100644 index 6aa5b7aa9..000000000 --- a/data/layouts/BattlePyramidSquare02/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare02_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare02/border.bin" - -BattlePyramidSquare02_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare02/map.bin" - - .align 2 -BattlePyramidSquare02_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare02_MapBorder - .4byte BattlePyramidSquare02_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare03/layout.inc b/data/layouts/BattlePyramidSquare03/layout.inc deleted file mode 100644 index 4da41f9e9..000000000 --- a/data/layouts/BattlePyramidSquare03/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare03_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare03/border.bin" - -BattlePyramidSquare03_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare03/map.bin" - - .align 2 -BattlePyramidSquare03_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare03_MapBorder - .4byte BattlePyramidSquare03_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare04/layout.inc b/data/layouts/BattlePyramidSquare04/layout.inc deleted file mode 100644 index c298ee6f4..000000000 --- a/data/layouts/BattlePyramidSquare04/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare04_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare04/border.bin" - -BattlePyramidSquare04_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare04/map.bin" - - .align 2 -BattlePyramidSquare04_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare04_MapBorder - .4byte BattlePyramidSquare04_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare05/layout.inc b/data/layouts/BattlePyramidSquare05/layout.inc deleted file mode 100644 index 87ce53274..000000000 --- a/data/layouts/BattlePyramidSquare05/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare05_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare05/border.bin" - -BattlePyramidSquare05_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare05/map.bin" - - .align 2 -BattlePyramidSquare05_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare05_MapBorder - .4byte BattlePyramidSquare05_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare06/layout.inc b/data/layouts/BattlePyramidSquare06/layout.inc deleted file mode 100644 index bcaeb89b0..000000000 --- a/data/layouts/BattlePyramidSquare06/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare06/border.bin" - -BattlePyramidSquare06_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare06/map.bin" - - .align 2 -BattlePyramidSquare06_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare06_MapBorder - .4byte BattlePyramidSquare06_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare07/layout.inc b/data/layouts/BattlePyramidSquare07/layout.inc deleted file mode 100644 index bb469b3c8..000000000 --- a/data/layouts/BattlePyramidSquare07/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare07_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare07/border.bin" - -BattlePyramidSquare07_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare07/map.bin" - - .align 2 -BattlePyramidSquare07_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare07_MapBorder - .4byte BattlePyramidSquare07_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare08/layout.inc b/data/layouts/BattlePyramidSquare08/layout.inc deleted file mode 100644 index df88b710f..000000000 --- a/data/layouts/BattlePyramidSquare08/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare08_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare08/border.bin" - -BattlePyramidSquare08_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare08/map.bin" - - .align 2 -BattlePyramidSquare08_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare08_MapBorder - .4byte BattlePyramidSquare08_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare09/layout.inc b/data/layouts/BattlePyramidSquare09/layout.inc deleted file mode 100644 index 2869d9ac2..000000000 --- a/data/layouts/BattlePyramidSquare09/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare09_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare09/border.bin" - -BattlePyramidSquare09_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare09/map.bin" - - .align 2 -BattlePyramidSquare09_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare09_MapBorder - .4byte BattlePyramidSquare09_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare10/layout.inc b/data/layouts/BattlePyramidSquare10/layout.inc deleted file mode 100644 index 2ba8e8124..000000000 --- a/data/layouts/BattlePyramidSquare10/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare10_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare10/border.bin" - -BattlePyramidSquare10_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare10/map.bin" - - .align 2 -BattlePyramidSquare10_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare10_MapBorder - .4byte BattlePyramidSquare10_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare11/layout.inc b/data/layouts/BattlePyramidSquare11/layout.inc deleted file mode 100644 index 190bddf10..000000000 --- a/data/layouts/BattlePyramidSquare11/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare11_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare11/border.bin" - -BattlePyramidSquare11_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare11/map.bin" - - .align 2 -BattlePyramidSquare11_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare11_MapBorder - .4byte BattlePyramidSquare11_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare12/layout.inc b/data/layouts/BattlePyramidSquare12/layout.inc deleted file mode 100644 index 199f66ace..000000000 --- a/data/layouts/BattlePyramidSquare12/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare12_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare12/border.bin" - -BattlePyramidSquare12_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare12/map.bin" - - .align 2 -BattlePyramidSquare12_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare12_MapBorder - .4byte BattlePyramidSquare12_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare13/layout.inc b/data/layouts/BattlePyramidSquare13/layout.inc deleted file mode 100644 index 351b04227..000000000 --- a/data/layouts/BattlePyramidSquare13/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare13_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare13/border.bin" - -BattlePyramidSquare13_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare13/map.bin" - - .align 2 -BattlePyramidSquare13_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare13_MapBorder - .4byte BattlePyramidSquare13_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare14/layout.inc b/data/layouts/BattlePyramidSquare14/layout.inc deleted file mode 100644 index 653ad161b..000000000 --- a/data/layouts/BattlePyramidSquare14/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare14_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare14/border.bin" - -BattlePyramidSquare14_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare14/map.bin" - - .align 2 -BattlePyramidSquare14_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare14_MapBorder - .4byte BattlePyramidSquare14_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare15/layout.inc b/data/layouts/BattlePyramidSquare15/layout.inc deleted file mode 100644 index 24090c671..000000000 --- a/data/layouts/BattlePyramidSquare15/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare15_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare15/border.bin" - -BattlePyramidSquare15_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare15/map.bin" - - .align 2 -BattlePyramidSquare15_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare15_MapBorder - .4byte BattlePyramidSquare15_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattlePyramidSquare16/layout.inc b/data/layouts/BattlePyramidSquare16/layout.inc deleted file mode 100644 index 67187b9bf..000000000 --- a/data/layouts/BattlePyramidSquare16/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare16_MapBorder:: - .incbin "data/layouts/BattlePyramidSquare16/border.bin" - -BattlePyramidSquare16_MapBlockdata:: - .incbin "data/layouts/BattlePyramidSquare16/map.bin" - - .align 2 -BattlePyramidSquare16_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte BattlePyramidSquare16_MapBorder - .4byte BattlePyramidSquare16_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePyramid - diff --git a/data/layouts/BattleTentBattleRoom/layout.inc b/data/layouts/BattleTentBattleRoom/layout.inc deleted file mode 100644 index 4f9a8e626..000000000 --- a/data/layouts/BattleTentBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentBattleRoom_MapBorder:: - .incbin "data/layouts/BattleTentBattleRoom/border.bin" - -BattleTentBattleRoom_MapBlockdata:: - .incbin "data/layouts/BattleTentBattleRoom/map.bin" - - .align 2 -BattleTentBattleRoom_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte BattleTentBattleRoom_MapBorder - .4byte BattleTentBattleRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BattleTentCorridor/layout.inc b/data/layouts/BattleTentCorridor/layout.inc deleted file mode 100644 index 9abcdefa4..000000000 --- a/data/layouts/BattleTentCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentCorridor_MapBorder:: - .incbin "data/layouts/BattleTentCorridor/border.bin" - -BattleTentCorridor_MapBlockdata:: - .incbin "data/layouts/BattleTentCorridor/map.bin" - - .align 2 -BattleTentCorridor_Layout:: - .4byte 0x5 - .4byte 0x8 - .4byte BattleTentCorridor_MapBorder - .4byte BattleTentCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BattleTentLobby/layout.inc b/data/layouts/BattleTentLobby/layout.inc deleted file mode 100644 index a3216370f..000000000 --- a/data/layouts/BattleTentLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTentLobby_MapBorder:: - .incbin "data/layouts/BattleTentLobby/border.bin" - -BattleTentLobby_MapBlockdata:: - .incbin "data/layouts/BattleTentLobby/map.bin" - - .align 2 -BattleTentLobby_Layout:: - .4byte 0xd - .4byte 0xa - .4byte BattleTentLobby_MapBorder - .4byte BattleTentLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleTent - diff --git a/data/layouts/BirthIsland_Exterior/layout.inc b/data/layouts/BirthIsland_Exterior/layout.inc deleted file mode 100644 index 17dc4f0fb..000000000 --- a/data/layouts/BirthIsland_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Exterior_MapBorder:: - .incbin "data/layouts/BirthIsland_Exterior/border.bin" - -BirthIsland_Exterior_MapBlockdata:: - .incbin "data/layouts/BirthIsland_Exterior/map.bin" - - .align 2 -BirthIsland_Exterior_Layout:: - .4byte 0x1e - .4byte 0x1e - .4byte BirthIsland_Exterior_MapBorder - .4byte BirthIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc deleted file mode 100644 index 1113f89f2..000000000 --- a/data/layouts/CableCarStation/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CableCarStation_MapBorder:: - .incbin "data/layouts/CableCarStation/border.bin" - -CableCarStation_MapBlockdata:: - .incbin "data/layouts/CableCarStation/map.bin" - - .align 2 -CableCarStation_Layout:: - .4byte 0xd - .4byte 0xc - .4byte CableCarStation_MapBorder - .4byte CableCarStation_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc deleted file mode 100644 index 616af1655..000000000 --- a/data/layouts/CaveOfOrigin_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_1F_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_1F/border.bin" - -CaveOfOrigin_1F_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_1F/map.bin" - - .align 2 -CaveOfOrigin_1F_Layout:: - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_1F_MapBorder - .4byte CaveOfOrigin_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc deleted file mode 100644 index 5850f15c9..000000000 --- a/data/layouts/CaveOfOrigin_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_B1F_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_B1F/border.bin" - -CaveOfOrigin_B1F_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_B1F/map.bin" - - .align 2 -CaveOfOrigin_B1F_Layout:: - .4byte 0x13 - .4byte 0x13 - .4byte CaveOfOrigin_B1F_MapBorder - .4byte CaveOfOrigin_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc deleted file mode 100644 index 11e230ce3..000000000 --- a/data/layouts/CaveOfOrigin_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_Entrance_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_Entrance/border.bin" - -CaveOfOrigin_Entrance_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_Entrance/map.bin" - - .align 2 -CaveOfOrigin_Entrance_Layout:: - .4byte 0x13 - .4byte 0x1a - .4byte CaveOfOrigin_Entrance_MapBorder - .4byte CaveOfOrigin_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc deleted file mode 100644 index 294bf786a..000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap1_Layout:: - .4byte 0x17 - .4byte 0x17 - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc deleted file mode 100644 index c3a05f75f..000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap2_Layout:: - .4byte 0x15 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc b/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc deleted file mode 100644 index cbc5c052a..000000000 --- a/data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapBorder:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin" - -CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata:: - .incbin "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" - - .align 2 -CaveOfOrigin_UnusedRubySapphireMap3_Layout:: - .4byte 0x13 - .4byte 0x15 - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBorder - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc deleted file mode 100644 index 4d6e7571a..000000000 --- a/data/layouts/DesertRuins/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins_MapBorder:: - .incbin "data/layouts/DesertRuins/border.bin" - -DesertRuins_MapBlockdata:: - .incbin "data/layouts/DesertRuins/map.bin" - - .align 2 -DesertRuins_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte DesertRuins_MapBorder - .4byte DesertRuins_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DesertUnderpass/layout.inc b/data/layouts/DesertUnderpass/layout.inc deleted file mode 100644 index 9a17a128e..000000000 --- a/data/layouts/DesertUnderpass/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertUnderpass_MapBorder:: - .incbin "data/layouts/DesertUnderpass/border.bin" - -DesertUnderpass_MapBlockdata:: - .incbin "data/layouts/DesertUnderpass/map.bin" - - .align 2 -DesertUnderpass_Layout:: - .4byte 0x8b - .4byte 0x17 - .4byte DesertUnderpass_MapBorder - .4byte DesertUnderpass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc deleted file mode 100644 index 28ccdc43c..000000000 --- a/data/layouts/DewfordTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_MapBorder:: - .incbin "data/layouts/DewfordTown/border.bin" - -DewfordTown_MapBlockdata:: - .incbin "data/layouts/DewfordTown/map.bin" - - .align 2 -DewfordTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte DewfordTown_MapBorder - .4byte DewfordTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc deleted file mode 100644 index bbada5bdc..000000000 --- a/data/layouts/DewfordTown_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Gym_MapBorder:: - .incbin "data/layouts/DewfordTown_Gym/border.bin" - -DewfordTown_Gym_MapBlockdata:: - .incbin "data/layouts/DewfordTown_Gym/map.bin" - - .align 2 -DewfordTown_Gym_Layout:: - .4byte 0x12 - .4byte 0x1c - .4byte DewfordTown_Gym_MapBorder - .4byte DewfordTown_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_DewfordGym - diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc deleted file mode 100644 index bd9cd03ae..000000000 --- a/data/layouts/DewfordTown_Hall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Hall_MapBorder:: - .incbin "data/layouts/DewfordTown_Hall/border.bin" - -DewfordTown_Hall_MapBlockdata:: - .incbin "data/layouts/DewfordTown_Hall/map.bin" - - .align 2 -DewfordTown_Hall_Layout:: - .4byte 0x11 - .4byte 0x9 - .4byte DewfordTown_Hall_MapBorder - .4byte DewfordTown_Hall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc deleted file mode 100644 index 61d112c1e..000000000 --- a/data/layouts/DoubleBattleColosseum/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapBorder:: - .incbin "data/layouts/DoubleBattleColosseum/border.bin" - -DoubleBattleColosseum_MapBlockdata:: - .incbin "data/layouts/DoubleBattleColosseum/map.bin" - - .align 2 -DoubleBattleColosseum_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte DoubleBattleColosseum_MapBorder - .4byte DoubleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc deleted file mode 100644 index 16c02fbaa..000000000 --- a/data/layouts/EverGrandeCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_MapBorder:: - .incbin "data/layouts/EverGrandeCity/border.bin" - -EverGrandeCity_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity/map.bin" - - .align 2 -EverGrandeCity_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte EverGrandeCity_MapBorder - .4byte EverGrandeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_EverGrande - diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc deleted file mode 100644 index dad4c7ef3..000000000 --- a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ChampionsRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin" - -EverGrandeCity_ChampionsRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" - - .align 2 -EverGrandeCity_ChampionsRoom_Layout:: - .4byte 0xd - .4byte 0xd - .4byte EverGrandeCity_ChampionsRoom_MapBorder - .4byte EverGrandeCity_ChampionsRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc deleted file mode 100644 index 9c140d49d..000000000 --- a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_DrakesRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin" - -EverGrandeCity_DrakesRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin" - - .align 2 -EverGrandeCity_DrakesRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_DrakesRoom_MapBorder - .4byte EverGrandeCity_DrakesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc deleted file mode 100644 index bcd610d8c..000000000 --- a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_GlaciasRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin" - -EverGrandeCity_GlaciasRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" - - .align 2 -EverGrandeCity_GlaciasRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_GlaciasRoom_MapBorder - .4byte EverGrandeCity_GlaciasRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_Hall4/layout.inc b/data/layouts/EverGrandeCity_Hall4/layout.inc deleted file mode 100644 index 464fc8998..000000000 --- a/data/layouts/EverGrandeCity_Hall4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall4_MapBorder:: - .incbin "data/layouts/EverGrandeCity_Hall4/border.bin" - -EverGrandeCity_Hall4_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_Hall4/map.bin" - - .align 2 -EverGrandeCity_Hall4_Layout:: - .4byte 0xb - .4byte 0x22 - .4byte EverGrandeCity_Hall4_MapBorder - .4byte EverGrandeCity_Hall4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc deleted file mode 100644 index deaa4429d..000000000 --- a/data/layouts/EverGrandeCity_HallOfFame/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_HallOfFame_MapBorder:: - .incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin" - -EverGrandeCity_HallOfFame_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin" - - .align 2 -EverGrandeCity_HallOfFame_Layout:: - .4byte 0xf - .4byte 0x11 - .4byte EverGrandeCity_HallOfFame_MapBorder - .4byte EverGrandeCity_HallOfFame_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc deleted file mode 100644 index b02d5c312..000000000 --- a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PhoebesRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin" - -EverGrandeCity_PhoebesRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" - - .align 2 -EverGrandeCity_PhoebesRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_PhoebesRoom_MapBorder - .4byte EverGrandeCity_PhoebesRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc deleted file mode 100644 index d84e6449f..000000000 --- a/data/layouts/EverGrandeCity_PokemonLeague_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_MapBorder:: - .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin" - -EverGrandeCity_PokemonLeague_1F_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" - - .align 2 -EverGrandeCity_PokemonLeague_1F_Layout:: - .4byte 0x13 - .4byte 0xc - .4byte EverGrandeCity_PokemonLeague_1F_MapBorder - .4byte EverGrandeCity_PokemonLeague_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/EverGrandeCity_ShortHall/layout.inc b/data/layouts/EverGrandeCity_ShortHall/layout.inc deleted file mode 100644 index 2159c894d..000000000 --- a/data/layouts/EverGrandeCity_ShortHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ShortHall_MapBorder:: - .incbin "data/layouts/EverGrandeCity_ShortHall/border.bin" - -EverGrandeCity_ShortHall_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_ShortHall/map.bin" - - .align 2 -EverGrandeCity_ShortHall_Layout:: - .4byte 0xb - .4byte 0xd - .4byte EverGrandeCity_ShortHall_MapBorder - .4byte EverGrandeCity_ShortHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc deleted file mode 100644 index 86ffa16a1..000000000 --- a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_SidneysRoom_MapBorder:: - .incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin" - -EverGrandeCity_SidneysRoom_MapBlockdata:: - .incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin" - - .align 2 -EverGrandeCity_SidneysRoom_Layout:: - .4byte 0xd - .4byte 0xe - .4byte EverGrandeCity_SidneysRoom_MapBorder - .4byte EverGrandeCity_SidneysRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_EliteFour - diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc deleted file mode 100644 index 7f0894903..000000000 --- a/data/layouts/FallarborTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_MapBorder:: - .incbin "data/layouts/FallarborTown/border.bin" - -FallarborTown_MapBlockdata:: - .incbin "data/layouts/FallarborTown/map.bin" - - .align 2 -FallarborTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte FallarborTown_MapBorder - .4byte FallarborTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc deleted file mode 100644 index 66acc546b..000000000 --- a/data/layouts/FallarborTown_LeftoverRSContestHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_LeftoverRSContestHall_MapBorder:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin" - -FallarborTown_LeftoverRSContestHall_MapBlockdata:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestHall_Layout:: - .4byte 0x15 - .4byte 0x12 - .4byte FallarborTown_LeftoverRSContestHall_MapBorder - .4byte FallarborTown_LeftoverRSContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc b/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc deleted file mode 100644 index 3ad232728..000000000 --- a/data/layouts/FallarborTown_LeftoverRSContestLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_LeftoverRSContestLobby_MapBorder:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin" - -FallarborTown_LeftoverRSContestLobby_MapBlockdata:: - .incbin "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" - - .align 2 -FallarborTown_LeftoverRSContestLobby_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte FallarborTown_LeftoverRSContestLobby_MapBorder - .4byte FallarborTown_LeftoverRSContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/FarawayIsland_Entrance/layout.inc b/data/layouts/FarawayIsland_Entrance/layout.inc deleted file mode 100644 index c7d6bef91..000000000 --- a/data/layouts/FarawayIsland_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Entrance_MapBorder:: - .incbin "data/layouts/FarawayIsland_Entrance/border.bin" - -FarawayIsland_Entrance_MapBlockdata:: - .incbin "data/layouts/FarawayIsland_Entrance/map.bin" - - .align 2 -FarawayIsland_Entrance_Layout:: - .4byte 0x22 - .4byte 0x2e - .4byte FarawayIsland_Entrance_MapBorder - .4byte FarawayIsland_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/FarawayIsland_Interior/layout.inc b/data/layouts/FarawayIsland_Interior/layout.inc deleted file mode 100644 index 787dd53c9..000000000 --- a/data/layouts/FarawayIsland_Interior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Interior_MapBorder:: - .incbin "data/layouts/FarawayIsland_Interior/border.bin" - -FarawayIsland_Interior_MapBlockdata:: - .incbin "data/layouts/FarawayIsland_Interior/map.bin" - - .align 2 -FarawayIsland_Interior_Layout:: - .4byte 0x1d - .4byte 0x1a - .4byte FarawayIsland_Interior_MapBorder - .4byte FarawayIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc deleted file mode 100644 index c129ae715..000000000 --- a/data/layouts/FieryPath/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath_MapBorder:: - .incbin "data/layouts/FieryPath/border.bin" - -FieryPath_MapBlockdata:: - .incbin "data/layouts/FieryPath/map.bin" - - .align 2 -FieryPath_Layout:: - .4byte 0x23 - .4byte 0x26 - .4byte FieryPath_MapBorder - .4byte FieryPath_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc deleted file mode 100644 index 02564b36a..000000000 --- a/data/layouts/FortreeCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_MapBorder:: - .incbin "data/layouts/FortreeCity/border.bin" - -FortreeCity_MapBlockdata:: - .incbin "data/layouts/FortreeCity/map.bin" - - .align 2 -FortreeCity_Layout:: - .4byte 0x28 - .4byte 0x14 - .4byte FortreeCity_MapBorder - .4byte FortreeCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc deleted file mode 100644 index 6460a35b5..000000000 --- a/data/layouts/FortreeCity_DecorationShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_DecorationShop_MapBorder:: - .incbin "data/layouts/FortreeCity_DecorationShop/border.bin" - -FortreeCity_DecorationShop_MapBlockdata:: - .incbin "data/layouts/FortreeCity_DecorationShop/map.bin" - - .align 2 -FortreeCity_DecorationShop_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_DecorationShop_MapBorder - .4byte FortreeCity_DecorationShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc deleted file mode 100644 index da7f1e73e..000000000 --- a/data/layouts/FortreeCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Gym_MapBorder:: - .incbin "data/layouts/FortreeCity_Gym/border.bin" - -FortreeCity_Gym_MapBlockdata:: - .incbin "data/layouts/FortreeCity_Gym/map.bin" - - .align 2 -FortreeCity_Gym_Layout:: - .4byte 0x14 - .4byte 0x19 - .4byte FortreeCity_Gym_MapBorder - .4byte FortreeCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_FortreeGym - diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc deleted file mode 100644 index 214846c22..000000000 --- a/data/layouts/FortreeCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House1_MapBorder:: - .incbin "data/layouts/FortreeCity_House1/border.bin" - -FortreeCity_House1_MapBlockdata:: - .incbin "data/layouts/FortreeCity_House1/map.bin" - - .align 2 -FortreeCity_House1_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House1_MapBorder - .4byte FortreeCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc deleted file mode 100644 index 3aa0898bf..000000000 --- a/data/layouts/FortreeCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House2_MapBorder:: - .incbin "data/layouts/FortreeCity_House2/border.bin" - -FortreeCity_House2_MapBlockdata:: - .incbin "data/layouts/FortreeCity_House2/map.bin" - - .align 2 -FortreeCity_House2_Layout:: - .4byte 0x8 - .4byte 0x6 - .4byte FortreeCity_House2_MapBorder - .4byte FortreeCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc deleted file mode 100644 index 009fd12f5..000000000 --- a/data/layouts/GraniteCave_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_1F_MapBorder:: - .incbin "data/layouts/GraniteCave_1F/border.bin" - -GraniteCave_1F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_1F/map.bin" - - .align 2 -GraniteCave_1F_Layout:: - .4byte 0x2a - .4byte 0xf - .4byte GraniteCave_1F_MapBorder - .4byte GraniteCave_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc deleted file mode 100644 index a57b238be..000000000 --- a/data/layouts/GraniteCave_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F_MapBorder:: - .incbin "data/layouts/GraniteCave_B1F/border.bin" - -GraniteCave_B1F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_B1F/map.bin" - - .align 2 -GraniteCave_B1F_Layout:: - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B1F_MapBorder - .4byte GraniteCave_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc deleted file mode 100644 index 7ffd04b00..000000000 --- a/data/layouts/GraniteCave_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B2F_MapBorder:: - .incbin "data/layouts/GraniteCave_B2F/border.bin" - -GraniteCave_B2F_MapBlockdata:: - .incbin "data/layouts/GraniteCave_B2F/map.bin" - - .align 2 -GraniteCave_B2F_Layout:: - .4byte 0x20 - .4byte 0x1a - .4byte GraniteCave_B2F_MapBorder - .4byte GraniteCave_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc deleted file mode 100644 index 5ee4fade4..000000000 --- a/data/layouts/GraniteCave_StevensRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_StevensRoom_MapBorder:: - .incbin "data/layouts/GraniteCave_StevensRoom/border.bin" - -GraniteCave_StevensRoom_MapBlockdata:: - .incbin "data/layouts/GraniteCave_StevensRoom/map.bin" - - .align 2 -GraniteCave_StevensRoom_Layout:: - .4byte 0xf - .4byte 0xe - .4byte GraniteCave_StevensRoom_MapBorder - .4byte GraniteCave_StevensRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc deleted file mode 100644 index e95b8ec9d..000000000 --- a/data/layouts/Harbor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Harbor_MapBorder:: - .incbin "data/layouts/Harbor/border.bin" - -Harbor_MapBlockdata:: - .incbin "data/layouts/Harbor/map.bin" - - .align 2 -Harbor_Layout:: - .4byte 0x18 - .4byte 0xf - .4byte Harbor_MapBorder - .4byte Harbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc deleted file mode 100644 index b93f24df4..000000000 --- a/data/layouts/House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House1_MapBorder:: - .incbin "data/layouts/House1/border.bin" - -House1_MapBlockdata:: - .incbin "data/layouts/House1/map.bin" - - .align 2 -House1_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte House1_MapBorder - .4byte House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc deleted file mode 100644 index 35566d8d1..000000000 --- a/data/layouts/House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House2_MapBorder:: - .incbin "data/layouts/House2/border.bin" - -House2_MapBlockdata:: - .incbin "data/layouts/House2/map.bin" - - .align 2 -House2_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte House2_MapBorder - .4byte House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc deleted file mode 100644 index 6e2de11f4..000000000 --- a/data/layouts/House3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House3_MapBorder:: - .incbin "data/layouts/House3/border.bin" - -House3_MapBlockdata:: - .incbin "data/layouts/House3/map.bin" - - .align 2 -House3_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte House3_MapBorder - .4byte House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc deleted file mode 100644 index b06b3d427..000000000 --- a/data/layouts/House4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -House4_MapBorder:: - .incbin "data/layouts/House4/border.bin" - -House4_MapBlockdata:: - .incbin "data/layouts/House4/map.bin" - - .align 2 -House4_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte House4_MapBorder - .4byte House4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc deleted file mode 100644 index 7fb8d2c9b..000000000 --- a/data/layouts/HouseWithBed/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -HouseWithBed_MapBorder:: - .incbin "data/layouts/HouseWithBed/border.bin" - -HouseWithBed_MapBlockdata:: - .incbin "data/layouts/HouseWithBed/map.bin" - - .align 2 -HouseWithBed_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte HouseWithBed_MapBorder - .4byte HouseWithBed_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc deleted file mode 100644 index d1ddf8686..000000000 --- a/data/layouts/InsideOfTruck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -InsideOfTruck_MapBorder:: - .incbin "data/layouts/InsideOfTruck/border.bin" - -InsideOfTruck_MapBlockdata:: - .incbin "data/layouts/InsideOfTruck/map.bin" - - .align 2 -InsideOfTruck_Layout:: - .4byte 0x5 - .4byte 0x5 - .4byte InsideOfTruck_MapBorder - .4byte InsideOfTruck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideOfTruck - diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc deleted file mode 100644 index 5a3035b72..000000000 --- a/data/layouts/IslandCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave_MapBorder:: - .incbin "data/layouts/IslandCave/border.bin" - -IslandCave_MapBlockdata:: - .incbin "data/layouts/IslandCave/map.bin" - - .align 2 -IslandCave_Layout:: - .4byte 0x11 - .4byte 0x21 - .4byte IslandCave_MapBorder - .4byte IslandCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/IslandHarbor/layout.inc b/data/layouts/IslandHarbor/layout.inc deleted file mode 100644 index 7fc86dca4..000000000 --- a/data/layouts/IslandHarbor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandHarbor_MapBorder:: - .incbin "data/layouts/IslandHarbor/border.bin" - -IslandHarbor_MapBlockdata:: - .incbin "data/layouts/IslandHarbor/map.bin" - - .align 2 -IslandHarbor_Layout:: - .4byte 0x11 - .4byte 0xd - .4byte IslandHarbor_MapBorder - .4byte IslandHarbor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_IslandHarbor - diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc deleted file mode 100644 index 5620551b8..000000000 --- a/data/layouts/JaggedPass/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -JaggedPass_MapBorder:: - .incbin "data/layouts/JaggedPass/border.bin" - -JaggedPass_MapBlockdata:: - .incbin "data/layouts/JaggedPass/map.bin" - - .align 2 -JaggedPass_Layout:: - .4byte 0x1e - .4byte 0x2e - .4byte JaggedPass_MapBorder - .4byte JaggedPass_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc deleted file mode 100644 index 662955430..000000000 --- a/data/layouts/LavaridgeTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_MapBorder:: - .incbin "data/layouts/LavaridgeTown/border.bin" - -LavaridgeTown_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown/map.bin" - - .align 2 -LavaridgeTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte LavaridgeTown_MapBorder - .4byte LavaridgeTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc deleted file mode 100644 index 36f4cb826..000000000 --- a/data/layouts/LavaridgeTown_Gym_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin" - -LavaridgeTown_Gym_1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin" - - .align 2 -LavaridgeTown_Gym_1F_Layout:: - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_1F_MapBorder - .4byte LavaridgeTown_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc deleted file mode 100644 index 9b80d7f90..000000000 --- a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_B1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin" - -LavaridgeTown_Gym_B1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin" - - .align 2 -LavaridgeTown_Gym_B1F_Layout:: - .4byte 0x11 - .4byte 0x13 - .4byte LavaridgeTown_Gym_B1F_MapBorder - .4byte LavaridgeTown_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LavaridgeGym - diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc deleted file mode 100644 index c59e12e49..000000000 --- a/data/layouts/LavaridgeTown_HerbShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_HerbShop_MapBorder:: - .incbin "data/layouts/LavaridgeTown_HerbShop/border.bin" - -LavaridgeTown_HerbShop_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_HerbShop/map.bin" - - .align 2 -LavaridgeTown_HerbShop_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte LavaridgeTown_HerbShop_MapBorder - .4byte LavaridgeTown_HerbShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc deleted file mode 100644 index e38d63815..000000000 --- a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_MapBorder:: - .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin" - -LavaridgeTown_PokemonCenter_1F_MapBlockdata:: - .incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" - - .align 2 -LavaridgeTown_PokemonCenter_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte LavaridgeTown_PokemonCenter_1F_MapBorder - .4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc deleted file mode 100644 index ed4bd81e4..000000000 --- a/data/layouts/LilycoveCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_MapBorder:: - .incbin "data/layouts/LilycoveCity/border.bin" - -LilycoveCity_MapBlockdata:: - .incbin "data/layouts/LilycoveCity/map.bin" - - .align 2 -LilycoveCity_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte LilycoveCity_MapBorder - .4byte LilycoveCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc deleted file mode 100644 index 61e6e27ee..000000000 --- a/data/layouts/LilycoveCity_ContestHall/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestHall_MapBorder:: - .incbin "data/layouts/LilycoveCity_ContestHall/border.bin" - -LilycoveCity_ContestHall_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_ContestHall/map.bin" - - .align 2 -LilycoveCity_ContestHall_Layout:: - .4byte 0x33 - .4byte 0x21 - .4byte LilycoveCity_ContestHall_MapBorder - .4byte LilycoveCity_ContestHall_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc deleted file mode 100644 index 20cf4389f..000000000 --- a/data/layouts/LilycoveCity_ContestLobby/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestLobby_MapBorder:: - .incbin "data/layouts/LilycoveCity_ContestLobby/border.bin" - -LilycoveCity_ContestLobby_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_ContestLobby/map.bin" - - .align 2 -LilycoveCity_ContestLobby_Layout:: - .4byte 0x1f - .4byte 0xc - .4byte LilycoveCity_ContestLobby_MapBorder - .4byte LilycoveCity_ContestLobby_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc deleted file mode 100644 index b275834f7..000000000 --- a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin" - -LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_1F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc deleted file mode 100644 index 82a294c48..000000000 --- a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin" - -LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" - - .align 2 -LilycoveCity_CoveLilyMotel_2F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte LilycoveCity_CoveLilyMotel_2F_MapBorder - .4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc deleted file mode 100644 index 899e934bd..000000000 --- a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin" - -LilycoveCity_DepartmentStoreElevator_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreElevator_Layout:: - .4byte 0x5 - .4byte 0x6 - .4byte LilycoveCity_DepartmentStoreElevator_MapBorder - .4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattleFrontier - diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc deleted file mode 100644 index d40483308..000000000 --- a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin" - -LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" - - .align 2 -LilycoveCity_DepartmentStoreRooftop_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte LilycoveCity_DepartmentStoreRooftop_MapBorder - .4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc deleted file mode 100644 index d3b5d9420..000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin" - -LilycoveCity_DepartmentStore_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_1F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_1F_MapBorder - .4byte LilycoveCity_DepartmentStore_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc deleted file mode 100644 index e5b01c8fd..000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin" - -LilycoveCity_DepartmentStore_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_2F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_2F_MapBorder - .4byte LilycoveCity_DepartmentStore_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc deleted file mode 100644 index 5d7aa93eb..000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin" - -LilycoveCity_DepartmentStore_3F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_3F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_3F_MapBorder - .4byte LilycoveCity_DepartmentStore_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc deleted file mode 100644 index b4585ca03..000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin" - -LilycoveCity_DepartmentStore_4F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_4F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_4F_MapBorder - .4byte LilycoveCity_DepartmentStore_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc deleted file mode 100644 index ade5e4bf5..000000000 --- a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_5F_MapBorder:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin" - -LilycoveCity_DepartmentStore_5F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" - - .align 2 -LilycoveCity_DepartmentStore_5F_Layout:: - .4byte 0x12 - .4byte 0x8 - .4byte LilycoveCity_DepartmentStore_5F_MapBorder - .4byte LilycoveCity_DepartmentStore_5F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc deleted file mode 100644 index de51e7fd6..000000000 --- a/data/layouts/LilycoveCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House2_MapBorder:: - .incbin "data/layouts/LilycoveCity_House2/border.bin" - -LilycoveCity_House2_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_House2/map.bin" - - .align 2 -LilycoveCity_House2_Layout:: - .4byte 0x8 - .4byte 0x8 - .4byte LilycoveCity_House2_MapBorder - .4byte LilycoveCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc deleted file mode 100644 index 0dab4095c..000000000 --- a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_MapBorder:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin" - -LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_1F_Layout:: - .4byte 0x15 - .4byte 0xe - .4byte LilycoveCity_LilycoveMuseum_1F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc deleted file mode 100644 index aea446410..000000000 --- a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_MapBorder:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin" - -LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" - - .align 2 -LilycoveCity_LilycoveMuseum_2F_Layout:: - .4byte 0x16 - .4byte 0xd - .4byte LilycoveCity_LilycoveMuseum_2F_MapBorder - .4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_LilycoveMuseum - diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc deleted file mode 100644 index 9b30c7c08..000000000 --- a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_MapBorder:: - .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin" - -LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: - .incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" - - .align 2 -LilycoveCity_PokemonTrainerFanClub_Layout:: - .4byte 0xc - .4byte 0xe - .4byte LilycoveCity_PokemonTrainerFanClub_MapBorder - .4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc deleted file mode 100644 index e71fe2df3..000000000 --- a/data/layouts/LinkContestRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom1_MapBorder:: - .incbin "data/layouts/LinkContestRoom1/border.bin" - -LinkContestRoom1_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom1/map.bin" - - .align 2 -LinkContestRoom1_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom1_MapBorder - .4byte LinkContestRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc deleted file mode 100644 index 2dd66ab96..000000000 --- a/data/layouts/LinkContestRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom2_MapBorder:: - .incbin "data/layouts/LinkContestRoom2/border.bin" - -LinkContestRoom2_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom2/map.bin" - - .align 2 -LinkContestRoom2_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom2_MapBorder - .4byte LinkContestRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc deleted file mode 100644 index c53cad723..000000000 --- a/data/layouts/LinkContestRoom3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom3_MapBorder:: - .incbin "data/layouts/LinkContestRoom3/border.bin" - -LinkContestRoom3_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom3/map.bin" - - .align 2 -LinkContestRoom3_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom3_MapBorder - .4byte LinkContestRoom3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc deleted file mode 100644 index 883918f37..000000000 --- a/data/layouts/LinkContestRoom4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom4_MapBorder:: - .incbin "data/layouts/LinkContestRoom4/border.bin" - -LinkContestRoom4_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom4/map.bin" - - .align 2 -LinkContestRoom4_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom4_MapBorder - .4byte LinkContestRoom4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc deleted file mode 100644 index 72a9d9f4e..000000000 --- a/data/layouts/LinkContestRoom5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom5_MapBorder:: - .incbin "data/layouts/LinkContestRoom5/border.bin" - -LinkContestRoom5_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom5/map.bin" - - .align 2 -LinkContestRoom5_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom5_MapBorder - .4byte LinkContestRoom5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc deleted file mode 100644 index 33db4b56d..000000000 --- a/data/layouts/LinkContestRoom6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom6_MapBorder:: - .incbin "data/layouts/LinkContestRoom6/border.bin" - -LinkContestRoom6_MapBlockdata:: - .incbin "data/layouts/LinkContestRoom6/map.bin" - - .align 2 -LinkContestRoom6_Layout:: - .4byte 0xf - .4byte 0xb - .4byte LinkContestRoom6_MapBorder - .4byte LinkContestRoom6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Contest - diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc deleted file mode 100644 index 8193ac695..000000000 --- a/data/layouts/LittlerootTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MapBorder:: - .incbin "data/layouts/LittlerootTown/border.bin" - -LittlerootTown_MapBlockdata:: - .incbin "data/layouts/LittlerootTown/map.bin" - - .align 2 -LittlerootTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte LittlerootTown_MapBorder - .4byte LittlerootTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc deleted file mode 100644 index 092c7d20b..000000000 --- a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_1F_MapBorder:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin" - -LittlerootTown_BrendansHouse_1F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_1F_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_BrendansHouse_1F_MapBorder - .4byte LittlerootTown_BrendansHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc deleted file mode 100644 index 5235f4d98..000000000 --- a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_2F_MapBorder:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin" - -LittlerootTown_BrendansHouse_2F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" - - .align 2 -LittlerootTown_BrendansHouse_2F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_BrendansHouse_2F_MapBorder - .4byte LittlerootTown_BrendansHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc deleted file mode 100644 index 88b81a289..000000000 --- a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_1F_MapBorder:: - .incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin" - -LittlerootTown_MaysHouse_1F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_1F_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte LittlerootTown_MaysHouse_1F_MapBorder - .4byte LittlerootTown_MaysHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc deleted file mode 100644 index 0b6134dbd..000000000 --- a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_2F_MapBorder:: - .incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin" - -LittlerootTown_MaysHouse_2F_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" - - .align 2 -LittlerootTown_MaysHouse_2F_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte LittlerootTown_MaysHouse_2F_MapBorder - .4byte LittlerootTown_MaysHouse_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BrendansMaysHouse - diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc deleted file mode 100644 index d0be539a0..000000000 --- a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_MapBorder:: - .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin" - -LittlerootTown_ProfessorBirchsLab_MapBlockdata:: - .incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" - - .align 2 -LittlerootTown_ProfessorBirchsLab_Layout:: - .4byte 0xd - .4byte 0xd - .4byte LittlerootTown_ProfessorBirchsLab_MapBorder - .4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc deleted file mode 100644 index b50c7f015..000000000 --- a/data/layouts/MagmaHideout_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_1F_MapBorder:: - .incbin "data/layouts/MagmaHideout_1F/border.bin" - -MagmaHideout_1F_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_1F/map.bin" - - .align 2 -MagmaHideout_1F_Layout:: - .4byte 0x25 - .4byte 0x26 - .4byte MagmaHideout_1F_MapBorder - .4byte MagmaHideout_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_2F_1R/layout.inc b/data/layouts/MagmaHideout_2F_1R/layout.inc deleted file mode 100644 index b9f0d27d7..000000000 --- a/data/layouts/MagmaHideout_2F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_1R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_1R/border.bin" - -MagmaHideout_2F_1R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_1R/map.bin" - - .align 2 -MagmaHideout_2F_1R_Layout:: - .4byte 0x21 - .4byte 0x27 - .4byte MagmaHideout_2F_1R_MapBorder - .4byte MagmaHideout_2F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_2F_2R/layout.inc b/data/layouts/MagmaHideout_2F_2R/layout.inc deleted file mode 100644 index 01507909c..000000000 --- a/data/layouts/MagmaHideout_2F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_2R/border.bin" - -MagmaHideout_2F_2R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_2R/map.bin" - - .align 2 -MagmaHideout_2F_2R_Layout:: - .4byte 0x31 - .4byte 0x1c - .4byte MagmaHideout_2F_2R_MapBorder - .4byte MagmaHideout_2F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_2F_3R/layout.inc b/data/layouts/MagmaHideout_2F_3R/layout.inc deleted file mode 100644 index d88fb50fd..000000000 --- a/data/layouts/MagmaHideout_2F_3R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_3R_MapBorder:: - .incbin "data/layouts/MagmaHideout_2F_3R/border.bin" - -MagmaHideout_2F_3R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_2F_3R/map.bin" - - .align 2 -MagmaHideout_2F_3R_Layout:: - .4byte 0x3c - .4byte 0x13 - .4byte MagmaHideout_2F_3R_MapBorder - .4byte MagmaHideout_2F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_3F_1R/layout.inc b/data/layouts/MagmaHideout_3F_1R/layout.inc deleted file mode 100644 index c2199b2f2..000000000 --- a/data/layouts/MagmaHideout_3F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_1R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_1R/border.bin" - -MagmaHideout_3F_1R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_1R/map.bin" - - .align 2 -MagmaHideout_3F_1R_Layout:: - .4byte 0x1c - .4byte 0x18 - .4byte MagmaHideout_3F_1R_MapBorder - .4byte MagmaHideout_3F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_3F_2R/layout.inc b/data/layouts/MagmaHideout_3F_2R/layout.inc deleted file mode 100644 index 2c4662a49..000000000 --- a/data/layouts/MagmaHideout_3F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_2R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_2R/border.bin" - -MagmaHideout_3F_2R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_2R/map.bin" - - .align 2 -MagmaHideout_3F_2R_Layout:: - .4byte 0x18 - .4byte 0x11 - .4byte MagmaHideout_3F_2R_MapBorder - .4byte MagmaHideout_3F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_3F_3R/layout.inc b/data/layouts/MagmaHideout_3F_3R/layout.inc deleted file mode 100644 index 4042b9653..000000000 --- a/data/layouts/MagmaHideout_3F_3R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_3R_MapBorder:: - .incbin "data/layouts/MagmaHideout_3F_3R/border.bin" - -MagmaHideout_3F_3R_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_3F_3R/map.bin" - - .align 2 -MagmaHideout_3F_3R_Layout:: - .4byte 0x21 - .4byte 0x18 - .4byte MagmaHideout_3F_3R_MapBorder - .4byte MagmaHideout_3F_3R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MagmaHideout_4F/layout.inc b/data/layouts/MagmaHideout_4F/layout.inc deleted file mode 100644 index d7f8c547c..000000000 --- a/data/layouts/MagmaHideout_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_4F_MapBorder:: - .incbin "data/layouts/MagmaHideout_4F/border.bin" - -MagmaHideout_4F_MapBlockdata:: - .incbin "data/layouts/MagmaHideout_4F/map.bin" - - .align 2 -MagmaHideout_4F_Layout:: - .4byte 0x3b - .4byte 0x1c - .4byte MagmaHideout_4F_MapBorder - .4byte MagmaHideout_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MarineCave_End/layout.inc b/data/layouts/MarineCave_End/layout.inc deleted file mode 100644 index 256338b89..000000000 --- a/data/layouts/MarineCave_End/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_End_MapBorder:: - .incbin "data/layouts/MarineCave_End/border.bin" - -MarineCave_End_MapBlockdata:: - .incbin "data/layouts/MarineCave_End/map.bin" - - .align 2 -MarineCave_End_Layout:: - .4byte 0x1b - .4byte 0x1e - .4byte MarineCave_End_MapBorder - .4byte MarineCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/MarineCave_Entrance/layout.inc b/data/layouts/MarineCave_Entrance/layout.inc deleted file mode 100644 index 219c182d7..000000000 --- a/data/layouts/MarineCave_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_Entrance_MapBorder:: - .incbin "data/layouts/MarineCave_Entrance/border.bin" - -MarineCave_Entrance_MapBlockdata:: - .incbin "data/layouts/MarineCave_Entrance/map.bin" - - .align 2 -MarineCave_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte MarineCave_Entrance_MapBorder - .4byte MarineCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Mart/layout.inc b/data/layouts/Mart/layout.inc deleted file mode 100644 index 5233e09ab..000000000 --- a/data/layouts/Mart/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Mart_MapBorder:: - .incbin "data/layouts/Mart/border.bin" - -Mart_MapBlockdata:: - .incbin "data/layouts/Mart/map.bin" - - .align 2 -Mart_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte Mart_MapBorder - .4byte Mart_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc deleted file mode 100644 index 7a8c17da2..000000000 --- a/data/layouts/MauvilleCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_MapBorder:: - .incbin "data/layouts/MauvilleCity/border.bin" - -MauvilleCity_MapBlockdata:: - .incbin "data/layouts/MauvilleCity/map.bin" - - .align 2 -MauvilleCity_Layout:: - .4byte 0x28 - .4byte 0x14 - .4byte MauvilleCity_MapBorder - .4byte MauvilleCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc deleted file mode 100644 index f0d358a35..000000000 --- a/data/layouts/MauvilleCity_BikeShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop_MapBorder:: - .incbin "data/layouts/MauvilleCity_BikeShop/border.bin" - -MauvilleCity_BikeShop_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_BikeShop/map.bin" - - .align 2 -MauvilleCity_BikeShop_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte MauvilleCity_BikeShop_MapBorder - .4byte MauvilleCity_BikeShop_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc deleted file mode 100644 index 307f7205e..000000000 --- a/data/layouts/MauvilleCity_GameCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_GameCorner_MapBorder:: - .incbin "data/layouts/MauvilleCity_GameCorner/border.bin" - -MauvilleCity_GameCorner_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_GameCorner/map.bin" - - .align 2 -MauvilleCity_GameCorner_Layout:: - .4byte 0x16 - .4byte 0xb - .4byte MauvilleCity_GameCorner_MapBorder - .4byte MauvilleCity_GameCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGameCorner - diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc deleted file mode 100644 index 290fca78e..000000000 --- a/data/layouts/MauvilleCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Gym_MapBorder:: - .incbin "data/layouts/MauvilleCity_Gym/border.bin" - -MauvilleCity_Gym_MapBlockdata:: - .incbin "data/layouts/MauvilleCity_Gym/map.bin" - - .align 2 -MauvilleCity_Gym_Layout:: - .4byte 0xa - .4byte 0x15 - .4byte MauvilleCity_Gym_MapBorder - .4byte MauvilleCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MauvilleGym - diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc deleted file mode 100644 index ba7a0e487..000000000 --- a/data/layouts/MeteorFalls_1F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_1R_MapBorder:: - .incbin "data/layouts/MeteorFalls_1F_1R/border.bin" - -MeteorFalls_1F_1R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_1F_1R/map.bin" - - .align 2 -MeteorFalls_1F_1R_Layout:: - .4byte 0x1e - .4byte 0x2a - .4byte MeteorFalls_1F_1R_MapBorder - .4byte MeteorFalls_1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc deleted file mode 100644 index 2e3fcaf2e..000000000 --- a/data/layouts/MeteorFalls_1F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_2R_MapBorder:: - .incbin "data/layouts/MeteorFalls_1F_2R/border.bin" - -MeteorFalls_1F_2R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_1F_2R/map.bin" - - .align 2 -MeteorFalls_1F_2R_Layout:: - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_1F_2R_MapBorder - .4byte MeteorFalls_1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc deleted file mode 100644 index a4f385d8f..000000000 --- a/data/layouts/MeteorFalls_B1F_1R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_1R_MapBorder:: - .incbin "data/layouts/MeteorFalls_B1F_1R/border.bin" - -MeteorFalls_B1F_1R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_B1F_1R/map.bin" - - .align 2 -MeteorFalls_B1F_1R_Layout:: - .4byte 0x1d - .4byte 0x26 - .4byte MeteorFalls_B1F_1R_MapBorder - .4byte MeteorFalls_B1F_1R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc deleted file mode 100644 index 982edc975..000000000 --- a/data/layouts/MeteorFalls_B1F_2R/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_2R_MapBorder:: - .incbin "data/layouts/MeteorFalls_B1F_2R/border.bin" - -MeteorFalls_B1F_2R_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_B1F_2R/map.bin" - - .align 2 -MeteorFalls_B1F_2R_Layout:: - .4byte 0xb - .4byte 0x12 - .4byte MeteorFalls_B1F_2R_MapBorder - .4byte MeteorFalls_B1F_2R_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MeteorFalls_StevensCave/layout.inc b/data/layouts/MeteorFalls_StevensCave/layout.inc deleted file mode 100644 index 1baf70a09..000000000 --- a/data/layouts/MeteorFalls_StevensCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_StevensCave_MapBorder:: - .incbin "data/layouts/MeteorFalls_StevensCave/border.bin" - -MeteorFalls_StevensCave_MapBlockdata:: - .incbin "data/layouts/MeteorFalls_StevensCave/map.bin" - - .align 2 -MeteorFalls_StevensCave_Layout:: - .4byte 0x1e - .4byte 0x20 - .4byte MeteorFalls_StevensCave_MapBorder - .4byte MeteorFalls_StevensCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MeteorFalls - diff --git a/data/layouts/MirageTower_1F/layout.inc b/data/layouts/MirageTower_1F/layout.inc deleted file mode 100644 index be36cc758..000000000 --- a/data/layouts/MirageTower_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_1F_MapBorder:: - .incbin "data/layouts/MirageTower_1F/border.bin" - -MirageTower_1F_MapBlockdata:: - .incbin "data/layouts/MirageTower_1F/map.bin" - - .align 2 -MirageTower_1F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_1F_MapBorder - .4byte MirageTower_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MirageTower_2F/layout.inc b/data/layouts/MirageTower_2F/layout.inc deleted file mode 100644 index ec4971bc4..000000000 --- a/data/layouts/MirageTower_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_2F_MapBorder:: - .incbin "data/layouts/MirageTower_2F/border.bin" - -MirageTower_2F_MapBlockdata:: - .incbin "data/layouts/MirageTower_2F/map.bin" - - .align 2 -MirageTower_2F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_2F_MapBorder - .4byte MirageTower_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MirageTower_3F/layout.inc b/data/layouts/MirageTower_3F/layout.inc deleted file mode 100644 index c12de3a15..000000000 --- a/data/layouts/MirageTower_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_3F_MapBorder:: - .incbin "data/layouts/MirageTower_3F/border.bin" - -MirageTower_3F_MapBlockdata:: - .incbin "data/layouts/MirageTower_3F/map.bin" - - .align 2 -MirageTower_3F_Layout:: - .4byte 0x15 - .4byte 0x11 - .4byte MirageTower_3F_MapBorder - .4byte MirageTower_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MirageTower_4F/layout.inc b/data/layouts/MirageTower_4F/layout.inc deleted file mode 100644 index 518f7c943..000000000 --- a/data/layouts/MirageTower_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_4F_MapBorder:: - .incbin "data/layouts/MirageTower_4F/border.bin" - -MirageTower_4F_MapBlockdata:: - .incbin "data/layouts/MirageTower_4F/map.bin" - - .align 2 -MirageTower_4F_Layout:: - .4byte 0xd - .4byte 0xa - .4byte MirageTower_4F_MapBorder - .4byte MirageTower_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_MirageTower - diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc deleted file mode 100644 index 881cf9498..000000000 --- a/data/layouts/MossdeepCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_MapBorder:: - .incbin "data/layouts/MossdeepCity/border.bin" - -MossdeepCity_MapBlockdata:: - .incbin "data/layouts/MossdeepCity/map.bin" - - .align 2 -MossdeepCity_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte MossdeepCity_MapBorder - .4byte MossdeepCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc deleted file mode 100644 index 2c2fb717d..000000000 --- a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin" - -MossdeepCity_GameCorner_1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_1F_Layout:: - .4byte 0xc - .4byte 0xa - .4byte MossdeepCity_GameCorner_1F_MapBorder - .4byte MossdeepCity_GameCorner_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGameCorner - diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc deleted file mode 100644 index ec5dd2a57..000000000 --- a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_B1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin" - -MossdeepCity_GameCorner_B1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" - - .align 2 -MossdeepCity_GameCorner_B1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte MossdeepCity_GameCorner_B1F_MapBorder - .4byte MossdeepCity_GameCorner_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc deleted file mode 100644 index a65212a40..000000000 --- a/data/layouts/MossdeepCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Gym_MapBorder:: - .incbin "data/layouts/MossdeepCity_Gym/border.bin" - -MossdeepCity_Gym_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_Gym/map.bin" - - .align 2 -MossdeepCity_Gym_Layout:: - .4byte 0x1a - .4byte 0x24 - .4byte MossdeepCity_Gym_MapBorder - .4byte MossdeepCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MossdeepGym - diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc deleted file mode 100644 index 759e68891..000000000 --- a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_1F_MapBorder:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin" - -MossdeepCity_SpaceCenter_1F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_1F_Layout:: - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_1F_MapBorder - .4byte MossdeepCity_SpaceCenter_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc deleted file mode 100644 index 6e370a7fa..000000000 --- a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_2F_MapBorder:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin" - -MossdeepCity_SpaceCenter_2F_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" - - .align 2 -MossdeepCity_SpaceCenter_2F_Layout:: - .4byte 0x10 - .4byte 0xa - .4byte MossdeepCity_SpaceCenter_2F_MapBorder - .4byte MossdeepCity_SpaceCenter_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc deleted file mode 100644 index 0db92aee9..000000000 --- a/data/layouts/MossdeepCity_StevensHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_StevensHouse_MapBorder:: - .incbin "data/layouts/MossdeepCity_StevensHouse/border.bin" - -MossdeepCity_StevensHouse_MapBlockdata:: - .incbin "data/layouts/MossdeepCity_StevensHouse/map.bin" - - .align 2 -MossdeepCity_StevensHouse_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte MossdeepCity_StevensHouse_MapBorder - .4byte MossdeepCity_StevensHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc deleted file mode 100644 index 29a3b1ad7..000000000 --- a/data/layouts/MtChimney/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney_MapBorder:: - .incbin "data/layouts/MtChimney/border.bin" - -MtChimney_MapBlockdata:: - .incbin "data/layouts/MtChimney/map.bin" - - .align 2 -MtChimney_Layout:: - .4byte 0x28 - .4byte 0x2f - .4byte MtChimney_MapBorder - .4byte MtChimney_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc deleted file mode 100644 index 2402e815c..000000000 --- a/data/layouts/MtPyre_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F_MapBorder:: - .incbin "data/layouts/MtPyre_1F/border.bin" - -MtPyre_1F_MapBlockdata:: - .incbin "data/layouts/MtPyre_1F/map.bin" - - .align 2 -MtPyre_1F_Layout:: - .4byte 0x16 - .4byte 0x13 - .4byte MtPyre_1F_MapBorder - .4byte MtPyre_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc deleted file mode 100644 index 8d6ca1200..000000000 --- a/data/layouts/MtPyre_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_2F_MapBorder:: - .incbin "data/layouts/MtPyre_2F/border.bin" - -MtPyre_2F_MapBlockdata:: - .incbin "data/layouts/MtPyre_2F/map.bin" - - .align 2 -MtPyre_2F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_2F_MapBorder - .4byte MtPyre_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc deleted file mode 100644 index 24ed0f7b1..000000000 --- a/data/layouts/MtPyre_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F_MapBorder:: - .incbin "data/layouts/MtPyre_3F/border.bin" - -MtPyre_3F_MapBlockdata:: - .incbin "data/layouts/MtPyre_3F/map.bin" - - .align 2 -MtPyre_3F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_3F_MapBorder - .4byte MtPyre_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc deleted file mode 100644 index 65a8fcf59..000000000 --- a/data/layouts/MtPyre_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_MapBorder:: - .incbin "data/layouts/MtPyre_4F/border.bin" - -MtPyre_4F_MapBlockdata:: - .incbin "data/layouts/MtPyre_4F/map.bin" - - .align 2 -MtPyre_4F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_4F_MapBorder - .4byte MtPyre_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc deleted file mode 100644 index 222c6eb80..000000000 --- a/data/layouts/MtPyre_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_5F_MapBorder:: - .incbin "data/layouts/MtPyre_5F/border.bin" - -MtPyre_5F_MapBlockdata:: - .incbin "data/layouts/MtPyre_5F/map.bin" - - .align 2 -MtPyre_5F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_5F_MapBorder - .4byte MtPyre_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc deleted file mode 100644 index 31b5288d5..000000000 --- a/data/layouts/MtPyre_6F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_6F_MapBorder:: - .incbin "data/layouts/MtPyre_6F/border.bin" - -MtPyre_6F_MapBlockdata:: - .incbin "data/layouts/MtPyre_6F/map.bin" - - .align 2 -MtPyre_6F_Layout:: - .4byte 0xd - .4byte 0xd - .4byte MtPyre_6F_MapBorder - .4byte MtPyre_6F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc deleted file mode 100644 index 1b5997dba..000000000 --- a/data/layouts/MtPyre_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Exterior_MapBorder:: - .incbin "data/layouts/MtPyre_Exterior/border.bin" - -MtPyre_Exterior_MapBlockdata:: - .incbin "data/layouts/MtPyre_Exterior/map.bin" - - .align 2 -MtPyre_Exterior_Layout:: - .4byte 0x26 - .4byte 0x33 - .4byte MtPyre_Exterior_MapBorder - .4byte MtPyre_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc deleted file mode 100644 index 58e932eb7..000000000 --- a/data/layouts/MtPyre_Summit/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit_MapBorder:: - .incbin "data/layouts/MtPyre_Summit/border.bin" - -MtPyre_Summit_MapBlockdata:: - .incbin "data/layouts/MtPyre_Summit/map.bin" - - .align 2 -MtPyre_Summit_Layout:: - .4byte 0x32 - .4byte 0x25 - .4byte MtPyre_Summit_MapBorder - .4byte MtPyre_Summit_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/NavelRock_B1F/layout.inc b/data/layouts/NavelRock_B1F/layout.inc deleted file mode 100644 index 6f15bd276..000000000 --- a/data/layouts/NavelRock_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_B1F_MapBorder:: - .incbin "data/layouts/NavelRock_B1F/border.bin" - -NavelRock_B1F_MapBlockdata:: - .incbin "data/layouts/NavelRock_B1F/map.bin" - - .align 2 -NavelRock_B1F_Layout:: - .4byte 0x17 - .4byte 0xb - .4byte NavelRock_B1F_MapBorder - .4byte NavelRock_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Bottom/layout.inc b/data/layouts/NavelRock_Bottom/layout.inc deleted file mode 100644 index 5c96a8cef..000000000 --- a/data/layouts/NavelRock_Bottom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Bottom_MapBorder:: - .incbin "data/layouts/NavelRock_Bottom/border.bin" - -NavelRock_Bottom_MapBlockdata:: - .incbin "data/layouts/NavelRock_Bottom/map.bin" - - .align 2 -NavelRock_Bottom_Layout:: - .4byte 0x16 - .4byte 0x16 - .4byte NavelRock_Bottom_MapBorder - .4byte NavelRock_Bottom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Entrance/layout.inc b/data/layouts/NavelRock_Entrance/layout.inc deleted file mode 100644 index 6dcedcb20..000000000 --- a/data/layouts/NavelRock_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Entrance_MapBorder:: - .incbin "data/layouts/NavelRock_Entrance/border.bin" - -NavelRock_Entrance_MapBlockdata:: - .incbin "data/layouts/NavelRock_Entrance/map.bin" - - .align 2 -NavelRock_Entrance_Layout:: - .4byte 0x15 - .4byte 0x20 - .4byte NavelRock_Entrance_MapBorder - .4byte NavelRock_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Exterior/layout.inc b/data/layouts/NavelRock_Exterior/layout.inc deleted file mode 100644 index c2c4fa95e..000000000 --- a/data/layouts/NavelRock_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Exterior_MapBorder:: - .incbin "data/layouts/NavelRock_Exterior/border.bin" - -NavelRock_Exterior_MapBlockdata:: - .incbin "data/layouts/NavelRock_Exterior/map.bin" - - .align 2 -NavelRock_Exterior_Layout:: - .4byte 0x15 - .4byte 0x18 - .4byte NavelRock_Exterior_MapBorder - .4byte NavelRock_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/NavelRock_Fork/layout.inc b/data/layouts/NavelRock_Fork/layout.inc deleted file mode 100644 index ab5d9c867..000000000 --- a/data/layouts/NavelRock_Fork/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Fork_MapBorder:: - .incbin "data/layouts/NavelRock_Fork/border.bin" - -NavelRock_Fork_MapBlockdata:: - .incbin "data/layouts/NavelRock_Fork/map.bin" - - .align 2 -NavelRock_Fork_Layout:: - .4byte 0x1b - .4byte 0x56 - .4byte NavelRock_Fork_MapBorder - .4byte NavelRock_Fork_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_LadderRoom1/layout.inc b/data/layouts/NavelRock_LadderRoom1/layout.inc deleted file mode 100644 index a7fc73d22..000000000 --- a/data/layouts/NavelRock_LadderRoom1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_LadderRoom1_MapBorder:: - .incbin "data/layouts/NavelRock_LadderRoom1/border.bin" - -NavelRock_LadderRoom1_MapBlockdata:: - .incbin "data/layouts/NavelRock_LadderRoom1/map.bin" - - .align 2 -NavelRock_LadderRoom1_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_LadderRoom1_MapBorder - .4byte NavelRock_LadderRoom1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_LadderRoom2/layout.inc b/data/layouts/NavelRock_LadderRoom2/layout.inc deleted file mode 100644 index 8fbd6e51f..000000000 --- a/data/layouts/NavelRock_LadderRoom2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_LadderRoom2_MapBorder:: - .incbin "data/layouts/NavelRock_LadderRoom2/border.bin" - -NavelRock_LadderRoom2_MapBlockdata:: - .incbin "data/layouts/NavelRock_LadderRoom2/map.bin" - - .align 2 -NavelRock_LadderRoom2_Layout:: - .4byte 0x9 - .4byte 0x8 - .4byte NavelRock_LadderRoom2_MapBorder - .4byte NavelRock_LadderRoom2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NavelRock_Top/layout.inc b/data/layouts/NavelRock_Top/layout.inc deleted file mode 100644 index 50698cc76..000000000 --- a/data/layouts/NavelRock_Top/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_MapBorder:: - .incbin "data/layouts/NavelRock_Top/border.bin" - -NavelRock_Top_MapBlockdata:: - .incbin "data/layouts/NavelRock_Top/map.bin" - - .align 2 -NavelRock_Top_Layout:: - .4byte 0x19 - .4byte 0x1c - .4byte NavelRock_Top_MapBorder - .4byte NavelRock_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_NavelRock - diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc deleted file mode 100644 index bbd81cac7..000000000 --- a/data/layouts/NewMauville_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Entrance_MapBorder:: - .incbin "data/layouts/NewMauville_Entrance/border.bin" - -NewMauville_Entrance_MapBlockdata:: - .incbin "data/layouts/NewMauville_Entrance/map.bin" - - .align 2 -NewMauville_Entrance_Layout:: - .4byte 0x9 - .4byte 0x9 - .4byte NewMauville_Entrance_MapBorder - .4byte NewMauville_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc deleted file mode 100644 index 096142c6d..000000000 --- a/data/layouts/NewMauville_Inside/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Inside_MapBorder:: - .incbin "data/layouts/NewMauville_Inside/border.bin" - -NewMauville_Inside_MapBlockdata:: - .incbin "data/layouts/NewMauville_Inside/map.bin" - - .align 2 -NewMauville_Inside_Layout:: - .4byte 0x29 - .4byte 0x29 - .4byte NewMauville_Inside_MapBorder - .4byte NewMauville_Inside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BikeShop - diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc deleted file mode 100644 index 9709ca1ea..000000000 --- a/data/layouts/OldaleTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_MapBorder:: - .incbin "data/layouts/OldaleTown/border.bin" - -OldaleTown_MapBlockdata:: - .incbin "data/layouts/OldaleTown/map.bin" - - .align 2 -OldaleTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte OldaleTown_MapBorder - .4byte OldaleTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc deleted file mode 100644 index 4ba791f23..000000000 --- a/data/layouts/PacifidlogTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_MapBorder:: - .incbin "data/layouts/PacifidlogTown/border.bin" - -PacifidlogTown_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown/map.bin" - - .align 2 -PacifidlogTown_Layout:: - .4byte 0x14 - .4byte 0x28 - .4byte PacifidlogTown_MapBorder - .4byte PacifidlogTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc deleted file mode 100644 index b5dcf58b2..000000000 --- a/data/layouts/PacifidlogTown_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House1_MapBorder:: - .incbin "data/layouts/PacifidlogTown_House1/border.bin" - -PacifidlogTown_House1_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown_House1/map.bin" - - .align 2 -PacifidlogTown_House1_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House1_MapBorder - .4byte PacifidlogTown_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc deleted file mode 100644 index a10daa3cd..000000000 --- a/data/layouts/PacifidlogTown_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House2_MapBorder:: - .incbin "data/layouts/PacifidlogTown_House2/border.bin" - -PacifidlogTown_House2_MapBlockdata:: - .incbin "data/layouts/PacifidlogTown_House2/map.bin" - - .align 2 -PacifidlogTown_House2_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte PacifidlogTown_House2_MapBorder - .4byte PacifidlogTown_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc deleted file mode 100644 index bae16b88f..000000000 --- a/data/layouts/PetalburgCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_MapBorder:: - .incbin "data/layouts/PetalburgCity/border.bin" - -PetalburgCity_MapBlockdata:: - .incbin "data/layouts/PetalburgCity/map.bin" - - .align 2 -PetalburgCity_Layout:: - .4byte 0x1e - .4byte 0x1e - .4byte PetalburgCity_MapBorder - .4byte PetalburgCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc deleted file mode 100644 index 36fe1002f..000000000 --- a/data/layouts/PetalburgCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Gym_MapBorder:: - .incbin "data/layouts/PetalburgCity_Gym/border.bin" - -PetalburgCity_Gym_MapBlockdata:: - .incbin "data/layouts/PetalburgCity_Gym/map.bin" - - .align 2 -PetalburgCity_Gym_Layout:: - .4byte 0x9 - .4byte 0x70 - .4byte PetalburgCity_Gym_MapBorder - .4byte PetalburgCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PetalburgGym - diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc deleted file mode 100644 index 840e17f7e..000000000 --- a/data/layouts/PetalburgWoods/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgWoods_MapBorder:: - .incbin "data/layouts/PetalburgWoods/border.bin" - -PetalburgWoods_MapBlockdata:: - .incbin "data/layouts/PetalburgWoods/map.bin" - - .align 2 -PetalburgWoods_Layout:: - .4byte 0x30 - .4byte 0x2c - .4byte PetalburgWoods_MapBorder - .4byte PetalburgWoods_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc deleted file mode 100644 index bf1335f84..000000000 --- a/data/layouts/PokemonCenter_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonCenter_1F_MapBorder:: - .incbin "data/layouts/PokemonCenter_1F/border.bin" - -PokemonCenter_1F_MapBlockdata:: - .incbin "data/layouts/PokemonCenter_1F/map.bin" - - .align 2 -PokemonCenter_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte PokemonCenter_1F_MapBorder - .4byte PokemonCenter_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc deleted file mode 100644 index 3cb812de7..000000000 --- a/data/layouts/PokemonCenter_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -PokemonCenter_2F_MapBorder:: - .incbin "data/layouts/PokemonCenter_2F/border.bin" - -PokemonCenter_2F_MapBlockdata:: - .incbin "data/layouts/PokemonCenter_2F/map.bin" - - .align 2 -PokemonCenter_2F_Layout:: - .4byte 0xe - .4byte 0xa - .4byte PokemonCenter_2F_MapBorder - .4byte PokemonCenter_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonCenter - diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc deleted file mode 100644 index ed258b2a7..000000000 --- a/data/layouts/RecordCorner/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RecordCorner_MapBorder:: - .incbin "data/layouts/RecordCorner/border.bin" - -RecordCorner_MapBlockdata:: - .incbin "data/layouts/RecordCorner/map.bin" - - .align 2 -RecordCorner_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte RecordCorner_MapBorder - .4byte RecordCorner_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc deleted file mode 100644 index e42ecf340..000000000 --- a/data/layouts/Route101/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route101_MapBorder:: - .incbin "data/layouts/Route101/border.bin" - -Route101_MapBlockdata:: - .incbin "data/layouts/Route101/map.bin" - - .align 2 -Route101_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte Route101_MapBorder - .4byte Route101_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc deleted file mode 100644 index 194d44fce..000000000 --- a/data/layouts/Route102/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route102_MapBorder:: - .incbin "data/layouts/Route102/border.bin" - -Route102_MapBlockdata:: - .incbin "data/layouts/Route102/map.bin" - - .align 2 -Route102_Layout:: - .4byte 0x32 - .4byte 0x14 - .4byte Route102_MapBorder - .4byte Route102_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc deleted file mode 100644 index fe3bac066..000000000 --- a/data/layouts/Route103/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route103_MapBorder:: - .incbin "data/layouts/Route103/border.bin" - -Route103_MapBlockdata:: - .incbin "data/layouts/Route103/map.bin" - - .align 2 -Route103_Layout:: - .4byte 0x50 - .4byte 0x16 - .4byte Route103_MapBorder - .4byte Route103_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Petalburg - diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc deleted file mode 100644 index 9a9418e46..000000000 --- a/data/layouts/Route104/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MapBorder:: - .incbin "data/layouts/Route104/border.bin" - -Route104_MapBlockdata:: - .incbin "data/layouts/Route104/map.bin" - - .align 2 -Route104_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route104_MapBorder - .4byte Route104_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc deleted file mode 100644 index 3474f3335..000000000 --- a/data/layouts/Route104_MrBrineysHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MrBrineysHouse_MapBorder:: - .incbin "data/layouts/Route104_MrBrineysHouse/border.bin" - -Route104_MrBrineysHouse_MapBlockdata:: - .incbin "data/layouts/Route104_MrBrineysHouse/map.bin" - - .align 2 -Route104_MrBrineysHouse_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte Route104_MrBrineysHouse_MapBorder - .4byte Route104_MrBrineysHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc deleted file mode 100644 index a46ffc18c..000000000 --- a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrettyPetalFlowerShop_MapBorder:: - .incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin" - -Route104_PrettyPetalFlowerShop_MapBlockdata:: - .incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" - - .align 2 -Route104_PrettyPetalFlowerShop_Layout:: - .4byte 0xf - .4byte 0x9 - .4byte Route104_PrettyPetalFlowerShop_MapBorder - .4byte Route104_PrettyPetalFlowerShop_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PrettyPetalFlowerShop - diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc deleted file mode 100644 index b2b2c4f19..000000000 --- a/data/layouts/Route104_Prototype/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype_MapBorder:: - .incbin "data/layouts/Route104_Prototype/border.bin" - -Route104_Prototype_MapBlockdata:: - .incbin "data/layouts/Route104_Prototype/map.bin" - - .align 2 -Route104_Prototype_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte Route104_Prototype_MapBorder - .4byte Route104_Prototype_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc deleted file mode 100644 index ce78ef9cc..000000000 --- a/data/layouts/Route105/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route105_MapBorder:: - .incbin "data/layouts/Route105/border.bin" - -Route105_MapBlockdata:: - .incbin "data/layouts/Route105/map.bin" - - .align 2 -Route105_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route105_MapBorder - .4byte Route105_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc deleted file mode 100644 index ea255b383..000000000 --- a/data/layouts/Route106/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route106_MapBorder:: - .incbin "data/layouts/Route106/border.bin" - -Route106_MapBlockdata:: - .incbin "data/layouts/Route106/map.bin" - - .align 2 -Route106_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route106_MapBorder - .4byte Route106_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc deleted file mode 100644 index ea305b2a7..000000000 --- a/data/layouts/Route107/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route107_MapBorder:: - .incbin "data/layouts/Route107/border.bin" - -Route107_MapBlockdata:: - .incbin "data/layouts/Route107/map.bin" - - .align 2 -Route107_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route107_MapBorder - .4byte Route107_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Dewford - diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc deleted file mode 100644 index 1ec7171cf..000000000 --- a/data/layouts/Route108/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route108_MapBorder:: - .incbin "data/layouts/Route108/border.bin" - -Route108_MapBlockdata:: - .incbin "data/layouts/Route108/map.bin" - - .align 2 -Route108_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route108_MapBorder - .4byte Route108_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc deleted file mode 100644 index fa41585e9..000000000 --- a/data/layouts/Route109/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_MapBorder:: - .incbin "data/layouts/Route109/border.bin" - -Route109_MapBlockdata:: - .incbin "data/layouts/Route109/map.bin" - - .align 2 -Route109_Layout:: - .4byte 0x28 - .4byte 0x3f - .4byte Route109_MapBorder - .4byte Route109_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc deleted file mode 100644 index 9ec997b48..000000000 --- a/data/layouts/Route109_SeashoreHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_SeashoreHouse_MapBorder:: - .incbin "data/layouts/Route109_SeashoreHouse/border.bin" - -Route109_SeashoreHouse_MapBlockdata:: - .incbin "data/layouts/Route109_SeashoreHouse/map.bin" - - .align 2 -Route109_SeashoreHouse_Layout:: - .4byte 0xf - .4byte 0xa - .4byte Route109_SeashoreHouse_MapBorder - .4byte Route109_SeashoreHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SeashoreHouse - diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc deleted file mode 100644 index 24e5a9321..000000000 --- a/data/layouts/Route110/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_MapBorder:: - .incbin "data/layouts/Route110/border.bin" - -Route110_MapBlockdata:: - .incbin "data/layouts/Route110/map.bin" - - .align 2 -Route110_Layout:: - .4byte 0x28 - .4byte 0x64 - .4byte Route110_MapBorder - .4byte Route110_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc deleted file mode 100644 index abf78f62d..000000000 --- a/data/layouts/Route110_SeasideCyclingRoadEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadEntrance_MapBorder:: - .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin" - -Route110_SeasideCyclingRoadEntrance_MapBlockdata:: - .incbin "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" - - .align 2 -Route110_SeasideCyclingRoadEntrance_Layout:: - .4byte 0xf - .4byte 0x6 - .4byte Route110_SeasideCyclingRoadEntrance_MapBorder - .4byte Route110_SeasideCyclingRoadEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc deleted file mode 100644 index fe6ee4d26..000000000 --- a/data/layouts/Route110_TrickHouseCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseCorridor_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseCorridor/border.bin" - -Route110_TrickHouseCorridor_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseCorridor/map.bin" - - .align 2 -Route110_TrickHouseCorridor_Layout:: - .4byte 0xf - .4byte 0x18 - .4byte Route110_TrickHouseCorridor_MapBorder - .4byte Route110_TrickHouseCorridor_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc deleted file mode 100644 index dd9474aee..000000000 --- a/data/layouts/Route110_TrickHouseEnd/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseEnd/border.bin" - -Route110_TrickHouseEnd_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseEnd/map.bin" - - .align 2 -Route110_TrickHouseEnd_Layout:: - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEnd_MapBorder - .4byte Route110_TrickHouseEnd_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc deleted file mode 100644 index 97f3abe24..000000000 --- a/data/layouts/Route110_TrickHouseEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEntrance_MapBorder:: - .incbin "data/layouts/Route110_TrickHouseEntrance/border.bin" - -Route110_TrickHouseEntrance_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHouseEntrance/map.bin" - - .align 2 -Route110_TrickHouseEntrance_Layout:: - .4byte 0xc - .4byte 0x8 - .4byte Route110_TrickHouseEntrance_MapBorder - .4byte Route110_TrickHouseEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc deleted file mode 100644 index 546876ab0..000000000 --- a/data/layouts/Route110_TrickHousePuzzle1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle1_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin" - -Route110_TrickHousePuzzle1_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin" - - .align 2 -Route110_TrickHousePuzzle1_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle1_MapBorder - .4byte Route110_TrickHousePuzzle1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc deleted file mode 100644 index 65caaa734..000000000 --- a/data/layouts/Route110_TrickHousePuzzle2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle2_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin" - -Route110_TrickHousePuzzle2_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin" - - .align 2 -Route110_TrickHousePuzzle2_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle2_MapBorder - .4byte Route110_TrickHousePuzzle2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc deleted file mode 100644 index a03cf9a71..000000000 --- a/data/layouts/Route110_TrickHousePuzzle3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle3_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin" - -Route110_TrickHousePuzzle3_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin" - - .align 2 -Route110_TrickHousePuzzle3_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle3_MapBorder - .4byte Route110_TrickHousePuzzle3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc deleted file mode 100644 index 581b41a43..000000000 --- a/data/layouts/Route110_TrickHousePuzzle4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle4_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin" - -Route110_TrickHousePuzzle4_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin" - - .align 2 -Route110_TrickHousePuzzle4_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle4_MapBorder - .4byte Route110_TrickHousePuzzle4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc deleted file mode 100644 index 5e06ac31e..000000000 --- a/data/layouts/Route110_TrickHousePuzzle5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle5_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin" - -Route110_TrickHousePuzzle5_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin" - - .align 2 -Route110_TrickHousePuzzle5_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle5_MapBorder - .4byte Route110_TrickHousePuzzle5_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc deleted file mode 100644 index 398c17951..000000000 --- a/data/layouts/Route110_TrickHousePuzzle6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle6_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin" - -Route110_TrickHousePuzzle6_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin" - - .align 2 -Route110_TrickHousePuzzle6_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle6_MapBorder - .4byte Route110_TrickHousePuzzle6_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc deleted file mode 100644 index 1612ec41b..000000000 --- a/data/layouts/Route110_TrickHousePuzzle7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle7_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin" - -Route110_TrickHousePuzzle7_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin" - - .align 2 -Route110_TrickHousePuzzle7_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle7_MapBorder - .4byte Route110_TrickHousePuzzle7_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc deleted file mode 100644 index 3520b503f..000000000 --- a/data/layouts/Route110_TrickHousePuzzle8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle8_MapBorder:: - .incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin" - -Route110_TrickHousePuzzle8_MapBlockdata:: - .incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin" - - .align 2 -Route110_TrickHousePuzzle8_Layout:: - .4byte 0xf - .4byte 0x16 - .4byte Route110_TrickHousePuzzle8_MapBorder - .4byte Route110_TrickHousePuzzle8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrickHousePuzzle - diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc deleted file mode 100644 index 2966c06c5..000000000 --- a/data/layouts/Route111/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_MapBorder:: - .incbin "data/layouts/Route111/border.bin" - -Route111_MapBlockdata:: - .incbin "data/layouts/Route111/map.bin" - - .align 2 -Route111_Layout:: - .4byte 0x28 - .4byte 0x8c - .4byte Route111_MapBorder - .4byte Route111_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route111_NoMirageTower/layout.inc b/data/layouts/Route111_NoMirageTower/layout.inc deleted file mode 100644 index bf6a188cc..000000000 --- a/data/layouts/Route111_NoMirageTower/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_NoMirageTower_MapBorder:: - .incbin "data/layouts/Route111_NoMirageTower/border.bin" - -Route111_NoMirageTower_MapBlockdata:: - .incbin "data/layouts/Route111_NoMirageTower/map.bin" - - .align 2 -Route111_NoMirageTower_Layout:: - .4byte 0x28 - .4byte 0x8C - .4byte Route111_NoMirageTower_MapBorder - .4byte Route111_NoMirageTower_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc deleted file mode 100644 index 72a0c428c..000000000 --- a/data/layouts/Route112/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112_MapBorder:: - .incbin "data/layouts/Route112/border.bin" - -Route112_MapBlockdata:: - .incbin "data/layouts/Route112/map.bin" - - .align 2 -Route112_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte Route112_MapBorder - .4byte Route112_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lavaridge - diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc deleted file mode 100644 index 0c1d76b58..000000000 --- a/data/layouts/Route113/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113_MapBorder:: - .incbin "data/layouts/Route113/border.bin" - -Route113_MapBlockdata:: - .incbin "data/layouts/Route113/map.bin" - - .align 2 -Route113_Layout:: - .4byte 0x64 - .4byte 0x14 - .4byte Route113_MapBorder - .4byte Route113_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc deleted file mode 100644 index 071f9e1b6..000000000 --- a/data/layouts/Route114/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_MapBorder:: - .incbin "data/layouts/Route114/border.bin" - -Route114_MapBlockdata:: - .incbin "data/layouts/Route114/map.bin" - - .align 2 -Route114_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route114_MapBorder - .4byte Route114_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc deleted file mode 100644 index f915e572a..000000000 --- a/data/layouts/Route114_FossilManiacsHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsHouse_MapBorder:: - .incbin "data/layouts/Route114_FossilManiacsHouse/border.bin" - -Route114_FossilManiacsHouse_MapBlockdata:: - .incbin "data/layouts/Route114_FossilManiacsHouse/map.bin" - - .align 2 -Route114_FossilManiacsHouse_Layout:: - .4byte 0xa - .4byte 0x8 - .4byte Route114_FossilManiacsHouse_MapBorder - .4byte Route114_FossilManiacsHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc deleted file mode 100644 index c2392ff01..000000000 --- a/data/layouts/Route114_FossilManiacsTunnel/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel_MapBorder:: - .incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin" - -Route114_FossilManiacsTunnel_MapBlockdata:: - .incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin" - - .align 2 -Route114_FossilManiacsTunnel_Layout:: - .4byte 0xd - .4byte 0x1a - .4byte Route114_FossilManiacsTunnel_MapBorder - .4byte Route114_FossilManiacsTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc deleted file mode 100644 index be9689ae3..000000000 --- a/data/layouts/Route114_LanettesHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse_MapBorder:: - .incbin "data/layouts/Route114_LanettesHouse/border.bin" - -Route114_LanettesHouse_MapBlockdata:: - .incbin "data/layouts/Route114_LanettesHouse/map.bin" - - .align 2 -Route114_LanettesHouse_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte Route114_LanettesHouse_MapBorder - .4byte Route114_LanettesHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc deleted file mode 100644 index 9d6c3c969..000000000 --- a/data/layouts/Route115/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route115_MapBorder:: - .incbin "data/layouts/Route115/border.bin" - -Route115_MapBlockdata:: - .incbin "data/layouts/Route115/map.bin" - - .align 2 -Route115_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Route115_MapBorder - .4byte Route115_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fallarbor - diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc deleted file mode 100644 index 232cc41f8..000000000 --- a/data/layouts/Route116/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_MapBorder:: - .incbin "data/layouts/Route116/border.bin" - -Route116_MapBlockdata:: - .incbin "data/layouts/Route116/map.bin" - - .align 2 -Route116_Layout:: - .4byte 0x64 - .4byte 0x14 - .4byte Route116_MapBorder - .4byte Route116_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc deleted file mode 100644 index 1bd42eafc..000000000 --- a/data/layouts/Route116_TunnelersRestHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_TunnelersRestHouse_MapBorder:: - .incbin "data/layouts/Route116_TunnelersRestHouse/border.bin" - -Route116_TunnelersRestHouse_MapBlockdata:: - .incbin "data/layouts/Route116_TunnelersRestHouse/map.bin" - - .align 2 -Route116_TunnelersRestHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte Route116_TunnelersRestHouse_MapBorder - .4byte Route116_TunnelersRestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc deleted file mode 100644 index 25e133f28..000000000 --- a/data/layouts/Route117/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_MapBorder:: - .incbin "data/layouts/Route117/border.bin" - -Route117_MapBlockdata:: - .incbin "data/layouts/Route117/map.bin" - - .align 2 -Route117_Layout:: - .4byte 0x3c - .4byte 0x14 - .4byte Route117_MapBorder - .4byte Route117_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc deleted file mode 100644 index 403881bfe..000000000 --- a/data/layouts/Route117_PokemonDayCare/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_PokemonDayCare_MapBorder:: - .incbin "data/layouts/Route117_PokemonDayCare/border.bin" - -Route117_PokemonDayCare_MapBlockdata:: - .incbin "data/layouts/Route117_PokemonDayCare/map.bin" - - .align 2 -Route117_PokemonDayCare_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte Route117_PokemonDayCare_MapBorder - .4byte Route117_PokemonDayCare_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonDayCare - diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc deleted file mode 100644 index cb87f8414..000000000 --- a/data/layouts/Route118/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route118_MapBorder:: - .incbin "data/layouts/Route118/border.bin" - -Route118_MapBlockdata:: - .incbin "data/layouts/Route118/map.bin" - - .align 2 -Route118_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route118_MapBorder - .4byte Route118_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc deleted file mode 100644 index 66502fb15..000000000 --- a/data/layouts/Route119/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_MapBorder:: - .incbin "data/layouts/Route119/border.bin" - -Route119_MapBlockdata:: - .incbin "data/layouts/Route119/map.bin" - - .align 2 -Route119_Layout:: - .4byte 0x28 - .4byte 0x8c - .4byte Route119_MapBorder - .4byte Route119_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc deleted file mode 100644 index 9637beea5..000000000 --- a/data/layouts/Route119_WeatherInstitute_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_1F_MapBorder:: - .incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin" - -Route119_WeatherInstitute_1F_MapBlockdata:: - .incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin" - - .align 2 -Route119_WeatherInstitute_1F_Layout:: - .4byte 0x14 - .4byte 0xd - .4byte Route119_WeatherInstitute_1F_MapBorder - .4byte Route119_WeatherInstitute_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc deleted file mode 100644 index 4f0948f7b..000000000 --- a/data/layouts/Route119_WeatherInstitute_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_2F_MapBorder:: - .incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin" - -Route119_WeatherInstitute_2F_MapBlockdata:: - .incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin" - - .align 2 -Route119_WeatherInstitute_2F_Layout:: - .4byte 0x14 - .4byte 0xb - .4byte Route119_WeatherInstitute_2F_MapBorder - .4byte Route119_WeatherInstitute_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc deleted file mode 100644 index f9e9255a0..000000000 --- a/data/layouts/Route120/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route120_MapBorder:: - .incbin "data/layouts/Route120/border.bin" - -Route120_MapBlockdata:: - .incbin "data/layouts/Route120/map.bin" - - .align 2 -Route120_Layout:: - .4byte 0x28 - .4byte 0x64 - .4byte Route120_MapBorder - .4byte Route120_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Fortree - diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc deleted file mode 100644 index 4d2c9744a..000000000 --- a/data/layouts/Route121/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_MapBorder:: - .incbin "data/layouts/Route121/border.bin" - -Route121_MapBlockdata:: - .incbin "data/layouts/Route121/map.bin" - - .align 2 -Route121_Layout:: - .4byte 0x50 - .4byte 0x14 - .4byte Route121_MapBorder - .4byte Route121_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc deleted file mode 100644 index 38ad9e97e..000000000 --- a/data/layouts/Route121_SafariZoneEntrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_SafariZoneEntrance_MapBorder:: - .incbin "data/layouts/Route121_SafariZoneEntrance/border.bin" - -Route121_SafariZoneEntrance_MapBlockdata:: - .incbin "data/layouts/Route121_SafariZoneEntrance/map.bin" - - .align 2 -Route121_SafariZoneEntrance_Layout:: - .4byte 0x12 - .4byte 0xe - .4byte Route121_SafariZoneEntrance_MapBorder - .4byte Route121_SafariZoneEntrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Shop - diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc deleted file mode 100644 index 7f0baac20..000000000 --- a/data/layouts/Route122/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route122_MapBorder:: - .incbin "data/layouts/Route122/border.bin" - -Route122_MapBlockdata:: - .incbin "data/layouts/Route122/map.bin" - - .align 2 -Route122_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte Route122_MapBorder - .4byte Route122_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc deleted file mode 100644 index 0c76c2b7b..000000000 --- a/data/layouts/Route123/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123_MapBorder:: - .incbin "data/layouts/Route123/border.bin" - -Route123_MapBlockdata:: - .incbin "data/layouts/Route123/map.bin" - - .align 2 -Route123_Layout:: - .4byte 0x8c - .4byte 0x14 - .4byte Route123_MapBorder - .4byte Route123_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc deleted file mode 100644 index d27ed902a..000000000 --- a/data/layouts/Route124/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_MapBorder:: - .incbin "data/layouts/Route124/border.bin" - -Route124_MapBlockdata:: - .incbin "data/layouts/Route124/map.bin" - - .align 2 -Route124_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route124_MapBorder - .4byte Route124_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc deleted file mode 100644 index 263571235..000000000 --- a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_DivingTreasureHuntersHouse_MapBorder:: - .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin" - -Route124_DivingTreasureHuntersHouse_MapBlockdata:: - .incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" - - .align 2 -Route124_DivingTreasureHuntersHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte Route124_DivingTreasureHuntersHouse_MapBorder - .4byte Route124_DivingTreasureHuntersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc deleted file mode 100644 index f0d4e13b7..000000000 --- a/data/layouts/Route125/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route125_MapBorder:: - .incbin "data/layouts/Route125/border.bin" - -Route125_MapBlockdata:: - .incbin "data/layouts/Route125/map.bin" - - .align 2 -Route125_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route125_MapBorder - .4byte Route125_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc deleted file mode 100644 index 859d025a5..000000000 --- a/data/layouts/Route126/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route126_MapBorder:: - .incbin "data/layouts/Route126/border.bin" - -Route126_MapBlockdata:: - .incbin "data/layouts/Route126/map.bin" - - .align 2 -Route126_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route126_MapBorder - .4byte Route126_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc deleted file mode 100644 index 767330aff..000000000 --- a/data/layouts/Route127/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route127_MapBorder:: - .incbin "data/layouts/Route127/border.bin" - -Route127_MapBlockdata:: - .incbin "data/layouts/Route127/map.bin" - - .align 2 -Route127_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Route127_MapBorder - .4byte Route127_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc deleted file mode 100644 index 16624fa02..000000000 --- a/data/layouts/Route128/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128_MapBorder:: - .incbin "data/layouts/Route128/border.bin" - -Route128_MapBlockdata:: - .incbin "data/layouts/Route128/map.bin" - - .align 2 -Route128_Layout:: - .4byte 0x78 - .4byte 0x28 - .4byte Route128_MapBorder - .4byte Route128_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc deleted file mode 100644 index 9b7d6af1d..000000000 --- a/data/layouts/Route129/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route129_MapBorder:: - .incbin "data/layouts/Route129/border.bin" - -Route129_MapBlockdata:: - .incbin "data/layouts/Route129/map.bin" - - .align 2 -Route129_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route129_MapBorder - .4byte Route129_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mossdeep - diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc deleted file mode 100644 index 41db11cb4..000000000 --- a/data/layouts/Route130/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route130_MapBorder:: - .incbin "data/layouts/Route130/border.bin" - -Route130_MapBlockdata:: - .incbin "data/layouts/Route130/map.bin" - - .align 2 -Route130_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route130_MapBorder - .4byte Route130_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc deleted file mode 100644 index 7fae261cc..000000000 --- a/data/layouts/Route131/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route131_MapBorder:: - .incbin "data/layouts/Route131/border.bin" - -Route131_MapBlockdata:: - .incbin "data/layouts/Route131/map.bin" - - .align 2 -Route131_Layout:: - .4byte 0x3c - .4byte 0x28 - .4byte Route131_MapBorder - .4byte Route131_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc deleted file mode 100644 index afaa7fb58..000000000 --- a/data/layouts/Route132/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132_MapBorder:: - .incbin "data/layouts/Route132/border.bin" - -Route132_MapBlockdata:: - .incbin "data/layouts/Route132/map.bin" - - .align 2 -Route132_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route132_MapBorder - .4byte Route132_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc deleted file mode 100644 index 5ff11108b..000000000 --- a/data/layouts/Route133/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133_MapBorder:: - .incbin "data/layouts/Route133/border.bin" - -Route133_MapBlockdata:: - .incbin "data/layouts/Route133/map.bin" - - .align 2 -Route133_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route133_MapBorder - .4byte Route133_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc deleted file mode 100644 index 9eeca6cc9..000000000 --- a/data/layouts/Route134/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route134_MapBorder:: - .incbin "data/layouts/Route134/border.bin" - -Route134_MapBlockdata:: - .incbin "data/layouts/Route134/map.bin" - - .align 2 -Route134_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Route134_MapBorder - .4byte Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc deleted file mode 100644 index 00c45dcc2..000000000 --- a/data/layouts/RustboroCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_MapBorder:: - .incbin "data/layouts/RustboroCity/border.bin" - -RustboroCity_MapBlockdata:: - .incbin "data/layouts/RustboroCity/map.bin" - - .align 2 -RustboroCity_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte RustboroCity_MapBorder - .4byte RustboroCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc deleted file mode 100644 index 0c86dede9..000000000 --- a/data/layouts/RustboroCity_CuttersHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_CuttersHouse_MapBorder:: - .incbin "data/layouts/RustboroCity_CuttersHouse/border.bin" - -RustboroCity_CuttersHouse_MapBlockdata:: - .incbin "data/layouts/RustboroCity_CuttersHouse/map.bin" - - .align 2 -RustboroCity_CuttersHouse_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte RustboroCity_CuttersHouse_MapBorder - .4byte RustboroCity_CuttersHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc deleted file mode 100644 index dbf6b388e..000000000 --- a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin" - -RustboroCity_DevonCorp_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin" - - .align 2 -RustboroCity_DevonCorp_1F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_1F_MapBorder - .4byte RustboroCity_DevonCorp_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc deleted file mode 100644 index 34d581ae5..000000000 --- a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin" - -RustboroCity_DevonCorp_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin" - - .align 2 -RustboroCity_DevonCorp_2F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_2F_MapBorder - .4byte RustboroCity_DevonCorp_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc deleted file mode 100644 index 64c555be5..000000000 --- a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F_MapBorder:: - .incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin" - -RustboroCity_DevonCorp_3F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin" - - .align 2 -RustboroCity_DevonCorp_3F_Layout:: - .4byte 0x13 - .4byte 0x9 - .4byte RustboroCity_DevonCorp_3F_MapBorder - .4byte RustboroCity_DevonCorp_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Facility - diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc deleted file mode 100644 index b904524a6..000000000 --- a/data/layouts/RustboroCity_Flat1_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat1_1F/border.bin" - -RustboroCity_Flat1_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat1_1F/map.bin" - - .align 2 -RustboroCity_Flat1_1F_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_1F_MapBorder - .4byte RustboroCity_Flat1_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc deleted file mode 100644 index aa6e3ebdf..000000000 --- a/data/layouts/RustboroCity_Flat1_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat1_2F/border.bin" - -RustboroCity_Flat1_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat1_2F/map.bin" - - .align 2 -RustboroCity_Flat1_2F_Layout:: - .4byte 0xe - .4byte 0x8 - .4byte RustboroCity_Flat1_2F_MapBorder - .4byte RustboroCity_Flat1_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc deleted file mode 100644 index 8e44c97b7..000000000 --- a/data/layouts/RustboroCity_Flat2_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_1F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_1F/border.bin" - -RustboroCity_Flat2_1F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_1F/map.bin" - - .align 2 -RustboroCity_Flat2_1F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_1F_MapBorder - .4byte RustboroCity_Flat2_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc deleted file mode 100644 index ffcba8d17..000000000 --- a/data/layouts/RustboroCity_Flat2_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_2F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_2F/border.bin" - -RustboroCity_Flat2_2F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_2F/map.bin" - - .align 2 -RustboroCity_Flat2_2F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_2F_MapBorder - .4byte RustboroCity_Flat2_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc deleted file mode 100644 index 77775b4e0..000000000 --- a/data/layouts/RustboroCity_Flat2_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_3F_MapBorder:: - .incbin "data/layouts/RustboroCity_Flat2_3F/border.bin" - -RustboroCity_Flat2_3F_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Flat2_3F/map.bin" - - .align 2 -RustboroCity_Flat2_3F_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte RustboroCity_Flat2_3F_MapBorder - .4byte RustboroCity_Flat2_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc deleted file mode 100644 index 8c064171b..000000000 --- a/data/layouts/RustboroCity_Gym/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Gym_MapBorder:: - .incbin "data/layouts/RustboroCity_Gym/border.bin" - -RustboroCity_Gym_MapBlockdata:: - .incbin "data/layouts/RustboroCity_Gym/map.bin" - - .align 2 -RustboroCity_Gym_Layout:: - .4byte 0xb - .4byte 0x14 - .4byte RustboroCity_Gym_MapBorder - .4byte RustboroCity_Gym_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_RustboroGym - diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc deleted file mode 100644 index 0c8a2075e..000000000 --- a/data/layouts/RustboroCity_House/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House_MapBorder:: - .incbin "data/layouts/RustboroCity_House/border.bin" - -RustboroCity_House_MapBlockdata:: - .incbin "data/layouts/RustboroCity_House/map.bin" - - .align 2 -RustboroCity_House_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte RustboroCity_House_MapBorder - .4byte RustboroCity_House_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc deleted file mode 100644 index 27893f2fb..000000000 --- a/data/layouts/RustboroCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House1_MapBorder:: - .incbin "data/layouts/RustboroCity_House1/border.bin" - -RustboroCity_House1_MapBlockdata:: - .incbin "data/layouts/RustboroCity_House1/map.bin" - - .align 2 -RustboroCity_House1_Layout:: - .4byte 0xd - .4byte 0x8 - .4byte RustboroCity_House1_MapBorder - .4byte RustboroCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc deleted file mode 100644 index 2c4eb3977..000000000 --- a/data/layouts/RustboroCity_PokemonSchool/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonSchool_MapBorder:: - .incbin "data/layouts/RustboroCity_PokemonSchool/border.bin" - -RustboroCity_PokemonSchool_MapBlockdata:: - .incbin "data/layouts/RustboroCity_PokemonSchool/map.bin" - - .align 2 -RustboroCity_PokemonSchool_Layout:: - .4byte 0xc - .4byte 0xb - .4byte RustboroCity_PokemonSchool_MapBorder - .4byte RustboroCity_PokemonSchool_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonSchool - diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc deleted file mode 100644 index 7a063b922..000000000 --- a/data/layouts/RusturfTunnel/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -RusturfTunnel_MapBorder:: - .incbin "data/layouts/RusturfTunnel/border.bin" - -RusturfTunnel_MapBlockdata:: - .incbin "data/layouts/RusturfTunnel/map.bin" - - .align 2 -RusturfTunnel_Layout:: - .4byte 0x24 - .4byte 0x18 - .4byte RusturfTunnel_MapBorder - .4byte RusturfTunnel_MapBlockdata - .4byte gTileset_General - .4byte gTileset_RusturfTunnel - diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc deleted file mode 100644 index bcc034ecd..000000000 --- a/data/layouts/SSTidalCorridor/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalCorridor_MapBorder:: - .incbin "data/layouts/SSTidalCorridor/border.bin" - -SSTidalCorridor_MapBlockdata:: - .incbin "data/layouts/SSTidalCorridor/map.bin" - - .align 2 -SSTidalCorridor_Layout:: - .4byte 0x12 - .4byte 0xd - .4byte SSTidalCorridor_MapBorder - .4byte SSTidalCorridor_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc deleted file mode 100644 index 807da09a1..000000000 --- a/data/layouts/SSTidalLowerDeck/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalLowerDeck_MapBorder:: - .incbin "data/layouts/SSTidalLowerDeck/border.bin" - -SSTidalLowerDeck_MapBlockdata:: - .incbin "data/layouts/SSTidalLowerDeck/map.bin" - - .align 2 -SSTidalLowerDeck_Layout:: - .4byte 0x11 - .4byte 0xd - .4byte SSTidalLowerDeck_MapBorder - .4byte SSTidalLowerDeck_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc deleted file mode 100644 index e44aac53c..000000000 --- a/data/layouts/SSTidalRooms/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalRooms_MapBorder:: - .incbin "data/layouts/SSTidalRooms/border.bin" - -SSTidalRooms_MapBlockdata:: - .incbin "data/layouts/SSTidalRooms/map.bin" - - .align 2 -SSTidalRooms_Layout:: - .4byte 0x24 - .4byte 0x12 - .4byte SSTidalRooms_MapBorder - .4byte SSTidalRooms_MapBlockdata - .4byte gTileset_General - .4byte gTileset_InsideShip - diff --git a/data/layouts/SafariZone_North/layout.inc b/data/layouts/SafariZone_North/layout.inc deleted file mode 100644 index c6986540f..000000000 --- a/data/layouts/SafariZone_North/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_North_MapBorder:: - .incbin "data/layouts/SafariZone_North/border.bin" - -SafariZone_North_MapBlockdata:: - .incbin "data/layouts/SafariZone_North/map.bin" - - .align 2 -SafariZone_North_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_North_MapBorder - .4byte SafariZone_North_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc deleted file mode 100644 index 026e4a7c7..000000000 --- a/data/layouts/SafariZone_Northeast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northeast_MapBorder:: - .incbin "data/layouts/SafariZone_Northeast/border.bin" - -SafariZone_Northeast_MapBlockdata:: - .incbin "data/layouts/SafariZone_Northeast/map.bin" - - .align 2 -SafariZone_Northeast_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northeast_MapBorder - .4byte SafariZone_Northeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc deleted file mode 100644 index 09d8bd482..000000000 --- a/data/layouts/SafariZone_Northwest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northwest_MapBorder:: - .incbin "data/layouts/SafariZone_Northwest/border.bin" - -SafariZone_Northwest_MapBlockdata:: - .incbin "data/layouts/SafariZone_Northwest/map.bin" - - .align 2 -SafariZone_Northwest_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Northwest_MapBorder - .4byte SafariZone_Northwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc deleted file mode 100644 index 4176cb370..000000000 --- a/data/layouts/SafariZone_RestHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse_MapBorder:: - .incbin "data/layouts/SafariZone_RestHouse/border.bin" - -SafariZone_RestHouse_MapBlockdata:: - .incbin "data/layouts/SafariZone_RestHouse/map.bin" - - .align 2 -SafariZone_RestHouse_Layout:: - .4byte 0xa - .4byte 0x9 - .4byte SafariZone_RestHouse_MapBorder - .4byte SafariZone_RestHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SafariZone_South/layout.inc b/data/layouts/SafariZone_South/layout.inc deleted file mode 100644 index ec83ba5b0..000000000 --- a/data/layouts/SafariZone_South/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_South_MapBorder:: - .incbin "data/layouts/SafariZone_South/border.bin" - -SafariZone_South_MapBlockdata:: - .incbin "data/layouts/SafariZone_South/map.bin" - - .align 2 -SafariZone_South_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_South_MapBorder - .4byte SafariZone_South_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc deleted file mode 100644 index e55309b46..000000000 --- a/data/layouts/SafariZone_Southeast/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southeast_MapBorder:: - .incbin "data/layouts/SafariZone_Southeast/border.bin" - -SafariZone_Southeast_MapBlockdata:: - .incbin "data/layouts/SafariZone_Southeast/map.bin" - - .align 2 -SafariZone_Southeast_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southeast_MapBorder - .4byte SafariZone_Southeast_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc deleted file mode 100644 index 1236d4d4b..000000000 --- a/data/layouts/SafariZone_Southwest/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southwest_MapBorder:: - .incbin "data/layouts/SafariZone_Southwest/border.bin" - -SafariZone_Southwest_MapBlockdata:: - .incbin "data/layouts/SafariZone_Southwest/map.bin" - - .align 2 -SafariZone_Southwest_Layout:: - .4byte 0x28 - .4byte 0x28 - .4byte SafariZone_Southwest_MapBorder - .4byte SafariZone_Southwest_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Lilycove - diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc deleted file mode 100644 index 897d873ab..000000000 --- a/data/layouts/ScorchedSlab/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ScorchedSlab_MapBorder:: - .incbin "data/layouts/ScorchedSlab/border.bin" - -ScorchedSlab_MapBlockdata:: - .incbin "data/layouts/ScorchedSlab/map.bin" - - .align 2 -ScorchedSlab_Layout:: - .4byte 0xf - .4byte 0x14 - .4byte ScorchedSlab_MapBorder - .4byte ScorchedSlab_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc deleted file mode 100644 index 1d6ce495b..000000000 --- a/data/layouts/SeafloorCavern_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Entrance_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Entrance/border.bin" - -SeafloorCavern_Entrance_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Entrance/map.bin" - - .align 2 -SeafloorCavern_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Entrance_MapBorder - .4byte SeafloorCavern_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc deleted file mode 100644 index 7f7cf0570..000000000 --- a/data/layouts/SeafloorCavern_Room1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room1/border.bin" - -SeafloorCavern_Room1_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room1/map.bin" - - .align 2 -SeafloorCavern_Room1_Layout:: - .4byte 0x14 - .4byte 0x15 - .4byte SeafloorCavern_Room1_MapBorder - .4byte SeafloorCavern_Room1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc deleted file mode 100644 index 89f4e6a79..000000000 --- a/data/layouts/SeafloorCavern_Room2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room2_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room2/border.bin" - -SeafloorCavern_Room2_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room2/map.bin" - - .align 2 -SeafloorCavern_Room2_Layout:: - .4byte 0x12 - .4byte 0xc - .4byte SeafloorCavern_Room2_MapBorder - .4byte SeafloorCavern_Room2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc deleted file mode 100644 index 070842a9f..000000000 --- a/data/layouts/SeafloorCavern_Room3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room3_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room3/border.bin" - -SeafloorCavern_Room3_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room3/map.bin" - - .align 2 -SeafloorCavern_Room3_Layout:: - .4byte 0x10 - .4byte 0x11 - .4byte SeafloorCavern_Room3_MapBorder - .4byte SeafloorCavern_Room3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc deleted file mode 100644 index 6c984109d..000000000 --- a/data/layouts/SeafloorCavern_Room4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room4_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room4/border.bin" - -SeafloorCavern_Room4_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room4/map.bin" - - .align 2 -SeafloorCavern_Room4_Layout:: - .4byte 0x12 - .4byte 0x13 - .4byte SeafloorCavern_Room4_MapBorder - .4byte SeafloorCavern_Room4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc deleted file mode 100644 index c48b00dba..000000000 --- a/data/layouts/SeafloorCavern_Room5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room5/border.bin" - -SeafloorCavern_Room5_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room5/map.bin" - - .align 2 -SeafloorCavern_Room5_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte SeafloorCavern_Room5_MapBorder - .4byte SeafloorCavern_Room5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc deleted file mode 100644 index f729d0b1b..000000000 --- a/data/layouts/SeafloorCavern_Room6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room6_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room6/border.bin" - -SeafloorCavern_Room6_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room6/map.bin" - - .align 2 -SeafloorCavern_Room6_Layout:: - .4byte 0x18 - .4byte 0x17 - .4byte SeafloorCavern_Room6_MapBorder - .4byte SeafloorCavern_Room6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc deleted file mode 100644 index 784b9bbb9..000000000 --- a/data/layouts/SeafloorCavern_Room7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room7_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room7/border.bin" - -SeafloorCavern_Room7_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room7/map.bin" - - .align 2 -SeafloorCavern_Room7_Layout:: - .4byte 0x17 - .4byte 0x19 - .4byte SeafloorCavern_Room7_MapBorder - .4byte SeafloorCavern_Room7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc deleted file mode 100644 index 8f3d826c7..000000000 --- a/data/layouts/SeafloorCavern_Room8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room8_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room8/border.bin" - -SeafloorCavern_Room8_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room8/map.bin" - - .align 2 -SeafloorCavern_Room8_Layout:: - .4byte 0xb - .4byte 0xe - .4byte SeafloorCavern_Room8_MapBorder - .4byte SeafloorCavern_Room8_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc deleted file mode 100644 index a5039da8f..000000000 --- a/data/layouts/SeafloorCavern_Room9/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room9_MapBorder:: - .incbin "data/layouts/SeafloorCavern_Room9/border.bin" - -SeafloorCavern_Room9_MapBlockdata:: - .incbin "data/layouts/SeafloorCavern_Room9/map.bin" - - .align 2 -SeafloorCavern_Room9_Layout:: - .4byte 0x1b - .4byte 0x2e - .4byte SeafloorCavern_Room9_MapBorder - .4byte SeafloorCavern_Room9_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc deleted file mode 100644 index 7a064d5f0..000000000 --- a/data/layouts/SealedChamber_InnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_InnerRoom_MapBorder:: - .incbin "data/layouts/SealedChamber_InnerRoom/border.bin" - -SealedChamber_InnerRoom_MapBlockdata:: - .incbin "data/layouts/SealedChamber_InnerRoom/map.bin" - - .align 2 -SealedChamber_InnerRoom_Layout:: - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_InnerRoom_MapBorder - .4byte SealedChamber_InnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc deleted file mode 100644 index bc6afaf29..000000000 --- a/data/layouts/SealedChamber_OuterRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_OuterRoom_MapBorder:: - .incbin "data/layouts/SealedChamber_OuterRoom/border.bin" - -SealedChamber_OuterRoom_MapBlockdata:: - .incbin "data/layouts/SealedChamber_OuterRoom/map.bin" - - .align 2 -SealedChamber_OuterRoom_Layout:: - .4byte 0x15 - .4byte 0x17 - .4byte SealedChamber_OuterRoom_MapBorder - .4byte SealedChamber_OuterRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc deleted file mode 100644 index ec138440a..000000000 --- a/data/layouts/SecretBase_BlueCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave1_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave1/border.bin" - -SecretBase_BlueCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave1/map.bin" - - .align 2 -SecretBase_BlueCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BlueCave1_MapBorder - .4byte SecretBase_BlueCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc deleted file mode 100644 index 8c2b48661..000000000 --- a/data/layouts/SecretBase_BlueCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave2_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave2/border.bin" - -SecretBase_BlueCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave2/map.bin" - - .align 2 -SecretBase_BlueCave2_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_BlueCave2_MapBorder - .4byte SecretBase_BlueCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc deleted file mode 100644 index 0ac8bee1b..000000000 --- a/data/layouts/SecretBase_BlueCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave3_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave3/border.bin" - -SecretBase_BlueCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave3/map.bin" - - .align 2 -SecretBase_BlueCave3_Layout:: - .4byte 0xa - .4byte 0x11 - .4byte SecretBase_BlueCave3_MapBorder - .4byte SecretBase_BlueCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc deleted file mode 100644 index d0e5ed45f..000000000 --- a/data/layouts/SecretBase_BlueCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave4_MapBorder:: - .incbin "data/layouts/SecretBase_BlueCave4/border.bin" - -SecretBase_BlueCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_BlueCave4/map.bin" - - .align 2 -SecretBase_BlueCave4_Layout:: - .4byte 0x9 - .4byte 0x11 - .4byte SecretBase_BlueCave4_MapBorder - .4byte SecretBase_BlueCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBlueCave - diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc deleted file mode 100644 index 9044fd6d1..000000000 --- a/data/layouts/SecretBase_BrownCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave1_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave1/border.bin" - -SecretBase_BrownCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave1/map.bin" - - .align 2 -SecretBase_BrownCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_BrownCave1_MapBorder - .4byte SecretBase_BrownCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc deleted file mode 100644 index 7cfb9573b..000000000 --- a/data/layouts/SecretBase_BrownCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave2_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave2/border.bin" - -SecretBase_BrownCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave2/map.bin" - - .align 2 -SecretBase_BrownCave2_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_BrownCave2_MapBorder - .4byte SecretBase_BrownCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc deleted file mode 100644 index 5ad1bf526..000000000 --- a/data/layouts/SecretBase_BrownCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave3_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave3/border.bin" - -SecretBase_BrownCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave3/map.bin" - - .align 2 -SecretBase_BrownCave3_Layout:: - .4byte 0xf - .4byte 0xb - .4byte SecretBase_BrownCave3_MapBorder - .4byte SecretBase_BrownCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc deleted file mode 100644 index 6094a3832..000000000 --- a/data/layouts/SecretBase_BrownCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave4_MapBorder:: - .incbin "data/layouts/SecretBase_BrownCave4/border.bin" - -SecretBase_BrownCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_BrownCave4/map.bin" - - .align 2 -SecretBase_BrownCave4_Layout:: - .4byte 0xe - .4byte 0xc - .4byte SecretBase_BrownCave4_MapBorder - .4byte SecretBase_BrownCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseBrownCave - diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc deleted file mode 100644 index a4664d509..000000000 --- a/data/layouts/SecretBase_RedCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave1_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave1/border.bin" - -SecretBase_RedCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave1/map.bin" - - .align 2 -SecretBase_RedCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_RedCave1_MapBorder - .4byte SecretBase_RedCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc deleted file mode 100644 index 7999395d8..000000000 --- a/data/layouts/SecretBase_RedCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave2_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave2/border.bin" - -SecretBase_RedCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave2/map.bin" - - .align 2 -SecretBase_RedCave2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_RedCave2_MapBorder - .4byte SecretBase_RedCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc deleted file mode 100644 index 6a3cc123b..000000000 --- a/data/layouts/SecretBase_RedCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave3_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave3/border.bin" - -SecretBase_RedCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave3/map.bin" - - .align 2 -SecretBase_RedCave3_Layout:: - .4byte 0xf - .4byte 0x8 - .4byte SecretBase_RedCave3_MapBorder - .4byte SecretBase_RedCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc deleted file mode 100644 index 665f44709..000000000 --- a/data/layouts/SecretBase_RedCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave4_MapBorder:: - .incbin "data/layouts/SecretBase_RedCave4/border.bin" - -SecretBase_RedCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_RedCave4/map.bin" - - .align 2 -SecretBase_RedCave4_Layout:: - .4byte 0x9 - .4byte 0xf - .4byte SecretBase_RedCave4_MapBorder - .4byte SecretBase_RedCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseRedCave - diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc deleted file mode 100644 index 2bcc9f58a..000000000 --- a/data/layouts/SecretBase_Shrub1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub1_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub1/border.bin" - -SecretBase_Shrub1_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub1/map.bin" - - .align 2 -SecretBase_Shrub1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Shrub1_MapBorder - .4byte SecretBase_Shrub1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc deleted file mode 100644 index e94376c3b..000000000 --- a/data/layouts/SecretBase_Shrub2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub2_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub2/border.bin" - -SecretBase_Shrub2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub2/map.bin" - - .align 2 -SecretBase_Shrub2_Layout:: - .4byte 0xf - .4byte 0x7 - .4byte SecretBase_Shrub2_MapBorder - .4byte SecretBase_Shrub2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc deleted file mode 100644 index 449f1a11f..000000000 --- a/data/layouts/SecretBase_Shrub3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub3_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub3/border.bin" - -SecretBase_Shrub3_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub3/map.bin" - - .align 2 -SecretBase_Shrub3_Layout:: - .4byte 0xd - .4byte 0xb - .4byte SecretBase_Shrub3_MapBorder - .4byte SecretBase_Shrub3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc deleted file mode 100644 index 139a82050..000000000 --- a/data/layouts/SecretBase_Shrub4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub4_MapBorder:: - .incbin "data/layouts/SecretBase_Shrub4/border.bin" - -SecretBase_Shrub4_MapBlockdata:: - .incbin "data/layouts/SecretBase_Shrub4/map.bin" - - .align 2 -SecretBase_Shrub4_Layout:: - .4byte 0xe - .4byte 0xb - .4byte SecretBase_Shrub4_MapBorder - .4byte SecretBase_Shrub4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseShrub - diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc deleted file mode 100644 index 73e6e41a6..000000000 --- a/data/layouts/SecretBase_Tree1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree1_MapBorder:: - .incbin "data/layouts/SecretBase_Tree1/border.bin" - -SecretBase_Tree1_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree1/map.bin" - - .align 2 -SecretBase_Tree1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_Tree1_MapBorder - .4byte SecretBase_Tree1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc deleted file mode 100644 index 95b122220..000000000 --- a/data/layouts/SecretBase_Tree2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2_MapBorder:: - .incbin "data/layouts/SecretBase_Tree2/border.bin" - -SecretBase_Tree2_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree2/map.bin" - - .align 2 -SecretBase_Tree2_Layout:: - .4byte 0x7 - .4byte 0x10 - .4byte SecretBase_Tree2_MapBorder - .4byte SecretBase_Tree2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc deleted file mode 100644 index 66716a404..000000000 --- a/data/layouts/SecretBase_Tree3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree3_MapBorder:: - .incbin "data/layouts/SecretBase_Tree3/border.bin" - -SecretBase_Tree3_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree3/map.bin" - - .align 2 -SecretBase_Tree3_Layout:: - .4byte 0x11 - .4byte 0x8 - .4byte SecretBase_Tree3_MapBorder - .4byte SecretBase_Tree3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc deleted file mode 100644 index 20d4c3e01..000000000 --- a/data/layouts/SecretBase_Tree4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree4_MapBorder:: - .incbin "data/layouts/SecretBase_Tree4/border.bin" - -SecretBase_Tree4_MapBlockdata:: - .incbin "data/layouts/SecretBase_Tree4/map.bin" - - .align 2 -SecretBase_Tree4_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SecretBase_Tree4_MapBorder - .4byte SecretBase_Tree4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseTree - diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc deleted file mode 100644 index 7fa3aa823..000000000 --- a/data/layouts/SecretBase_YellowCave1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave1_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave1/border.bin" - -SecretBase_YellowCave1_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave1/map.bin" - - .align 2 -SecretBase_YellowCave1_Layout:: - .4byte 0xb - .4byte 0x9 - .4byte SecretBase_YellowCave1_MapBorder - .4byte SecretBase_YellowCave1_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc deleted file mode 100644 index 0ae872e08..000000000 --- a/data/layouts/SecretBase_YellowCave2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave2_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave2/border.bin" - -SecretBase_YellowCave2_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave2/map.bin" - - .align 2 -SecretBase_YellowCave2_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SecretBase_YellowCave2_MapBorder - .4byte SecretBase_YellowCave2_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc deleted file mode 100644 index f42d88920..000000000 --- a/data/layouts/SecretBase_YellowCave3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave3_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave3/border.bin" - -SecretBase_YellowCave3_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave3/map.bin" - - .align 2 -SecretBase_YellowCave3_Layout:: - .4byte 0xc - .4byte 0xb - .4byte SecretBase_YellowCave3_MapBorder - .4byte SecretBase_YellowCave3_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc deleted file mode 100644 index b7a11df5a..000000000 --- a/data/layouts/SecretBase_YellowCave4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave4_MapBorder:: - .incbin "data/layouts/SecretBase_YellowCave4/border.bin" - -SecretBase_YellowCave4_MapBlockdata:: - .incbin "data/layouts/SecretBase_YellowCave4/map.bin" - - .align 2 -SecretBase_YellowCave4_Layout:: - .4byte 0xd - .4byte 0xe - .4byte SecretBase_YellowCave4_MapBorder - .4byte SecretBase_YellowCave4_MapBlockdata - .4byte gTileset_SecretBase - .4byte gTileset_SecretBaseYellowCave - diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc deleted file mode 100644 index a52425e15..000000000 --- a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin" - -ShoalCave_HighTideEntranceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_HighTideEntranceRoom_Layout:: - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_HighTideEntranceRoom_MapBorder - .4byte ShoalCave_HighTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc deleted file mode 100644 index 2d323b9e0..000000000 --- a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin" - -ShoalCave_HighTideInnerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" - - .align 2 -ShoalCave_HighTideInnerRoom_Layout:: - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_HighTideInnerRoom_MapBorder - .4byte ShoalCave_HighTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc deleted file mode 100644 index 0a1eee113..000000000 --- a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideEntranceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin" - -ShoalCave_LowTideEntranceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" - - .align 2 -ShoalCave_LowTideEntranceRoom_Layout:: - .4byte 0x23 - .4byte 0x23 - .4byte ShoalCave_LowTideEntranceRoom_MapBorder - .4byte ShoalCave_LowTideEntranceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc deleted file mode 100644 index 6d7a51575..000000000 --- a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideIceRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin" - -ShoalCave_LowTideIceRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin" - - .align 2 -ShoalCave_LowTideIceRoom_Layout:: - .4byte 0x14 - .4byte 0x1e - .4byte ShoalCave_LowTideIceRoom_MapBorder - .4byte ShoalCave_LowTideIceRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc deleted file mode 100644 index f66fc9723..000000000 --- a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideInnerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin" - -ShoalCave_LowTideInnerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" - - .align 2 -ShoalCave_LowTideInnerRoom_Layout:: - .4byte 0x2e - .4byte 0x26 - .4byte ShoalCave_LowTideInnerRoom_MapBorder - .4byte ShoalCave_LowTideInnerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc deleted file mode 100644 index 79cc82e8c..000000000 --- a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin" - -ShoalCave_LowTideLowerRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" - - .align 2 -ShoalCave_LowTideLowerRoom_Layout:: - .4byte 0x1f - .4byte 0xe - .4byte ShoalCave_LowTideLowerRoom_MapBorder - .4byte ShoalCave_LowTideLowerRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc deleted file mode 100644 index 62dbff40e..000000000 --- a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideStairsRoom_MapBorder:: - .incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin" - -ShoalCave_LowTideStairsRoom_MapBlockdata:: - .incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" - - .align 2 -ShoalCave_LowTideStairsRoom_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte ShoalCave_LowTideStairsRoom_MapBorder - .4byte ShoalCave_LowTideStairsRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc deleted file mode 100644 index f42855de8..000000000 --- a/data/layouts/SingleBattleColosseum/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SingleBattleColosseum_MapBorder:: - .incbin "data/layouts/SingleBattleColosseum/border.bin" - -SingleBattleColosseum_MapBlockdata:: - .incbin "data/layouts/SingleBattleColosseum/map.bin" - - .align 2 -SingleBattleColosseum_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte SingleBattleColosseum_MapBorder - .4byte SingleBattleColosseum_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc deleted file mode 100644 index 235f04935..000000000 --- a/data/layouts/SkyPillar_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_1F_MapBorder:: - .incbin "data/layouts/SkyPillar_1F/border.bin" - -SkyPillar_1F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_1F/map.bin" - - .align 2 -SkyPillar_1F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_1F_MapBorder - .4byte SkyPillar_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc deleted file mode 100644 index 368fcd518..000000000 --- a/data/layouts/SkyPillar_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_2F_MapBorder:: - .incbin "data/layouts/SkyPillar_2F/border.bin" - -SkyPillar_2F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_2F/map.bin" - - .align 2 -SkyPillar_2F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_2F_MapBorder - .4byte SkyPillar_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc deleted file mode 100644 index 32ac95143..000000000 --- a/data/layouts/SkyPillar_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_3F_MapBorder:: - .incbin "data/layouts/SkyPillar_3F/border.bin" - -SkyPillar_3F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_3F/map.bin" - - .align 2 -SkyPillar_3F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_3F_MapBorder - .4byte SkyPillar_3F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc deleted file mode 100644 index 055abf133..000000000 --- a/data/layouts/SkyPillar_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_4F_MapBorder:: - .incbin "data/layouts/SkyPillar_4F/border.bin" - -SkyPillar_4F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_4F/map.bin" - - .align 2 -SkyPillar_4F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_4F_MapBorder - .4byte SkyPillar_4F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc deleted file mode 100644 index 3f3bb5bc1..000000000 --- a/data/layouts/SkyPillar_5F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_5F_MapBorder:: - .incbin "data/layouts/SkyPillar_5F/border.bin" - -SkyPillar_5F_MapBlockdata:: - .incbin "data/layouts/SkyPillar_5F/map.bin" - - .align 2 -SkyPillar_5F_Layout:: - .4byte 0xe - .4byte 0xe - .4byte SkyPillar_5F_MapBorder - .4byte SkyPillar_5F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc deleted file mode 100644 index 1313bd196..000000000 --- a/data/layouts/SkyPillar_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Entrance_MapBorder:: - .incbin "data/layouts/SkyPillar_Entrance/border.bin" - -SkyPillar_Entrance_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Entrance/map.bin" - - .align 2 -SkyPillar_Entrance_Layout:: - .4byte 0x12 - .4byte 0x12 - .4byte SkyPillar_Entrance_MapBorder - .4byte SkyPillar_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc deleted file mode 100644 index 5eb9df563..000000000 --- a/data/layouts/SkyPillar_Outside/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Outside_MapBorder:: - .incbin "data/layouts/SkyPillar_Outside/border.bin" - -SkyPillar_Outside_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Outside/map.bin" - - .align 2 -SkyPillar_Outside_Layout:: - .4byte 0x1c - .4byte 0x17 - .4byte SkyPillar_Outside_MapBorder - .4byte SkyPillar_Outside_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc deleted file mode 100644 index 646c6f95f..000000000 --- a/data/layouts/SkyPillar_Top/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Top_MapBorder:: - .incbin "data/layouts/SkyPillar_Top/border.bin" - -SkyPillar_Top_MapBlockdata:: - .incbin "data/layouts/SkyPillar_Top/map.bin" - - .align 2 -SkyPillar_Top_Layout:: - .4byte 0x1b - .4byte 0x18 - .4byte SkyPillar_Top_MapBorder - .4byte SkyPillar_Top_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc deleted file mode 100644 index dfa184764..000000000 --- a/data/layouts/SlateportCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_MapBorder:: - .incbin "data/layouts/SlateportCity/border.bin" - -SlateportCity_MapBlockdata:: - .incbin "data/layouts/SlateportCity/map.bin" - - .align 2 -SlateportCity_Layout:: - .4byte 0x28 - .4byte 0x3c - .4byte SlateportCity_MapBorder - .4byte SlateportCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Slateport - diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc deleted file mode 100644 index f921eb5fc..000000000 --- a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_1F_MapBorder:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin" - -SlateportCity_OceanicMuseum_1F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_1F_Layout:: - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_1F_MapBorder - .4byte SlateportCity_OceanicMuseum_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc deleted file mode 100644 index 7a6998987..000000000 --- a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_2F_MapBorder:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin" - -SlateportCity_OceanicMuseum_2F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" - - .align 2 -SlateportCity_OceanicMuseum_2F_Layout:: - .4byte 0x14 - .4byte 0x9 - .4byte SlateportCity_OceanicMuseum_2F_MapBorder - .4byte SlateportCity_OceanicMuseum_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_OceanicMuseum - diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc deleted file mode 100644 index 44f9a559f..000000000 --- a/data/layouts/SlateportCity_PokemonFanClub/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonFanClub_MapBorder:: - .incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin" - -SlateportCity_PokemonFanClub_MapBlockdata:: - .incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin" - - .align 2 -SlateportCity_PokemonFanClub_Layout:: - .4byte 0xe - .4byte 0xb - .4byte SlateportCity_PokemonFanClub_MapBorder - .4byte SlateportCity_PokemonFanClub_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_PokemonFanClub - diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc deleted file mode 100644 index 00d5840c6..000000000 --- a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_1F_MapBorder:: - .incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin" - -SlateportCity_SternsShipyard_1F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_1F_Layout:: - .4byte 0x15 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_1F_MapBorder - .4byte SlateportCity_SternsShipyard_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc deleted file mode 100644 index 01a969a3a..000000000 --- a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_2F_MapBorder:: - .incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin" - -SlateportCity_SternsShipyard_2F_MapBlockdata:: - .incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" - - .align 2 -SlateportCity_SternsShipyard_2F_Layout:: - .4byte 0x11 - .4byte 0xf - .4byte SlateportCity_SternsShipyard_2F_MapBorder - .4byte SlateportCity_SternsShipyard_2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Facility - diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc deleted file mode 100644 index 400a29cbd..000000000 --- a/data/layouts/SootopolisCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MapBorder:: - .incbin "data/layouts/SootopolisCity/border.bin" - -SootopolisCity_MapBlockdata:: - .incbin "data/layouts/SootopolisCity/map.bin" - - .align 2 -SootopolisCity_Layout:: - .4byte 0x3c - .4byte 0x3c - .4byte SootopolisCity_MapBorder - .4byte SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc deleted file mode 100644 index 4c6a6eeef..000000000 --- a/data/layouts/SootopolisCity_Gym_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_Gym_1F/border.bin" - -SootopolisCity_Gym_1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_Gym_1F/map.bin" - - .align 2 -SootopolisCity_Gym_1F_Layout:: - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_1F_MapBorder - .4byte SootopolisCity_Gym_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc deleted file mode 100644 index 7eb90fb71..000000000 --- a/data/layouts/SootopolisCity_Gym_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin" - -SootopolisCity_Gym_B1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin" - - .align 2 -SootopolisCity_Gym_B1F_Layout:: - .4byte 0x11 - .4byte 0x1a - .4byte SootopolisCity_Gym_B1F_MapBorder - .4byte SootopolisCity_Gym_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_SootopolisGym - diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc deleted file mode 100644 index 1ad9cc41c..000000000 --- a/data/layouts/SootopolisCity_House1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House1_MapBorder:: - .incbin "data/layouts/SootopolisCity_House1/border.bin" - -SootopolisCity_House1_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House1/map.bin" - - .align 2 -SootopolisCity_House1_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House1_MapBorder - .4byte SootopolisCity_House1_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc deleted file mode 100644 index 9007d584b..000000000 --- a/data/layouts/SootopolisCity_House2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House2_MapBorder:: - .incbin "data/layouts/SootopolisCity_House2/border.bin" - -SootopolisCity_House2_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House2/map.bin" - - .align 2 -SootopolisCity_House2_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House2_MapBorder - .4byte SootopolisCity_House2_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc deleted file mode 100644 index 540f4306c..000000000 --- a/data/layouts/SootopolisCity_House3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House3_MapBorder:: - .incbin "data/layouts/SootopolisCity_House3/border.bin" - -SootopolisCity_House3_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_House3/map.bin" - - .align 2 -SootopolisCity_House3_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_House3_MapBorder - .4byte SootopolisCity_House3_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc b/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc deleted file mode 100644 index 152563eb6..000000000 --- a/data/layouts/SootopolisCity_LotadAndSeedotHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_MapBorder:: - .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin" - -SootopolisCity_LotadAndSeedotHouse_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" - - .align 2 -SootopolisCity_LotadAndSeedotHouse_Layout:: - .4byte 0x8 - .4byte 0x7 - .4byte SootopolisCity_LotadAndSeedotHouse_MapBorder - .4byte SootopolisCity_LotadAndSeedotHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc deleted file mode 100644 index 0b846950e..000000000 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin" - -SootopolisCity_MysteryEventsHouse_1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_1F_Layout:: - .4byte 0xb - .4byte 0x8 - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - diff --git a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc b/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc deleted file mode 100644 index 1bb92b933..000000000 --- a/data/layouts/SootopolisCity_MysteryEventsHouse_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_MapBorder:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin" - -SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata:: - .incbin "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" - - .align 2 -SootopolisCity_MysteryEventsHouse_B1F_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBorder - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc deleted file mode 100644 index 4a62cd3f5..000000000 --- a/data/layouts/SouthernIsland_Exterior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Exterior_MapBorder:: - .incbin "data/layouts/SouthernIsland_Exterior/border.bin" - -SouthernIsland_Exterior_MapBlockdata:: - .incbin "data/layouts/SouthernIsland_Exterior/map.bin" - - .align 2 -SouthernIsland_Exterior_Layout:: - .4byte 0x21 - .4byte 0x1e - .4byte SouthernIsland_Exterior_MapBorder - .4byte SouthernIsland_Exterior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc deleted file mode 100644 index b4d9a35d2..000000000 --- a/data/layouts/SouthernIsland_Interior/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Interior_MapBorder:: - .incbin "data/layouts/SouthernIsland_Interior/border.bin" - -SouthernIsland_Interior_MapBlockdata:: - .incbin "data/layouts/SouthernIsland_Interior/map.bin" - - .align 2 -SouthernIsland_Interior_Layout:: - .4byte 0x1b - .4byte 0x18 - .4byte SouthernIsland_Interior_MapBorder - .4byte SouthernIsland_Interior_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Rustboro - diff --git a/data/layouts/TerraCave_End/layout.inc b/data/layouts/TerraCave_End/layout.inc deleted file mode 100644 index 0865a8e5b..000000000 --- a/data/layouts/TerraCave_End/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_End_MapBorder:: - .incbin "data/layouts/TerraCave_End/border.bin" - -TerraCave_End_MapBlockdata:: - .incbin "data/layouts/TerraCave_End/map.bin" - - .align 2 -TerraCave_End_Layout:: - .4byte 0x1b - .4byte 0x1e - .4byte TerraCave_End_MapBorder - .4byte TerraCave_End_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/TerraCave_Entrance/layout.inc b/data/layouts/TerraCave_Entrance/layout.inc deleted file mode 100644 index 19d50ef44..000000000 --- a/data/layouts/TerraCave_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_Entrance_MapBorder:: - .incbin "data/layouts/TerraCave_Entrance/border.bin" - -TerraCave_Entrance_MapBlockdata:: - .incbin "data/layouts/TerraCave_Entrance/map.bin" - - .align 2 -TerraCave_Entrance_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte TerraCave_Entrance_MapBorder - .4byte TerraCave_Entrance_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc deleted file mode 100644 index 5e0297e7a..000000000 --- a/data/layouts/TradeCenter/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TradeCenter_MapBorder:: - .incbin "data/layouts/TradeCenter/border.bin" - -TradeCenter_MapBlockdata:: - .incbin "data/layouts/TradeCenter/map.bin" - - .align 2 -TradeCenter_Layout:: - .4byte 0xc - .4byte 0x9 - .4byte TradeCenter_MapBorder - .4byte TradeCenter_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_CableClub - diff --git a/data/layouts/TrainerHill_1F/layout.inc b/data/layouts/TrainerHill_1F/layout.inc deleted file mode 100644 index 2009cd49e..000000000 --- a/data/layouts/TrainerHill_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_1F_MapBorder:: - .incbin "data/layouts/TrainerHill_1F/border.bin" - -TrainerHill_1F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_1F/map.bin" - - .align 2 -TrainerHill_1F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_1F_MapBorder - .4byte TrainerHill_1F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_2F/layout.inc b/data/layouts/TrainerHill_2F/layout.inc deleted file mode 100644 index f67b54bf1..000000000 --- a/data/layouts/TrainerHill_2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_2F_MapBorder:: - .incbin "data/layouts/TrainerHill_2F/border.bin" - -TrainerHill_2F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_2F/map.bin" - - .align 2 -TrainerHill_2F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_2F_MapBorder - .4byte TrainerHill_2F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_3F/layout.inc b/data/layouts/TrainerHill_3F/layout.inc deleted file mode 100644 index 280517f41..000000000 --- a/data/layouts/TrainerHill_3F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_3F_MapBorder:: - .incbin "data/layouts/TrainerHill_3F/border.bin" - -TrainerHill_3F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_3F/map.bin" - - .align 2 -TrainerHill_3F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_3F_MapBorder - .4byte TrainerHill_3F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_4F/layout.inc b/data/layouts/TrainerHill_4F/layout.inc deleted file mode 100644 index eed0b0120..000000000 --- a/data/layouts/TrainerHill_4F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_4F_MapBorder:: - .incbin "data/layouts/TrainerHill_4F/border.bin" - -TrainerHill_4F_MapBlockdata:: - .incbin "data/layouts/TrainerHill_4F/map.bin" - - .align 2 -TrainerHill_4F_Layout:: - .4byte 0x10 - .4byte 0x15 - .4byte TrainerHill_4F_MapBorder - .4byte TrainerHill_4F_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_Entrance/layout.inc b/data/layouts/TrainerHill_Entrance/layout.inc deleted file mode 100644 index 896f43e0d..000000000 --- a/data/layouts/TrainerHill_Entrance/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Entrance_MapBorder:: - .incbin "data/layouts/TrainerHill_Entrance/border.bin" - -TrainerHill_Entrance_MapBlockdata:: - .incbin "data/layouts/TrainerHill_Entrance/map.bin" - - .align 2 -TrainerHill_Entrance_Layout:: - .4byte 0x13 - .4byte 0x11 - .4byte TrainerHill_Entrance_MapBorder - .4byte TrainerHill_Entrance_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/TrainerHill_Roof/layout.inc b/data/layouts/TrainerHill_Roof/layout.inc deleted file mode 100644 index 9477dceda..000000000 --- a/data/layouts/TrainerHill_Roof/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Roof_MapBorder:: - .incbin "data/layouts/TrainerHill_Roof/border.bin" - -TrainerHill_Roof_MapBlockdata:: - .incbin "data/layouts/TrainerHill_Roof/map.bin" - - .align 2 -TrainerHill_Roof_Layout:: - .4byte 0x19 - .4byte 0x10 - .4byte TrainerHill_Roof_MapBorder - .4byte TrainerHill_Roof_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_TrainerHill - diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc deleted file mode 100644 index 8e027bbd2..000000000 --- a/data/layouts/Underwater1/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater1_MapBorder:: - .incbin "data/layouts/Underwater1/border.bin" - -Underwater1_MapBlockdata:: - .incbin "data/layouts/Underwater1/map.bin" - - .align 2 -Underwater1_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater1_MapBorder - .4byte Underwater1_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc deleted file mode 100644 index ac6350d47..000000000 --- a/data/layouts/Underwater2/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2_MapBorder:: - .incbin "data/layouts/Underwater2/border.bin" - -Underwater2_MapBlockdata:: - .incbin "data/layouts/Underwater2/map.bin" - - .align 2 -Underwater2_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater2_MapBorder - .4byte Underwater2_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc deleted file mode 100644 index c365b6b8f..000000000 --- a/data/layouts/Underwater3/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater3_MapBorder:: - .incbin "data/layouts/Underwater3/border.bin" - -Underwater3_MapBlockdata:: - .incbin "data/layouts/Underwater3/map.bin" - - .align 2 -Underwater3_Layout:: - .4byte 0x50 - .4byte 0x50 - .4byte Underwater3_MapBorder - .4byte Underwater3_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc deleted file mode 100644 index 9e22e4e40..000000000 --- a/data/layouts/Underwater4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater4_MapBorder:: - .incbin "data/layouts/Underwater4/border.bin" - -Underwater4_MapBlockdata:: - .incbin "data/layouts/Underwater4/map.bin" - - .align 2 -Underwater4_Layout:: - .4byte 0x78 - .4byte 0x28 - .4byte Underwater4_MapBorder - .4byte Underwater4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater5/layout.inc b/data/layouts/Underwater5/layout.inc deleted file mode 100644 index 6394eec54..000000000 --- a/data/layouts/Underwater5/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater5_MapBorder:: - .incbin "data/layouts/Underwater5/border.bin" - -Underwater5_MapBlockdata:: - .incbin "data/layouts/Underwater5/map.bin" - - .align 2 -Underwater5_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Underwater5_MapBorder - .4byte Underwater5_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater6/layout.inc b/data/layouts/Underwater6/layout.inc deleted file mode 100644 index 247af44bd..000000000 --- a/data/layouts/Underwater6/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater6_MapBorder:: - .incbin "data/layouts/Underwater6/border.bin" - -Underwater6_MapBlockdata:: - .incbin "data/layouts/Underwater6/map.bin" - - .align 2 -Underwater6_Layout:: - .4byte 0x28 - .4byte 0x50 - .4byte Underwater6_MapBorder - .4byte Underwater6_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater7/layout.inc b/data/layouts/Underwater7/layout.inc deleted file mode 100644 index 5c2670b11..000000000 --- a/data/layouts/Underwater7/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater7_MapBorder:: - .incbin "data/layouts/Underwater7/border.bin" - -Underwater7_MapBlockdata:: - .incbin "data/layouts/Underwater7/map.bin" - - .align 2 -Underwater7_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte Underwater7_MapBorder - .4byte Underwater7_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_MarineCave/layout.inc b/data/layouts/Underwater_MarineCave/layout.inc deleted file mode 100644 index 52a3a7851..000000000 --- a/data/layouts/Underwater_MarineCave/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_MarineCave_MapBorder:: - .incbin "data/layouts/Underwater_MarineCave/border.bin" - -Underwater_MarineCave_MapBlockdata:: - .incbin "data/layouts/Underwater_MarineCave/map.bin" - - .align 2 -Underwater_MarineCave_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte Underwater_MarineCave_MapBorder - .4byte Underwater_MarineCave_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc deleted file mode 100644 index 1534564a4..000000000 --- a/data/layouts/Underwater_Route134/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_Route134_MapBorder:: - .incbin "data/layouts/Underwater_Route134/border.bin" - -Underwater_Route134_MapBlockdata:: - .incbin "data/layouts/Underwater_Route134/map.bin" - - .align 2 -Underwater_Route134_Layout:: - .4byte 0x12 - .4byte 0xa - .4byte Underwater_Route134_MapBorder - .4byte Underwater_Route134_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc deleted file mode 100644 index 5bce06a6b..000000000 --- a/data/layouts/Underwater_SeafloorCavern/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SeafloorCavern_MapBorder:: - .incbin "data/layouts/Underwater_SeafloorCavern/border.bin" - -Underwater_SeafloorCavern_MapBlockdata:: - .incbin "data/layouts/Underwater_SeafloorCavern/map.bin" - - .align 2 -Underwater_SeafloorCavern_Layout:: - .4byte 0xe - .4byte 0x9 - .4byte Underwater_SeafloorCavern_MapBorder - .4byte Underwater_SeafloorCavern_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc deleted file mode 100644 index 5baf5dde8..000000000 --- a/data/layouts/Underwater_SealedChamber/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SealedChamber_MapBorder:: - .incbin "data/layouts/Underwater_SealedChamber/border.bin" - -Underwater_SealedChamber_MapBlockdata:: - .incbin "data/layouts/Underwater_SealedChamber/map.bin" - - .align 2 -Underwater_SealedChamber_Layout:: - .4byte 0x16 - .4byte 0x30 - .4byte Underwater_SealedChamber_MapBorder - .4byte Underwater_SealedChamber_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc deleted file mode 100644 index 4a1b0aa02..000000000 --- a/data/layouts/Underwater_SootopolisCity/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SootopolisCity_MapBorder:: - .incbin "data/layouts/Underwater_SootopolisCity/border.bin" - -Underwater_SootopolisCity_MapBlockdata:: - .incbin "data/layouts/Underwater_SootopolisCity/map.bin" - - .align 2 -Underwater_SootopolisCity_Layout:: - .4byte 0x14 - .4byte 0xa - .4byte Underwater_SootopolisCity_MapBorder - .4byte Underwater_SootopolisCity_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Underwater - diff --git a/data/layouts/UnionRoom/layout.inc b/data/layouts/UnionRoom/layout.inc deleted file mode 100644 index 0c2a065a5..000000000 --- a/data/layouts/UnionRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnionRoom_MapBorder:: - .incbin "data/layouts/UnionRoom/border.bin" - -UnionRoom_MapBlockdata:: - .incbin "data/layouts/UnionRoom/map.bin" - - .align 2 -UnionRoom_Layout:: - .4byte 0xf - .4byte 0xc - .4byte UnionRoom_MapBorder - .4byte UnionRoom_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_UnionRoom - diff --git a/data/layouts/UnknownMap_08417FC4/layout.inc b/data/layouts/UnknownMap_08417FC4/layout.inc deleted file mode 100644 index 41e954b4e..000000000 --- a/data/layouts/UnknownMap_08417FC4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08417FC4_MapBorder:: - .incbin "data/layouts/UnknownMap_08417FC4/border.bin" - -UnknownMap_08417FC4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08417FC4/map.bin" - - .align 2 -UnknownMap_08417FC4_Layout:: - .4byte 0x50 - .4byte 0x28 - .4byte UnknownMap_08417FC4_MapBorder - .4byte UnknownMap_08417FC4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_08428450/layout.inc b/data/layouts/UnknownMap_08428450/layout.inc deleted file mode 100644 index f1695ec66..000000000 --- a/data/layouts/UnknownMap_08428450/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08428450_MapBorder:: - .incbin "data/layouts/UnknownMap_08428450/border.bin" - -UnknownMap_08428450_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08428450/map.bin" - - .align 2 -UnknownMap_08428450_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_08428450_MapBorder - .4byte UnknownMap_08428450_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_084294C4/layout.inc b/data/layouts/UnknownMap_084294C4/layout.inc deleted file mode 100644 index f19bd682d..000000000 --- a/data/layouts/UnknownMap_084294C4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084294C4_MapBorder:: - .incbin "data/layouts/UnknownMap_084294C4/border.bin" - -UnknownMap_084294C4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084294C4/map.bin" - - .align 2 -UnknownMap_084294C4_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084294C4_MapBorder - .4byte UnknownMap_084294C4_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_084294E8/layout.inc b/data/layouts/UnknownMap_084294E8/layout.inc deleted file mode 100644 index e351524e1..000000000 --- a/data/layouts/UnknownMap_084294E8/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084294E8_MapBorder:: - .incbin "data/layouts/UnknownMap_084294E8/border.bin" - -UnknownMap_084294E8_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084294E8/map.bin" - - .align 2 -UnknownMap_084294E8_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084294E8_MapBorder - .4byte UnknownMap_084294E8_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_0843E6C0/layout.inc b/data/layouts/UnknownMap_0843E6C0/layout.inc deleted file mode 100644 index fd01ddc10..000000000 --- a/data/layouts/UnknownMap_0843E6C0/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E6C0_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E6C0/border.bin" - -UnknownMap_0843E6C0_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E6C0/map.bin" - - .align 2 -UnknownMap_0843E6C0_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E6C0_MapBorder - .4byte UnknownMap_0843E6C0_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E6E4/layout.inc b/data/layouts/UnknownMap_0843E6E4/layout.inc deleted file mode 100644 index 80ad93127..000000000 --- a/data/layouts/UnknownMap_0843E6E4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E6E4_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E6E4/border.bin" - -UnknownMap_0843E6E4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E6E4/map.bin" - - .align 2 -UnknownMap_0843E6E4_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E6E4_MapBorder - .4byte UnknownMap_0843E6E4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E708/layout.inc b/data/layouts/UnknownMap_0843E708/layout.inc deleted file mode 100644 index 16d4e400c..000000000 --- a/data/layouts/UnknownMap_0843E708/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E708_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E708/border.bin" - -UnknownMap_0843E708_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E708/map.bin" - - .align 2 -UnknownMap_0843E708_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E708_MapBorder - .4byte UnknownMap_0843E708_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E72C/layout.inc b/data/layouts/UnknownMap_0843E72C/layout.inc deleted file mode 100644 index c6541b3ea..000000000 --- a/data/layouts/UnknownMap_0843E72C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E72C_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E72C/border.bin" - -UnknownMap_0843E72C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E72C/map.bin" - - .align 2 -UnknownMap_0843E72C_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E72C_MapBorder - .4byte UnknownMap_0843E72C_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E750/layout.inc b/data/layouts/UnknownMap_0843E750/layout.inc deleted file mode 100644 index e566a93b7..000000000 --- a/data/layouts/UnknownMap_0843E750/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E750_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E750/border.bin" - -UnknownMap_0843E750_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E750/map.bin" - - .align 2 -UnknownMap_0843E750_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E750_MapBorder - .4byte UnknownMap_0843E750_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E774/layout.inc b/data/layouts/UnknownMap_0843E774/layout.inc deleted file mode 100644 index ce1a438eb..000000000 --- a/data/layouts/UnknownMap_0843E774/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E774_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E774/border.bin" - -UnknownMap_0843E774_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E774/map.bin" - - .align 2 -UnknownMap_0843E774_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E774_MapBorder - .4byte UnknownMap_0843E774_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E798/layout.inc b/data/layouts/UnknownMap_0843E798/layout.inc deleted file mode 100644 index 179e0d881..000000000 --- a/data/layouts/UnknownMap_0843E798/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E798_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E798/border.bin" - -UnknownMap_0843E798_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E798/map.bin" - - .align 2 -UnknownMap_0843E798_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E798_MapBorder - .4byte UnknownMap_0843E798_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E7BC/layout.inc b/data/layouts/UnknownMap_0843E7BC/layout.inc deleted file mode 100644 index 907ec6266..000000000 --- a/data/layouts/UnknownMap_0843E7BC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E7BC_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E7BC/border.bin" - -UnknownMap_0843E7BC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E7BC/map.bin" - - .align 2 -UnknownMap_0843E7BC_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E7BC_MapBorder - .4byte UnknownMap_0843E7BC_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E7E0/layout.inc b/data/layouts/UnknownMap_0843E7E0/layout.inc deleted file mode 100644 index c56046ef1..000000000 --- a/data/layouts/UnknownMap_0843E7E0/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E7E0_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E7E0/border.bin" - -UnknownMap_0843E7E0_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E7E0/map.bin" - - .align 2 -UnknownMap_0843E7E0_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E7E0_MapBorder - .4byte UnknownMap_0843E7E0_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E804/layout.inc b/data/layouts/UnknownMap_0843E804/layout.inc deleted file mode 100644 index 49e32dbc7..000000000 --- a/data/layouts/UnknownMap_0843E804/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E804_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E804/border.bin" - -UnknownMap_0843E804_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E804/map.bin" - - .align 2 -UnknownMap_0843E804_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E804_MapBorder - .4byte UnknownMap_0843E804_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E828/layout.inc b/data/layouts/UnknownMap_0843E828/layout.inc deleted file mode 100644 index 3cbe67299..000000000 --- a/data/layouts/UnknownMap_0843E828/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E828_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E828/border.bin" - -UnknownMap_0843E828_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E828/map.bin" - - .align 2 -UnknownMap_0843E828_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E828_MapBorder - .4byte UnknownMap_0843E828_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E84C/layout.inc b/data/layouts/UnknownMap_0843E84C/layout.inc deleted file mode 100644 index 7449536bf..000000000 --- a/data/layouts/UnknownMap_0843E84C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E84C_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E84C/border.bin" - -UnknownMap_0843E84C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E84C/map.bin" - - .align 2 -UnknownMap_0843E84C_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E84C_MapBorder - .4byte UnknownMap_0843E84C_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E870/layout.inc b/data/layouts/UnknownMap_0843E870/layout.inc deleted file mode 100644 index 23880a79c..000000000 --- a/data/layouts/UnknownMap_0843E870/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E870_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E870/border.bin" - -UnknownMap_0843E870_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E870/map.bin" - - .align 2 -UnknownMap_0843E870_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E870_MapBorder - .4byte UnknownMap_0843E870_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0843E894/layout.inc b/data/layouts/UnknownMap_0843E894/layout.inc deleted file mode 100755 index e42bfcdd9..000000000 --- a/data/layouts/UnknownMap_0843E894/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0843E894_MapBorder:: - .incbin "data/layouts/UnknownMap_0843E894/border.bin" - -UnknownMap_0843E894_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0843E894/map.bin" - - .align 2 -UnknownMap_0843E894_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_0843E894_MapBorder - .4byte UnknownMap_0843E894_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_08447028/layout.inc b/data/layouts/UnknownMap_08447028/layout.inc deleted file mode 100644 index 39d7bb18a..000000000 --- a/data/layouts/UnknownMap_08447028/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08447028_MapBorder:: - .incbin "data/layouts/UnknownMap_08447028/border.bin" - -UnknownMap_08447028_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08447028/map.bin" - - .align 2 -UnknownMap_08447028_Layout:: - .4byte 0x3A - .4byte 0x1A - .4byte UnknownMap_08447028_MapBorder - .4byte UnknownMap_08447028_MapBlockdata - .4byte gTileset_General - .4byte 0 - diff --git a/data/layouts/UnknownMap_0845A394/layout.inc b/data/layouts/UnknownMap_0845A394/layout.inc deleted file mode 100644 index a180340f8..000000000 --- a/data/layouts/UnknownMap_0845A394/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845A394_MapBorder:: - .incbin "data/layouts/UnknownMap_0845A394/border.bin" - -UnknownMap_0845A394_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845A394/map.bin" - - .align 2 -UnknownMap_0845A394_Layout:: - .4byte 0x13 - .4byte 0x13 - .4byte UnknownMap_0845A394_MapBorder - .4byte UnknownMap_0845A394_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_0845D470/layout.inc b/data/layouts/UnknownMap_0845D470/layout.inc deleted file mode 100644 index ce6a4c819..000000000 --- a/data/layouts/UnknownMap_0845D470/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845D470_MapBorder:: - .incbin "data/layouts/UnknownMap_0845D470/border.bin" - -UnknownMap_0845D470_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845D470/map.bin" - - .align 2 -UnknownMap_0845D470_Layout:: - .4byte 0x3C - .4byte 0x28 - .4byte UnknownMap_0845D470_MapBorder - .4byte UnknownMap_0845D470_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_0845ECB4/layout.inc b/data/layouts/UnknownMap_0845ECB4/layout.inc deleted file mode 100644 index 535c4a6e9..000000000 --- a/data/layouts/UnknownMap_0845ECB4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0845ECB4_MapBorder:: - .incbin "data/layouts/UnknownMap_0845ECB4/border.bin" - -UnknownMap_0845ECB4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0845ECB4/map.bin" - - .align 2 -UnknownMap_0845ECB4_Layout:: - .4byte 0x1B - .4byte 0x2E - .4byte UnknownMap_0845ECB4_MapBorder - .4byte UnknownMap_0845ECB4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/UnknownMap_08469200/layout.inc b/data/layouts/UnknownMap_08469200/layout.inc deleted file mode 100644 index 22191c61c..000000000 --- a/data/layouts/UnknownMap_08469200/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08469200_MapBorder:: - .incbin "data/layouts/UnknownMap_08469200/border.bin" - -UnknownMap_08469200_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08469200/map.bin" - - .align 2 -UnknownMap_08469200_Layout:: - .4byte 0x3C - .4byte 0x3C - .4byte UnknownMap_08469200_MapBorder - .4byte UnknownMap_08469200_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Sootopolis - diff --git a/data/layouts/UnknownMap_084693AC/layout.inc b/data/layouts/UnknownMap_084693AC/layout.inc deleted file mode 100644 index 0106c666a..000000000 --- a/data/layouts/UnknownMap_084693AC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084693AC_MapBorder:: - .incbin "data/layouts/UnknownMap_084693AC/border.bin" - -UnknownMap_084693AC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084693AC/map.bin" - - .align 2 -UnknownMap_084693AC_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_084693AC_MapBorder - .4byte UnknownMap_084693AC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_BattlePike - diff --git a/data/layouts/UnknownMap_08480DAC/layout.inc b/data/layouts/UnknownMap_08480DAC/layout.inc deleted file mode 100644 index b44036239..000000000 --- a/data/layouts/UnknownMap_08480DAC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08480DAC_MapBorder:: - .incbin "data/layouts/UnknownMap_08480DAC/border.bin" - -UnknownMap_08480DAC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08480DAC/map.bin" - - .align 2 -UnknownMap_08480DAC_Layout:: - .4byte 0xD - .4byte 0xD - .4byte UnknownMap_08480DAC_MapBorder - .4byte UnknownMap_08480DAC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Lab - diff --git a/data/layouts/UnknownMap_08480F54/layout.inc b/data/layouts/UnknownMap_08480F54/layout.inc deleted file mode 100644 index 4593a8ba4..000000000 --- a/data/layouts/UnknownMap_08480F54/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08480F54_MapBorder:: - .incbin "data/layouts/UnknownMap_08480F54/border.bin" - -UnknownMap_08480F54_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08480F54/map.bin" - - .align 2 -UnknownMap_08480F54_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_08480F54_MapBorder - .4byte UnknownMap_08480F54_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_084810FC/layout.inc b/data/layouts/UnknownMap_084810FC/layout.inc deleted file mode 100644 index 6b73bfdce..000000000 --- a/data/layouts/UnknownMap_084810FC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084810FC_MapBorder:: - .incbin "data/layouts/UnknownMap_084810FC/border.bin" - -UnknownMap_084810FC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084810FC/map.bin" - - .align 2 -UnknownMap_084810FC_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084810FC_MapBorder - .4byte UnknownMap_084810FC_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_084812A4/layout.inc b/data/layouts/UnknownMap_084812A4/layout.inc deleted file mode 100644 index a394c8ef3..000000000 --- a/data/layouts/UnknownMap_084812A4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084812A4_MapBorder:: - .incbin "data/layouts/UnknownMap_084812A4/border.bin" - -UnknownMap_084812A4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084812A4/map.bin" - - .align 2 -UnknownMap_084812A4_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084812A4_MapBorder - .4byte UnknownMap_084812A4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_0848144C/layout.inc b/data/layouts/UnknownMap_0848144C/layout.inc deleted file mode 100644 index cabe0b25b..000000000 --- a/data/layouts/UnknownMap_0848144C/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_0848144C_MapBorder:: - .incbin "data/layouts/UnknownMap_0848144C/border.bin" - -UnknownMap_0848144C_MapBlockdata:: - .incbin "data/layouts/UnknownMap_0848144C/map.bin" - - .align 2 -UnknownMap_0848144C_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_0848144C_MapBorder - .4byte UnknownMap_0848144C_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_084815F4/layout.inc b/data/layouts/UnknownMap_084815F4/layout.inc deleted file mode 100644 index 73ed49c79..000000000 --- a/data/layouts/UnknownMap_084815F4/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_084815F4_MapBorder:: - .incbin "data/layouts/UnknownMap_084815F4/border.bin" - -UnknownMap_084815F4_MapBlockdata:: - .incbin "data/layouts/UnknownMap_084815F4/map.bin" - - .align 2 -UnknownMap_084815F4_Layout:: - .4byte 0xE - .4byte 0xE - .4byte UnknownMap_084815F4_MapBorder - .4byte UnknownMap_084815F4_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_08481B24/layout.inc b/data/layouts/UnknownMap_08481B24/layout.inc deleted file mode 100644 index 250528be0..000000000 --- a/data/layouts/UnknownMap_08481B24/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08481B24_MapBorder:: - .incbin "data/layouts/UnknownMap_08481B24/border.bin" - -UnknownMap_08481B24_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08481B24/map.bin" - - .align 2 -UnknownMap_08481B24_Layout:: - .4byte 0x1B - .4byte 0x18 - .4byte UnknownMap_08481B24_MapBorder - .4byte UnknownMap_08481B24_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Pacifidlog - diff --git a/data/layouts/UnknownMap_08481DBC/layout.inc b/data/layouts/UnknownMap_08481DBC/layout.inc deleted file mode 100644 index 465b92dc8..000000000 --- a/data/layouts/UnknownMap_08481DBC/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_08481DBC_MapBorder:: - .incbin "data/layouts/UnknownMap_08481DBC/border.bin" - -UnknownMap_08481DBC_MapBlockdata:: - .incbin "data/layouts/UnknownMap_08481DBC/map.bin" - - .align 2 -UnknownMap_08481DBC_Layout:: - .4byte 0xB - .4byte 0x8 - .4byte UnknownMap_08481DBC_MapBorder - .4byte UnknownMap_08481DBC_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_MysteryEventsHouse - diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc deleted file mode 100644 index bb7002a20..000000000 --- a/data/layouts/UnknownMap_25_29/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_29_MapBorder:: - .incbin "data/layouts/UnknownMap_25_29/border.bin" - -UnknownMap_25_29_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_29/map.bin" - - .align 2 -UnknownMap_25_29_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_29_MapBorder - .4byte UnknownMap_25_29_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc deleted file mode 100644 index 5937a2195..000000000 --- a/data/layouts/UnknownMap_25_30/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_30_MapBorder:: - .incbin "data/layouts/UnknownMap_25_30/border.bin" - -UnknownMap_25_30_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_30/map.bin" - - .align 2 -UnknownMap_25_30_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_30_MapBorder - .4byte UnknownMap_25_30_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc deleted file mode 100644 index 3dcbc7986..000000000 --- a/data/layouts/UnknownMap_25_31/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_31_MapBorder:: - .incbin "data/layouts/UnknownMap_25_31/border.bin" - -UnknownMap_25_31_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_31/map.bin" - - .align 2 -UnknownMap_25_31_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_31_MapBorder - .4byte UnknownMap_25_31_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc deleted file mode 100644 index 0ffe4c0b7..000000000 --- a/data/layouts/UnknownMap_25_32/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_32_MapBorder:: - .incbin "data/layouts/UnknownMap_25_32/border.bin" - -UnknownMap_25_32_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_32/map.bin" - - .align 2 -UnknownMap_25_32_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_32_MapBorder - .4byte UnknownMap_25_32_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc deleted file mode 100644 index 3f8113a6f..000000000 --- a/data/layouts/UnknownMap_25_33/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_33_MapBorder:: - .incbin "data/layouts/UnknownMap_25_33/border.bin" - -UnknownMap_25_33_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_33/map.bin" - - .align 2 -UnknownMap_25_33_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_33_MapBorder - .4byte UnknownMap_25_33_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc deleted file mode 100644 index 6001d8fe7..000000000 --- a/data/layouts/UnknownMap_25_34/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_34_MapBorder:: - .incbin "data/layouts/UnknownMap_25_34/border.bin" - -UnknownMap_25_34_MapBlockdata:: - .incbin "data/layouts/UnknownMap_25_34/map.bin" - - .align 2 -UnknownMap_25_34_Layout:: - .4byte 0x1 - .4byte 0x1 - .4byte UnknownMap_25_34_MapBorder - .4byte UnknownMap_25_34_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_Contest - diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc deleted file mode 100644 index ce58c0798..000000000 --- a/data/layouts/VerdanturfTown/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_MapBorder:: - .incbin "data/layouts/VerdanturfTown/border.bin" - -VerdanturfTown_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown/map.bin" - - .align 2 -VerdanturfTown_Layout:: - .4byte 0x14 - .4byte 0x14 - .4byte VerdanturfTown_MapBorder - .4byte VerdanturfTown_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Mauville - diff --git a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc b/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc deleted file mode 100644 index 21fca6953..000000000 --- a/data/layouts/VerdanturfTown_BattleTentBattleRoom/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_MapBorder:: - .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin" - -VerdanturfTown_BattleTentBattleRoom_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" - - .align 2 -VerdanturfTown_BattleTentBattleRoom_Layout:: - .4byte 0xd - .4byte 0x9 - .4byte VerdanturfTown_BattleTentBattleRoom_MapBorder - .4byte VerdanturfTown_BattleTentBattleRoom_MapBlockdata - .4byte gTileset_General - .4byte gTileset_BattleTent - diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc deleted file mode 100644 index ae5d1a7cf..000000000 --- a/data/layouts/VerdanturfTown_WandasHouse/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_WandasHouse_MapBorder:: - .incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin" - -VerdanturfTown_WandasHouse_MapBlockdata:: - .incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin" - - .align 2 -VerdanturfTown_WandasHouse_Layout:: - .4byte 0x11 - .4byte 0x8 - .4byte VerdanturfTown_WandasHouse_MapBorder - .4byte VerdanturfTown_WandasHouse_MapBlockdata - .4byte gTileset_Building - .4byte gTileset_GenericBuilding - diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc deleted file mode 100644 index 31e0fede3..000000000 --- a/data/layouts/VictoryRoad_1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_1F_MapBorder:: - .incbin "data/layouts/VictoryRoad_1F/border.bin" - -VictoryRoad_1F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_1F/map.bin" - - .align 2 -VictoryRoad_1F_Layout:: - .4byte 0x2e - .4byte 0x2d - .4byte VictoryRoad_1F_MapBorder - .4byte VictoryRoad_1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc deleted file mode 100644 index 9ce7223e1..000000000 --- a/data/layouts/VictoryRoad_B1F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B1F_MapBorder:: - .incbin "data/layouts/VictoryRoad_B1F/border.bin" - -VictoryRoad_B1F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_B1F/map.bin" - - .align 2 -VictoryRoad_B1F_Layout:: - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B1F_MapBorder - .4byte VictoryRoad_B1F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc deleted file mode 100644 index 23c500cbe..000000000 --- a/data/layouts/VictoryRoad_B2F/layout.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B2F_MapBorder:: - .incbin "data/layouts/VictoryRoad_B2F/border.bin" - -VictoryRoad_B2F_MapBlockdata:: - .incbin "data/layouts/VictoryRoad_B2F/map.bin" - - .align 2 -VictoryRoad_B2F_Layout:: - .4byte 0x2e - .4byte 0x1f - .4byte VictoryRoad_B2F_MapBorder - .4byte VictoryRoad_B2F_MapBlockdata - .4byte gTileset_General - .4byte gTileset_Cave - diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json new file mode 100644 index 000000000..b6e31981d --- /dev/null +++ b/data/layouts/layouts.json @@ -0,0 +1,4415 @@ +{ + "layouts_table_label": "gMapLayouts", + "layouts": [ + { + "id": "LAYOUT_PETALBURG_CITY", + "name": "PetalburgCity_Layout", + "width": 30, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/PetalburgCity/border.bin", + "blockdata_filepath": "data/layouts/PetalburgCity/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY", + "name": "SlateportCity_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/SlateportCity/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY", + "name": "MauvilleCity_Layout", + "width": 40, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/MauvilleCity/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY", + "name": "RustboroCity_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/RustboroCity/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY", + "name": "FortreeCity_Layout", + "width": 40, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/FortreeCity/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY", + "name": "LilycoveCity_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/LilycoveCity/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY", + "name": "MossdeepCity_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/MossdeepCity/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY", + "name": "SootopolisCity_Layout", + "width": 60, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Sootopolis", + "border_filepath": "data/layouts/SootopolisCity/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY", + "name": "EverGrandeCity_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_EverGrande", + "border_filepath": "data/layouts/EverGrandeCity/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN", + "name": "LittlerootTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/LittlerootTown/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown/map.bin" + }, + { + "id": "LAYOUT_OLDALE_TOWN", + "name": "OldaleTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/OldaleTown/border.bin", + "blockdata_filepath": "data/layouts/OldaleTown/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN", + "name": "DewfordTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/DewfordTown/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN", + "name": "LavaridgeTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/LavaridgeTown/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN", + "name": "FallarborTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/FallarborTown/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN", + "name": "VerdanturfTown_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/VerdanturfTown/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN", + "name": "PacifidlogTown_Layout", + "width": 20, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/PacifidlogTown/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown/map.bin" + }, + { + "id": "LAYOUT_ROUTE101", + "name": "Route101_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route101/border.bin", + "blockdata_filepath": "data/layouts/Route101/map.bin" + }, + { + "id": "LAYOUT_ROUTE102", + "name": "Route102_Layout", + "width": 50, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route102/border.bin", + "blockdata_filepath": "data/layouts/Route102/map.bin" + }, + { + "id": "LAYOUT_ROUTE103", + "name": "Route103_Layout", + "width": 80, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Petalburg", + "border_filepath": "data/layouts/Route103/border.bin", + "blockdata_filepath": "data/layouts/Route103/map.bin" + }, + { + "id": "LAYOUT_ROUTE104", + "name": "Route104_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route104/border.bin", + "blockdata_filepath": "data/layouts/Route104/map.bin" + }, + { + "id": "LAYOUT_ROUTE105", + "name": "Route105_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route105/border.bin", + "blockdata_filepath": "data/layouts/Route105/map.bin" + }, + { + "id": "LAYOUT_ROUTE106", + "name": "Route106_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route106/border.bin", + "blockdata_filepath": "data/layouts/Route106/map.bin" + }, + { + "id": "LAYOUT_ROUTE107", + "name": "Route107_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/Route107/border.bin", + "blockdata_filepath": "data/layouts/Route107/map.bin" + }, + { + "id": "LAYOUT_ROUTE108", + "name": "Route108_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/Route108/border.bin", + "blockdata_filepath": "data/layouts/Route108/map.bin" + }, + { + "id": "LAYOUT_ROUTE109", + "name": "Route109_Layout", + "width": 40, + "height": 63, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Slateport", + "border_filepath": "data/layouts/Route109/border.bin", + "blockdata_filepath": "data/layouts/Route109/map.bin" + }, + { + "id": "LAYOUT_ROUTE110", + "name": "Route110_Layout", + "width": 40, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route110/border.bin", + "blockdata_filepath": "data/layouts/Route110/map.bin" + }, + { + "id": "LAYOUT_ROUTE111", + "name": "Route111_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111/border.bin", + "blockdata_filepath": "data/layouts/Route111/map.bin" + }, + { + "id": "LAYOUT_ROUTE112", + "name": "Route112_Layout", + "width": 40, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/Route112/border.bin", + "blockdata_filepath": "data/layouts/Route112/map.bin" + }, + { + "id": "LAYOUT_ROUTE113", + "name": "Route113_Layout", + "width": 100, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route113/border.bin", + "blockdata_filepath": "data/layouts/Route113/map.bin" + }, + { + "id": "LAYOUT_ROUTE114", + "name": "Route114_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route114/border.bin", + "blockdata_filepath": "data/layouts/Route114/map.bin" + }, + { + "id": "LAYOUT_ROUTE115", + "name": "Route115_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route115/border.bin", + "blockdata_filepath": "data/layouts/Route115/map.bin" + }, + { + "id": "LAYOUT_ROUTE116", + "name": "Route116_Layout", + "width": 100, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route116/border.bin", + "blockdata_filepath": "data/layouts/Route116/map.bin" + }, + { + "id": "LAYOUT_ROUTE117", + "name": "Route117_Layout", + "width": 60, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route117/border.bin", + "blockdata_filepath": "data/layouts/Route117/map.bin" + }, + { + "id": "LAYOUT_ROUTE118", + "name": "Route118_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route118/border.bin", + "blockdata_filepath": "data/layouts/Route118/map.bin" + }, + { + "id": "LAYOUT_ROUTE119", + "name": "Route119_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route119/border.bin", + "blockdata_filepath": "data/layouts/Route119/map.bin" + }, + { + "id": "LAYOUT_ROUTE120", + "name": "Route120_Layout", + "width": 40, + "height": 100, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/Route120/border.bin", + "blockdata_filepath": "data/layouts/Route120/map.bin" + }, + { + "id": "LAYOUT_ROUTE121", + "name": "Route121_Layout", + "width": 80, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route121/border.bin", + "blockdata_filepath": "data/layouts/Route121/map.bin" + }, + { + "id": "LAYOUT_ROUTE122", + "name": "Route122_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route122/border.bin", + "blockdata_filepath": "data/layouts/Route122/map.bin" + }, + { + "id": "LAYOUT_ROUTE123", + "name": "Route123_Layout", + "width": 140, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/Route123/border.bin", + "blockdata_filepath": "data/layouts/Route123/map.bin" + }, + { + "id": "LAYOUT_ROUTE124", + "name": "Route124_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route124/border.bin", + "blockdata_filepath": "data/layouts/Route124/map.bin" + }, + { + "id": "LAYOUT_ROUTE125", + "name": "Route125_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route125/border.bin", + "blockdata_filepath": "data/layouts/Route125/map.bin" + }, + { + "id": "LAYOUT_ROUTE126", + "name": "Route126_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route126/border.bin", + "blockdata_filepath": "data/layouts/Route126/map.bin" + }, + { + "id": "LAYOUT_ROUTE127", + "name": "Route127_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route127/border.bin", + "blockdata_filepath": "data/layouts/Route127/map.bin" + }, + { + "id": "LAYOUT_ROUTE128", + "name": "Route128_Layout", + "width": 120, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route128/border.bin", + "blockdata_filepath": "data/layouts/Route128/map.bin" + }, + { + "id": "LAYOUT_ROUTE129", + "name": "Route129_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mossdeep", + "border_filepath": "data/layouts/Route129/border.bin", + "blockdata_filepath": "data/layouts/Route129/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08417FC4", + "name": "UnknownMap_08417FC4_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_08417FC4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08417FC4/map.bin" + }, + { + "id": "LAYOUT_ROUTE131", + "name": "Route131_Layout", + "width": 60, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route131/border.bin", + "blockdata_filepath": "data/layouts/Route131/map.bin" + }, + { + "id": "LAYOUT_ROUTE132", + "name": "Route132_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route132/border.bin", + "blockdata_filepath": "data/layouts/Route132/map.bin" + }, + { + "id": "LAYOUT_ROUTE133", + "name": "Route133_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route133/border.bin", + "blockdata_filepath": "data/layouts/Route133/map.bin" + }, + { + "id": "LAYOUT_ROUTE134", + "name": "Route134_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/Route134/border.bin", + "blockdata_filepath": "data/layouts/Route134/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER2", + "name": "Underwater2_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater2/border.bin", + "blockdata_filepath": "data/layouts/Underwater2/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER3", + "name": "Underwater3_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater3/border.bin", + "blockdata_filepath": "data/layouts/Underwater3/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER4", + "name": "Underwater4_Layout", + "width": 120, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater4/border.bin", + "blockdata_filepath": "data/layouts/Underwater4/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "name": "LittlerootTown_BrendansHouse_1F_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "name": "LittlerootTown_BrendansHouse_2F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "name": "LittlerootTown_MaysHouse_1F_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_1F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BrendansMaysHouse", + "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin" + }, + { + "id": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "name": "LittlerootTown_ProfessorBirchsLab_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin", + "blockdata_filepath": "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin" + }, + { + "id": "LAYOUT_HOUSE1", + "name": "House1_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House1/border.bin", + "blockdata_filepath": "data/layouts/House1/map.bin" + }, + { + "id": "LAYOUT_HOUSE2", + "name": "House2_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House2/border.bin", + "blockdata_filepath": "data/layouts/House2/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_1F", + "name": "PokemonCenter_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_POKEMON_CENTER_2F", + "name": "PokemonCenter_2F_Layout", + "width": 14, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/PokemonCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin" + }, + { + "id": "LAYOUT_MART", + "name": "Mart_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Mart/border.bin", + "blockdata_filepath": "data/layouts/Mart/map.bin" + }, + { + "id": "LAYOUT_HOUSE3", + "name": "House3_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House3/border.bin", + "blockdata_filepath": "data/layouts/House3/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN_GYM", + "name": "DewfordTown_Gym_Layout", + "width": 18, + "height": 28, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_DewfordGym", + "border_filepath": "data/layouts/DewfordTown_Gym/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown_Gym/map.bin" + }, + { + "id": "LAYOUT_DEWFORD_TOWN_HALL", + "name": "DewfordTown_Hall_Layout", + "width": 17, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/DewfordTown_Hall/border.bin", + "blockdata_filepath": "data/layouts/DewfordTown_Hall/map.bin" + }, + { + "id": "LAYOUT_HOUSE4", + "name": "House4_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/House4/border.bin", + "blockdata_filepath": "data/layouts/House4/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", + "name": "LavaridgeTown_Gym_1F_Layout", + "width": 17, + "height": 19, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LavaridgeGym", + "border_filepath": "data/layouts/LavaridgeTown_Gym_1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_1F/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", + "name": "LavaridgeTown_Gym_B1F_Layout", + "width": 17, + "height": 19, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LavaridgeGym", + "border_filepath": "data/layouts/LavaridgeTown_Gym_B1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_Gym_B1F/map.bin" + }, + { + "id": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "name": "LavaridgeTown_PokemonCenter_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY", + "name": "FallarborTown_LeftoverRSContestLobby_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestLobby/map.bin" + }, + { + "id": "LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL", + "name": "FallarborTown_LeftoverRSContestHall_Layout", + "width": 21, + "height": 18, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/border.bin", + "blockdata_filepath": "data/layouts/FallarborTown_LeftoverRSContestHall/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_HOUSE2", + "name": "LilycoveCity_House2_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_House2/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_House2/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08428450", + "name": "UnknownMap_08428450_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_08428450/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08428450/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", + "name": "VerdanturfTown_WandasHouse_Layout", + "width": 17, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/VerdanturfTown_WandasHouse/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown_WandasHouse/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin" + }, + { + "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin", + "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin" + }, + { + "id": "LAYOUT_PETALBURG_CITY_GYM", + "name": "PetalburgCity_Gym_Layout", + "width": 9, + "height": 112, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PetalburgGym", + "border_filepath": "data/layouts/PetalburgCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/PetalburgCity_Gym/map.bin" + }, + { + "id": "LAYOUT_HOUSE_WITH_BED", + "name": "HouseWithBed_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/HouseWithBed/border.bin", + "blockdata_filepath": "data/layouts/HouseWithBed/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "name": "SlateportCity_SternsShipyard_1F_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_1F/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "name": "SlateportCity_SternsShipyard_2F_Layout", + "width": 17, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_SternsShipyard_2F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084294C4", + "name": "UnknownMap_084294C4_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_084294C4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084294C4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084294E8", + "name": "UnknownMap_084294E8_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_084294E8/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084294E8/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "name": "SlateportCity_PokemonFanClub_Layout", + "width": 14, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonFanClub", + "border_filepath": "data/layouts/SlateportCity_PokemonFanClub/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_PokemonFanClub/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "name": "SlateportCity_OceanicMuseum_1F_Layout", + "width": 20, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_OceanicMuseum", + "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin" + }, + { + "id": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "name": "SlateportCity_OceanicMuseum_2F_Layout", + "width": 20, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_OceanicMuseum", + "border_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin", + "blockdata_filepath": "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin" + }, + { + "id": "LAYOUT_HARBOR", + "name": "Harbor_Layout", + "width": 24, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/Harbor/border.bin", + "blockdata_filepath": "data/layouts/Harbor/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_GYM", + "name": "MauvilleCity_Gym_Layout", + "width": 10, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MauvilleGym", + "border_filepath": "data/layouts/MauvilleCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_Gym/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", + "name": "MauvilleCity_BikeShop_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BikeShop", + "border_filepath": "data/layouts/MauvilleCity_BikeShop/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_BikeShop/map.bin" + }, + { + "id": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", + "name": "MauvilleCity_GameCorner_Layout", + "width": 22, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MauvilleGameCorner", + "border_filepath": "data/layouts/MauvilleCity_GameCorner/border.bin", + "blockdata_filepath": "data/layouts/MauvilleCity_GameCorner/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", + "name": "RustboroCity_DevonCorp_1F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", + "name": "RustboroCity_DevonCorp_2F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_2F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_GYM", + "name": "RustboroCity_Gym_Layout", + "width": 11, + "height": 20, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_RustboroGym", + "border_filepath": "data/layouts/RustboroCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Gym/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", + "name": "RustboroCity_PokemonSchool_Layout", + "width": 12, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonSchool", + "border_filepath": "data/layouts/RustboroCity_PokemonSchool/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_PokemonSchool/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_HOUSE", + "name": "RustboroCity_House_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_House/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_House/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_HOUSE1", + "name": "RustboroCity_House1_Layout", + "width": 13, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_House1/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_House1/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_House1/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_GYM", + "name": "FortreeCity_Gym_Layout", + "width": 20, + "height": 25, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_FortreeGym", + "border_filepath": "data/layouts/FortreeCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_Gym/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_House2/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", + "name": "Route104_MrBrineysHouse_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route104_MrBrineysHouse/border.bin", + "blockdata_filepath": "data/layouts/Route104_MrBrineysHouse/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "name": "LilycoveCity_LilycoveMuseum_1F_Layout", + "width": 21, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LilycoveMuseum", + "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "name": "LilycoveCity_LilycoveMuseum_2F_Layout", + "width": 22, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_LilycoveMuseum", + "border_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", + "name": "LilycoveCity_ContestLobby_Layout", + "width": 31, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LilycoveCity_ContestLobby/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_ContestLobby/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", + "name": "LilycoveCity_ContestHall_Layout", + "width": 51, + "height": 33, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LilycoveCity_ContestHall/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_ContestHall/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "LilycoveCity_PokemonTrainerFanClub_Layout", + "width": 12, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GYM", + "name": "MossdeepCity_Gym_Layout", + "width": 26, + "height": 36, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MossdeepGym", + "border_filepath": "data/layouts/MossdeepCity_Gym/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_Gym/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", + "name": "SootopolisCity_Gym_1F_Layout", + "width": 17, + "height": 26, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SootopolisGym", + "border_filepath": "data/layouts/SootopolisCity_Gym_1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_Gym_1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", + "name": "SootopolisCity_Gym_B1F_Layout", + "width": 17, + "height": 26, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SootopolisGym", + "border_filepath": "data/layouts/SootopolisCity_Gym_B1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_Gym_B1F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "name": "EverGrandeCity_SidneysRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_SidneysRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_SidneysRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", + "name": "EverGrandeCity_PhoebesRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_PhoebesRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", + "name": "EverGrandeCity_GlaciasRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_GlaciasRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", + "name": "EverGrandeCity_DrakesRoom_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_DrakesRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_DrakesRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "name": "EverGrandeCity_ChampionsRoom_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_ChampionsRoom/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "name": "EverGrandeCity_ShortHall_Layout", + "width": 11, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_ShortHall/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_ShortHall/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrettyPetalFlowerShop_Layout", + "width": 15, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PrettyPetalFlowerShop", + "border_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/border.bin", + "blockdata_filepath": "data/layouts/Route104_PrettyPetalFlowerShop/map.bin" + }, + { + "id": "LAYOUT_CABLE_CAR_STATION", + "name": "CableCarStation_Layout", + "width": 13, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/CableCarStation/border.bin", + "blockdata_filepath": "data/layouts/CableCarStation/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", + "name": "Route114_FossilManiacsHouse_Layout", + "width": 10, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route114_FossilManiacsHouse/border.bin", + "blockdata_filepath": "data/layouts/Route114_FossilManiacsHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "name": "Route114_FossilManiacsTunnel_Layout", + "width": 13, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fallarbor", + "border_filepath": "data/layouts/Route114_FossilManiacsTunnel/border.bin", + "blockdata_filepath": "data/layouts/Route114_FossilManiacsTunnel/map.bin" + }, + { + "id": "LAYOUT_ROUTE114_LANETTES_HOUSE", + "name": "Route114_LanettesHouse_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route114_LanettesHouse/border.bin", + "blockdata_filepath": "data/layouts/Route114_LanettesHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", + "name": "Route116_TunnelersRestHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route116_TunnelersRestHouse/border.bin", + "blockdata_filepath": "data/layouts/Route116_TunnelersRestHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", + "name": "Route117_PokemonDayCare_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonDayCare", + "border_filepath": "data/layouts/Route117_PokemonDayCare/border.bin", + "blockdata_filepath": "data/layouts/Route117_PokemonDayCare/map.bin" + }, + { + "id": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", + "name": "Route121_SafariZoneEntrance_Layout", + "width": 18, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Route121_SafariZoneEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route121_SafariZoneEntrance/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_1F_1R", + "name": "MeteorFalls_1F_1R_Layout", + "width": 30, + "height": 42, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_1F_1R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_1F_1R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_1F_2R", + "name": "MeteorFalls_1F_2R_Layout", + "width": 30, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_1F_2R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_1F_2R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_B1F_1R", + "name": "MeteorFalls_B1F_1R_Layout", + "width": 29, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_B1F_1R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_B1F_1R/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_B1F_2R", + "name": "MeteorFalls_B1F_2R_Layout", + "width": 11, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_B1F_2R/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_B1F_2R/map.bin" + }, + { + "id": "LAYOUT_RUSTURF_TUNNEL", + "name": "RusturfTunnel_Layout", + "width": 36, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_RusturfTunnel", + "border_filepath": "data/layouts/RusturfTunnel/border.bin", + "blockdata_filepath": "data/layouts/RusturfTunnel/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", + "name": "Underwater_SootopolisCity_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SootopolisCity/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SootopolisCity/map.bin" + }, + { + "id": "LAYOUT_DESERT_RUINS", + "name": "DesertRuins_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/DesertRuins/border.bin", + "blockdata_filepath": "data/layouts/DesertRuins/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_1F", + "name": "GraniteCave_1F_Layout", + "width": 42, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_1F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_1F/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_B1F", + "name": "GraniteCave_B1F_Layout", + "width": 32, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_B1F/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_B2F", + "name": "GraniteCave_B2F_Layout", + "width": 32, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_B2F/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_B2F/map.bin" + }, + { + "id": "LAYOUT_PETALBURG_WOODS", + "name": "PetalburgWoods_Layout", + "width": 48, + "height": 44, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/PetalburgWoods/border.bin", + "blockdata_filepath": "data/layouts/PetalburgWoods/map.bin" + }, + { + "id": "LAYOUT_MT_CHIMNEY", + "name": "MtChimney_Layout", + "width": 40, + "height": 47, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MtChimney/border.bin", + "blockdata_filepath": "data/layouts/MtChimney/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_1F", + "name": "MtPyre_1F_Layout", + "width": 22, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_1F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_1F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_2F", + "name": "MtPyre_2F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_2F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_2F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_3F", + "name": "MtPyre_3F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_3F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_3F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_4F", + "name": "MtPyre_4F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_4F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_4F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_5F", + "name": "MtPyre_5F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_5F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_5F/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_6F", + "name": "MtPyre_6F_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_6F/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_6F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_1F", + "name": "AquaHideout_1F_Layout", + "width": 28, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_1F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_1F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_B1F", + "name": "AquaHideout_B1F_Layout", + "width": 51, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_B1F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_B1F/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_B2F", + "name": "AquaHideout_B2F_Layout", + "width": 34, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_B2F/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_B2F/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", + "name": "Underwater_SeafloorCavern_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SeafloorCavern/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SeafloorCavern/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", + "name": "SeafloorCavern_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Entrance/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", + "name": "SeafloorCavern_Room1_Layout", + "width": 20, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room1/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room1/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", + "name": "SeafloorCavern_Room2_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room2/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room2/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", + "name": "SeafloorCavern_Room3_Layout", + "width": 16, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room3/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room3/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", + "name": "SeafloorCavern_Room4_Layout", + "width": 18, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room4/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room4/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", + "name": "SeafloorCavern_Room5_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room5/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room5/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", + "name": "SeafloorCavern_Room6_Layout", + "width": 24, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SeafloorCavern_Room6/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room6/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", + "name": "SeafloorCavern_Room7_Layout", + "width": 23, + "height": 25, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SeafloorCavern_Room7/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room7/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", + "name": "SeafloorCavern_Room8_Layout", + "width": 11, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room8/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room8/map.bin" + }, + { + "id": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", + "name": "SeafloorCavern_Room9_Layout", + "width": 27, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SeafloorCavern_Room9/border.bin", + "blockdata_filepath": "data/layouts/SeafloorCavern_Room9/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", + "name": "CaveOfOrigin_Entrance_Layout", + "width": 19, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_Entrance/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_Entrance/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_1F", + "name": "CaveOfOrigin_1F_Layout", + "width": 23, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_1F/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_1F/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "name": "CaveOfOrigin_UnusedRubySapphireMap1_Layout", + "width": 23, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap1/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "name": "CaveOfOrigin_UnusedRubySapphireMap2_Layout", + "width": 21, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap2/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3_Layout", + "width": 19, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_UnusedRubySapphireMap3/map.bin" + }, + { + "id": "LAYOUT_CAVE_OF_ORIGIN_B1F", + "name": "CaveOfOrigin_B1F_Layout", + "width": 19, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/CaveOfOrigin_B1F/border.bin", + "blockdata_filepath": "data/layouts/CaveOfOrigin_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F_Layout", + "width": 46, + "height": 45, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_LowTideEntranceRoom_Layout", + "width": 35, + "height": 35, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "name": "ShoalCave_LowTideInnerRoom_Layout", + "width": 46, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideInnerRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "name": "ShoalCave_LowTideStairsRoom_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideStairsRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "name": "ShoalCave_LowTideLowerRoom_Layout", + "width": 31, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideLowerRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_HighTideEntranceRoom_Layout", + "width": 35, + "height": 35, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "name": "ShoalCave_HighTideInnerRoom_Layout", + "width": 46, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_HighTideInnerRoom/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E6C0", + "name": "UnknownMap_0843E6C0_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E6C0/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E6C0/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E6E4", + "name": "UnknownMap_0843E6E4_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E6E4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E6E4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E708", + "name": "UnknownMap_0843E708_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E708/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E708/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E72C", + "name": "UnknownMap_0843E72C_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E72C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E72C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E750", + "name": "UnknownMap_0843E750_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E750/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E750/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E774", + "name": "UnknownMap_0843E774_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E774/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E774/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E798", + "name": "UnknownMap_0843E798_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E798/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E798/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E7BC", + "name": "UnknownMap_0843E7BC_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E7BC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E7BC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E7E0", + "name": "UnknownMap_0843E7E0_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E7E0/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E7E0/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E804", + "name": "UnknownMap_0843E804_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E804/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E804/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E828", + "name": "UnknownMap_0843E828_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E828/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E828/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E84C", + "name": "UnknownMap_0843E84C_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E84C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E84C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E870", + "name": "UnknownMap_0843E870_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E870/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E870/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0843E894", + "name": "UnknownMap_0843E894_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0843E894/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0843E894/map.bin" + }, + { + "id": "LAYOUT_NEW_MAUVILLE_ENTRANCE", + "name": "NewMauville_Entrance_Layout", + "width": 9, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/NewMauville_Entrance/border.bin", + "blockdata_filepath": "data/layouts/NewMauville_Entrance/map.bin" + }, + { + "id": "LAYOUT_NEW_MAUVILLE_INSIDE", + "name": "NewMauville_Inside_Layout", + "width": 41, + "height": 41, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BikeShop", + "border_filepath": "data/layouts/NewMauville_Inside/border.bin", + "blockdata_filepath": "data/layouts/NewMauville_Inside/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_DECK", + "name": "AbandonedShip_Deck_Layout", + "width": 23, + "height": 21, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AbandonedShip_Deck/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Deck/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", + "name": "AbandonedShip_Corridors_1F_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Corridors_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", + "name": "AbandonedShip_Rooms_1F_Layout", + "width": 18, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", + "name": "AbandonedShip_Corridors_B1F_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Corridors_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Corridors_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", + "name": "AbandonedShip_Rooms_B1F_Layout", + "width": 27, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", + "name": "AbandonedShip_Rooms2_B1F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", + "name": "AbandonedShip_Underwater1_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Underwater1/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Underwater1/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", + "name": "AbandonedShip_Room_B1F_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Room_B1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Room_B1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", + "name": "AbandonedShip_Rooms2_1F_Layout", + "width": 9, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Rooms2_1F/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Rooms2_1F/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", + "name": "AbandonedShip_CaptainsOffice_Layout", + "width": 9, + "height": 7, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AbandonedShip_CaptainsOffice/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_CaptainsOffice/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", + "name": "AbandonedShip_Underwater2_Layout", + "width": 21, + "height": 7, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_Underwater2/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_Underwater2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE1", + "name": "SecretBase_RedCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE1", + "name": "SecretBase_BrownCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE1", + "name": "SecretBase_BlueCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", + "name": "SecretBase_YellowCave1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE1", + "name": "SecretBase_Tree1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB1", + "name": "SecretBase_Shrub1_Layout", + "width": 11, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub1/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub1/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE2", + "name": "SecretBase_RedCave2_Layout", + "width": 7, + "height": 16, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE2", + "name": "SecretBase_BrownCave2_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE2", + "name": "SecretBase_BlueCave2_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", + "name": "SecretBase_YellowCave2_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE2", + "name": "SecretBase_Tree2_Layout", + "width": 7, + "height": 16, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB2", + "name": "SecretBase_Shrub2_Layout", + "width": 15, + "height": 7, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub2/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub2/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE3", + "name": "SecretBase_RedCave3_Layout", + "width": 15, + "height": 8, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE3", + "name": "SecretBase_BrownCave3_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE3", + "name": "SecretBase_BlueCave3_Layout", + "width": 10, + "height": 17, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", + "name": "SecretBase_YellowCave3_Layout", + "width": 12, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE3", + "name": "SecretBase_Tree3_Layout", + "width": 17, + "height": 8, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB3", + "name": "SecretBase_Shrub3_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub3/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub3/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_RED_CAVE4", + "name": "SecretBase_RedCave4_Layout", + "width": 9, + "height": 15, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseRedCave", + "border_filepath": "data/layouts/SecretBase_RedCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_RedCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BROWN_CAVE4", + "name": "SecretBase_BrownCave4_Layout", + "width": 14, + "height": 12, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBrownCave", + "border_filepath": "data/layouts/SecretBase_BrownCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BrownCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_BLUE_CAVE4", + "name": "SecretBase_BlueCave4_Layout", + "width": 9, + "height": 17, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseBlueCave", + "border_filepath": "data/layouts/SecretBase_BlueCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_BlueCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", + "name": "SecretBase_YellowCave4_Layout", + "width": 13, + "height": 14, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseYellowCave", + "border_filepath": "data/layouts/SecretBase_YellowCave4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_YellowCave4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_TREE4", + "name": "SecretBase_Tree4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseTree", + "border_filepath": "data/layouts/SecretBase_Tree4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Tree4/map.bin" + }, + { + "id": "LAYOUT_SECRET_BASE_SHRUB4", + "name": "SecretBase_Shrub4_Layout", + "width": 14, + "height": 11, + "primary_tileset": "gTileset_SecretBase", + "secondary_tileset": "gTileset_SecretBaseShrub", + "border_filepath": "data/layouts/SecretBase_Shrub4/border.bin", + "blockdata_filepath": "data/layouts/SecretBase_Shrub4/map.bin" + }, + { + "id": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "name": "SingleBattleColosseum_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/SingleBattleColosseum/border.bin", + "blockdata_filepath": "data/layouts/SingleBattleColosseum/map.bin" + }, + { + "id": "LAYOUT_TRADE_CENTER", + "name": "TradeCenter_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/TradeCenter/border.bin", + "blockdata_filepath": "data/layouts/TradeCenter/map.bin" + }, + { + "id": "LAYOUT_RECORD_CORNER", + "name": "RecordCorner_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/RecordCorner/border.bin", + "blockdata_filepath": "data/layouts/RecordCorner/map.bin" + }, + { + "id": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "name": "DoubleBattleColosseum_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/DoubleBattleColosseum/border.bin", + "blockdata_filepath": "data/layouts/DoubleBattleColosseum/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM1", + "name": "LinkContestRoom1_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom1/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom1/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_29", + "name": "UnknownMap_25_29_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_29/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_29/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_30", + "name": "UnknownMap_25_30_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_30/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_30/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_31", + "name": "UnknownMap_25_31_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_31/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_31/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_32", + "name": "UnknownMap_25_32_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_32/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_32/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_33", + "name": "UnknownMap_25_33_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_33/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_33/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_25_34", + "name": "UnknownMap_25_34_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/UnknownMap_25_34/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_25_34/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM2", + "name": "LinkContestRoom2_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom2/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom2/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM3", + "name": "LinkContestRoom3_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom3/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom3/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM4", + "name": "LinkContestRoom4_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom4/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom4/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM5", + "name": "LinkContestRoom5_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom5/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom5/map.bin" + }, + { + "id": "LAYOUT_LINK_CONTEST_ROOM6", + "name": "LinkContestRoom6_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Contest", + "border_filepath": "data/layouts/LinkContestRoom6/border.bin", + "blockdata_filepath": "data/layouts/LinkContestRoom6/map.bin" + }, + { + "id": "LAYOUT_INSIDE_OF_TRUCK", + "name": "InsideOfTruck_Layout", + "width": 5, + "height": 5, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideOfTruck", + "border_filepath": "data/layouts/InsideOfTruck/border.bin", + "blockdata_filepath": "data/layouts/InsideOfTruck/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTHWEST", + "name": "SafariZone_Northwest_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Northwest/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Northwest/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTH", + "name": "SafariZone_North_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_North/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_North/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTHWEST", + "name": "SafariZone_Southwest_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Southwest/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Southwest/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTH", + "name": "SafariZone_South_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_South/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_South/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08447028", + "name": "UnknownMap_08447028_Layout", + "width": 58, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "0", + "border_filepath": "data/layouts/UnknownMap_08447028/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08447028/map.bin" + }, + { + "id": "LAYOUT_ROUTE109_SEASHORE_HOUSE", + "name": "Route109_SeashoreHouse_Layout", + "width": 15, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_SeashoreHouse", + "border_filepath": "data/layouts/Route109_SeashoreHouse/border.bin", + "blockdata_filepath": "data/layouts/Route109_SeashoreHouse/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", + "name": "Route110_TrickHouseEntrance_Layout", + "width": 12, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseEntrance/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_END", + "name": "Route110_TrickHouseEnd_Layout", + "width": 12, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseEnd/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseEnd/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", + "name": "Route110_TrickHouseCorridor_Layout", + "width": 15, + "height": 24, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route110_TrickHouseCorridor/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHouseCorridor/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", + "name": "Route110_TrickHousePuzzle1_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle1/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle1/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", + "name": "Route110_TrickHousePuzzle2_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle2/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle2/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", + "name": "Route110_TrickHousePuzzle3_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle3/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle3/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", + "name": "Route110_TrickHousePuzzle4_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle4/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle4/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", + "name": "Route110_TrickHousePuzzle5_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle5/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle5/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", + "name": "Route110_TrickHousePuzzle6_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle6/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle6/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", + "name": "Route110_TrickHousePuzzle7_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle7/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle7/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", + "name": "Route110_TrickHousePuzzle8_Layout", + "width": 15, + "height": 22, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrickHousePuzzle", + "border_filepath": "data/layouts/Route110_TrickHousePuzzle8/border.bin", + "blockdata_filepath": "data/layouts/Route110_TrickHousePuzzle8/map.bin" + }, + { + "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop_Layout", + "width": 8, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin", + "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin" + }, + { + "id": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "name": "Route110_SeasideCyclingRoadEntrance_Layout", + "width": 15, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/border.bin", + "blockdata_filepath": "data/layouts/Route110_SeasideCyclingRoadEntrance/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "name": "LilycoveCity_DepartmentStore_1F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "name": "LilycoveCity_DepartmentStore_2F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "name": "LilycoveCity_DepartmentStore_3F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "name": "LilycoveCity_DepartmentStore_4F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "name": "LilycoveCity_DepartmentStore_5F_Layout", + "width": 18, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "name": "LilycoveCity_DepartmentStoreRooftop_Layout", + "width": 18, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Shop", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin" + }, + { + "id": "LAYOUT_ROUTE130", + "name": "Route130_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/Route130/border.bin", + "blockdata_filepath": "data/layouts/Route130/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "name": "BattleFrontier_BattleTowerLobby_Layout", + "width": 25, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST", + "name": "BattleFrontier_OutsideWest_Layout", + "width": 56, + "height": 72, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontierOutsideWest", + "border_filepath": "data/layouts/BattleFrontier_OutsideWest/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_OutsideWest/map.bin" + }, + { + "id": "LAYOUT_BATTLE_ELEVATOR", + "name": "BattleElevator_Layout", + "width": 5, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleElevator/border.bin", + "blockdata_filepath": "data/layouts/BattleElevator/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "name": "BattleFrontier_BattleTowerCorridor_Layout", + "width": 17, + "height": 5, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerBattleRoom_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerBattleRoom/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", + "name": "RustboroCity_DevonCorp_3F_Layout", + "width": 19, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/RustboroCity_DevonCorp_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_DevonCorp_3F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "name": "EverGrandeCity_PokemonLeague_1F_Layout", + "width": 19, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_PokemonCenter", + "border_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_PokemonLeague_1F/map.bin" + }, + { + "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", + "name": "Route119_WeatherInstitute_1F_Layout", + "width": 20, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route119_WeatherInstitute_1F/border.bin", + "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_1F/map.bin" + }, + { + "id": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", + "name": "Route119_WeatherInstitute_2F_Layout", + "width": 20, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/Route119_WeatherInstitute_2F/border.bin", + "blockdata_filepath": "data/layouts/Route119_WeatherInstitute_2F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "LilycoveCity_DepartmentStoreElevator_Layout", + "width": 5, + "height": 6, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER1", + "name": "Underwater1_Layout", + "width": 80, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater1/border.bin", + "blockdata_filepath": "data/layouts/Underwater1/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", + "name": "MossdeepCity_SpaceCenter_1F_Layout", + "width": 16, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", + "name": "MossdeepCity_SpaceCenter_2F_Layout", + "width": 16, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_CORRIDOR", + "name": "SSTidalCorridor_Layout", + "width": 18, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalCorridor/border.bin", + "blockdata_filepath": "data/layouts/SSTidalCorridor/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_LOWER_DECK", + "name": "SSTidalLowerDeck_Layout", + "width": 17, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalLowerDeck/border.bin", + "blockdata_filepath": "data/layouts/SSTidalLowerDeck/map.bin" + }, + { + "id": "LAYOUT_SS_TIDAL_ROOMS", + "name": "SSTidalRooms_Layout", + "width": 36, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/SSTidalRooms/border.bin", + "blockdata_filepath": "data/layouts/SSTidalRooms/map.bin" + }, + { + "id": "LAYOUT_ISLAND_CAVE", + "name": "IslandCave_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/IslandCave/border.bin", + "blockdata_filepath": "data/layouts/IslandCave/map.bin" + }, + { + "id": "LAYOUT_ANCIENT_TOMB", + "name": "AncientTomb_Layout", + "width": 17, + "height": 33, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/AncientTomb/border.bin", + "blockdata_filepath": "data/layouts/AncientTomb/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_ROUTE134", + "name": "Underwater_Route134_Layout", + "width": 18, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_Route134/border.bin", + "blockdata_filepath": "data/layouts/Underwater_Route134/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_SEALED_CHAMBER", + "name": "Underwater_SealedChamber_Layout", + "width": 22, + "height": 48, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_SealedChamber/border.bin", + "blockdata_filepath": "data/layouts/Underwater_SealedChamber/map.bin" + }, + { + "id": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", + "name": "SealedChamber_OuterRoom_Layout", + "width": 21, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SealedChamber_OuterRoom/border.bin", + "blockdata_filepath": "data/layouts/SealedChamber_OuterRoom/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_B1F", + "name": "VictoryRoad_B1F_Layout", + "width": 46, + "height": 31, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_B1F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_B1F/map.bin" + }, + { + "id": "LAYOUT_VICTORY_ROAD_B2F", + "name": "VictoryRoad_B2F_Layout", + "width": 46, + "height": 31, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/VictoryRoad_B2F/border.bin", + "blockdata_filepath": "data/layouts/VictoryRoad_B2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/Route104_Prototype/border.bin", + "blockdata_filepath": "data/layouts/Route104_Prototype/map.bin" + }, + { + "id": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", + "name": "GraniteCave_StevensRoom_Layout", + "width": 15, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/GraniteCave_StevensRoom/border.bin", + "blockdata_filepath": "data/layouts/GraniteCave_StevensRoom/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "name": "AbandonedShip_HiddenFloorCorridors_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin" + }, + { + "id": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", + "name": "SouthernIsland_Exterior_Layout", + "width": 33, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/SouthernIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/SouthernIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", + "name": "SouthernIsland_Interior_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/SouthernIsland_Interior/border.bin", + "blockdata_filepath": "data/layouts/SouthernIsland_Interior/map.bin" + }, + { + "id": "LAYOUT_JAGGED_PASS", + "name": "JaggedPass_Layout", + "width": 30, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/JaggedPass/border.bin", + "blockdata_filepath": "data/layouts/JaggedPass/map.bin" + }, + { + "id": "LAYOUT_FIERY_PATH", + "name": "FieryPath_Layout", + "width": 35, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/FieryPath/border.bin", + "blockdata_filepath": "data/layouts/FieryPath/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F_Layout", + "width": 14, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "name": "SootopolisCity_LotadAndSeedotHouse_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_LotadAndSeedotHouse/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame_Layout", + "width": 15, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_CableClub", + "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "name": "LilycoveCity_CoveLilyMotel_1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin" + }, + { + "id": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "name": "LilycoveCity_CoveLilyMotel_2F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin", + "blockdata_filepath": "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin" + }, + { + "id": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "name": "Route124_DivingTreasureHuntersHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin", + "blockdata_filepath": "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_EXTERIOR", + "name": "MtPyre_Exterior_Layout", + "width": 38, + "height": 51, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_Exterior/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_Exterior/map.bin" + }, + { + "id": "LAYOUT_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit_Layout", + "width": 50, + "height": 37, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/MtPyre_Summit/border.bin", + "blockdata_filepath": "data/layouts/MtPyre_Summit/map.bin" + }, + { + "id": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", + "name": "SealedChamber_InnerRoom_Layout", + "width": 21, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SealedChamber_InnerRoom/border.bin", + "blockdata_filepath": "data/layouts/SealedChamber_InnerRoom/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", + "name": "MossdeepCity_GameCorner_1F_Layout", + "width": 12, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MossdeepGameCorner", + "border_filepath": "data/layouts/MossdeepCity_GameCorner_1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_1F/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", + "name": "MossdeepCity_GameCorner_B1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_GameCorner_B1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House1/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House2/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3_Layout", + "width": 8, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SootopolisCity_House3/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin" + }, + { + "id": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "name": "AbandonedShip_HiddenFloorRooms_Layout", + "width": 44, + "height": 15, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_InsideShip", + "border_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin", + "blockdata_filepath": "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin" + }, + { + "id": "LAYOUT_SCORCHED_SLAB", + "name": "ScorchedSlab_Layout", + "width": 15, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ScorchedSlab/border.bin", + "blockdata_filepath": "data/layouts/ScorchedSlab/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845A394", + "name": "UnknownMap_0845A394_Layout", + "width": 19, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0845A394/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845A394/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin" + }, + { + "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin", + "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin" + }, + { + "id": "LAYOUT_EVER_GRANDE_CITY_HALL4", + "name": "EverGrandeCity_Hall4_Layout", + "width": 11, + "height": 34, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_EliteFour", + "border_filepath": "data/layouts/EverGrandeCity_Hall4/border.bin", + "blockdata_filepath": "data/layouts/EverGrandeCity_Hall4/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "name": "AquaHideout_UnusedRubyMap1_Layout", + "width": 28, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap1/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "name": "AquaHideout_UnusedRubyMap2_Layout", + "width": 62, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap2/map.bin" + }, + { + "id": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "name": "AquaHideout_UnusedRubyMap3_Layout", + "width": 34, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Facility", + "border_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/border.bin", + "blockdata_filepath": "data/layouts/AquaHideout_UnusedRubyMap3/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845D470", + "name": "UnknownMap_0845D470_Layout", + "width": 60, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_0845D470/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845D470/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_ENTRANCE", + "name": "SkyPillar_Entrance_Layout", + "width": 18, + "height": 18, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/SkyPillar_Entrance/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Entrance/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_OUTSIDE", + "name": "SkyPillar_Outside_Layout", + "width": 28, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_Outside/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Outside/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_1F", + "name": "SkyPillar_1F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_1F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_1F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_2F", + "name": "SkyPillar_2F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_2F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_2F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_3F", + "name": "SkyPillar_3F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_3F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_3F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_4F", + "name": "SkyPillar_4F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_4F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_4F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0845ECB4", + "name": "UnknownMap_0845ECB4_Layout", + "width": 27, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/UnknownMap_0845ECB4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0845ECB4/map.bin" + }, + { + "id": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", + "name": "MossdeepCity_StevensHouse_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/MossdeepCity_StevensHouse/border.bin", + "blockdata_filepath": "data/layouts/MossdeepCity_StevensHouse/map.bin" + }, + { + "id": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "name": "ShoalCave_LowTideIceRoom_Layout", + "width": 20, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ShoalCave_LowTideIceRoom/border.bin", + "blockdata_filepath": "data/layouts/ShoalCave_LowTideIceRoom/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_REST_HOUSE", + "name": "SafariZone_RestHouse_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_GenericBuilding", + "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_5F", + "name": "SkyPillar_5F_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_5F/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_5F/map.bin" + }, + { + "id": "LAYOUT_SKY_PILLAR_TOP", + "name": "SkyPillar_Top_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/SkyPillar_Top/border.bin", + "blockdata_filepath": "data/layouts/SkyPillar_Top/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "name": "BattleFrontier_BattleDomeLobby_Layout", + "width": 23, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "name": "BattleFrontier_BattleDomeCorridor_Layout", + "width": 48, + "height": 7, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomePreBattleRoom_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomePreBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomeBattleRoom_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleDome", + "border_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_1F", + "name": "MagmaHideout_1F_Layout", + "width": 37, + "height": 38, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_1F/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_1F/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_1R", + "name": "MagmaHideout_2F_1R_Layout", + "width": 33, + "height": 39, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_1R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_1R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_2R", + "name": "MagmaHideout_2F_2R_Layout", + "width": 49, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_2R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_2R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_1R", + "name": "MagmaHideout_3F_1R_Layout", + "width": 28, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_1R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_1R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_2R", + "name": "MagmaHideout_3F_2R_Layout", + "width": 24, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_2R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_2R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_4F", + "name": "MagmaHideout_4F_Layout", + "width": 59, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_4F/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_4F/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "name": "BattleFrontier_BattlePalaceLobby_Layout", + "width": 25, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "name": "BattleFrontier_BattlePalaceCorridor_Layout", + "width": 17, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "name": "BattleFrontier_BattlePalaceBattleRoom_Layout", + "width": 15, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattlePalace", + "border_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePalaceBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST", + "name": "BattleFrontier_OutsideEast_Layout", + "width": 72, + "height": 72, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontierOutsideEast", + "border_filepath": "data/layouts/BattleFrontier_OutsideEast/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_OutsideEast/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "name": "BattleFrontier_BattleFactoryLobby_Layout", + "width": 19, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryPreBattleRoom_Layout", + "width": 17, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryPreBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryBattleRoom_Layout", + "width": 13, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFactory", + "border_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleFactoryBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "name": "BattleFrontier_BattlePikeLobby_Layout", + "width": 11, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "name": "BattleFrontier_BattlePikeCorridor_Layout", + "width": 14, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom_Layout", + "width": 13, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeThreePathRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "name": "BattleFrontier_BattlePikeRandomRoom1_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom1/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2_Layout", + "width": 5, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom2/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "name": "BattleFrontier_BattleArenaLobby_Layout", + "width": 16, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "name": "BattleFrontier_BattleArenaCorridor_Layout", + "width": 18, + "height": 14, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "name": "BattleFrontier_BattleArenaBattleRoom_Layout", + "width": 16, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleArena", + "border_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleArenaBattleRoom/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08469200", + "name": "UnknownMap_08469200_Layout", + "width": 60, + "height": 60, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Sootopolis", + "border_filepath": "data/layouts/UnknownMap_08469200/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08469200/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "name": "BattleFrontier_BattlePikeRandomRoom3_Layout", + "width": 9, + "height": 20, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePikeRandomRoom3/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084693AC", + "name": "UnknownMap_084693AC_Layout", + "width": 1, + "height": 1, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePike", + "border_filepath": "data/layouts/UnknownMap_084693AC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084693AC/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby_Layout", + "width": 15, + "height": 18, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidEmptySquare/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE01", + "name": "BattlePyramidSquare01_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare01/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare01/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE02", + "name": "BattlePyramidSquare02_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare02/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare02/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE03", + "name": "BattlePyramidSquare03_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare03/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare03/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE04", + "name": "BattlePyramidSquare04_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare04/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare04/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE05", + "name": "BattlePyramidSquare05_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare05/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare05/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare06/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare06/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE07", + "name": "BattlePyramidSquare07_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare07/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare07/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE08", + "name": "BattlePyramidSquare08_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare08/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare08/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE09", + "name": "BattlePyramidSquare09_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare09/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare09/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE10", + "name": "BattlePyramidSquare10_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare10/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare10/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE11", + "name": "BattlePyramidSquare11_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare11/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare11/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE12", + "name": "BattlePyramidSquare12_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare12/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare12/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE13", + "name": "BattlePyramidSquare13_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare13/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare13/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE14", + "name": "BattlePyramidSquare14_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare14/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare14/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE15", + "name": "BattlePyramidSquare15_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare15/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare15/map.bin" + }, + { + "id": "LAYOUT_BATTLE_PYRAMID_SQUARE16", + "name": "BattlePyramidSquare16_Layout", + "width": 8, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattlePyramidSquare16/border.bin", + "blockdata_filepath": "data/layouts/BattlePyramidSquare16/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "name": "BattleFrontier_BattlePyramidTop_Layout", + "width": 34, + "height": 23, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattlePyramid", + "border_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePyramidTop/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_3F_3R", + "name": "MagmaHideout_3F_3R_Layout", + "width": 33, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_3F_3R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_3F_3R/map.bin" + }, + { + "id": "LAYOUT_MAGMA_HIDEOUT_2F_3R", + "name": "MagmaHideout_2F_3R_Layout", + "width": 60, + "height": 19, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lavaridge", + "border_filepath": "data/layouts/MagmaHideout_2F_3R/border.bin", + "blockdata_filepath": "data/layouts/MagmaHideout_2F_3R/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_1F", + "name": "MirageTower_1F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_1F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_1F/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_2F", + "name": "MirageTower_2F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_2F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_2F/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_3F", + "name": "MirageTower_3F_Layout", + "width": 21, + "height": 17, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_3F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_3F/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_LOBBY", + "name": "BattleTentLobby_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentLobby/border.bin", + "blockdata_filepath": "data/layouts/BattleTentLobby/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_CORRIDOR", + "name": "BattleTentCorridor_Layout", + "width": 5, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentCorridor/border.bin", + "blockdata_filepath": "data/layouts/BattleTentCorridor/map.bin" + }, + { + "id": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "name": "BattleTentBattleRoom_Layout", + "width": 10, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/BattleTentBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleTentBattleRoom/map.bin" + }, + { + "id": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "VerdanturfTown_BattleTentBattleRoom_Layout", + "width": 13, + "height": 9, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleTent", + "border_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/VerdanturfTown_BattleTentBattleRoom/map.bin" + }, + { + "id": "LAYOUT_MIRAGE_TOWER_4F", + "name": "MirageTower_4F_Layout", + "width": 13, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MirageTower", + "border_filepath": "data/layouts/MirageTower_4F/border.bin", + "blockdata_filepath": "data/layouts/MirageTower_4F/map.bin" + }, + { + "id": "LAYOUT_DESERT_UNDERPASS", + "name": "DesertUnderpass_Layout", + "width": 139, + "height": 23, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/DesertUnderpass/border.bin", + "blockdata_filepath": "data/layouts/DesertUnderpass/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerMultiBattleRoom_Layout", + "width": 21, + "height": 15, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "name": "BattleFrontier_BattleTowerCorridor2_Layout", + "width": 17, + "height": 5, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattleTowerCorridor2/map.bin" + }, + { + "id": "LAYOUT_ROUTE111_NO_MIRAGE_TOWER", + "name": "Route111_NoMirageTower_Layout", + "width": 40, + "height": 140, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Mauville", + "border_filepath": "data/layouts/Route111_NoMirageTower/border.bin", + "blockdata_filepath": "data/layouts/Route111_NoMirageTower/map.bin" + }, + { + "id": "LAYOUT_UNION_ROOM", + "name": "UnionRoom_Layout", + "width": 15, + "height": 12, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_UnionRoom", + "border_filepath": "data/layouts/UnionRoom/border.bin", + "blockdata_filepath": "data/layouts/UnionRoom/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_NORTHEAST", + "name": "SafariZone_Northeast_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Northeast/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Northeast/map.bin" + }, + { + "id": "LAYOUT_SAFARI_ZONE_SOUTHEAST", + "name": "SafariZone_Southeast_Layout", + "width": 40, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Lilycove", + "border_filepath": "data/layouts/SafariZone_Southeast/border.bin", + "blockdata_filepath": "data/layouts/SafariZone_Southeast/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", + "name": "BattleFrontier_RankingHall_Layout", + "width": 53, + "height": 15, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontierRankingHall", + "border_filepath": "data/layouts/BattleFrontier_RankingHall/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_RankingHall/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "name": "BattleFrontier_Lounge1_Layout", + "width": 13, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_Lounge1/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_Lounge1/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "name": "BattleFrontier_BattlePointExchangeServiceCorner_Layout", + "width": 15, + "height": 11, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_BattlePointExchangeServiceCorner/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", + "name": "BattleFrontier_ReceptionGate_Layout", + "width": 9, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_ReceptionGate/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_ReceptionGate/map.bin" + }, + { + "id": "LAYOUT_ARTISAN_CAVE_B1F", + "name": "ArtisanCave_B1F_Layout", + "width": 46, + "height": 54, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ArtisanCave_B1F/border.bin", + "blockdata_filepath": "data/layouts/ArtisanCave_B1F/map.bin" + }, + { + "id": "LAYOUT_ARTISAN_CAVE_1F", + "name": "ArtisanCave_1F_Layout", + "width": 21, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/ArtisanCave_1F/border.bin", + "blockdata_filepath": "data/layouts/ArtisanCave_1F/map.bin" + }, + { + "id": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", + "name": "FarawayIsland_Entrance_Layout", + "width": 34, + "height": 46, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Rustboro", + "border_filepath": "data/layouts/FarawayIsland_Entrance/border.bin", + "blockdata_filepath": "data/layouts/FarawayIsland_Entrance/map.bin" + }, + { + "id": "LAYOUT_FARAWAY_ISLAND_INTERIOR", + "name": "FarawayIsland_Interior_Layout", + "width": 29, + "height": 26, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Fortree", + "border_filepath": "data/layouts/FarawayIsland_Interior/border.bin", + "blockdata_filepath": "data/layouts/FarawayIsland_Interior/map.bin" + }, + { + "id": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior_Layout", + "width": 30, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin", + "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin" + }, + { + "id": "LAYOUT_ISLAND_HARBOR", + "name": "IslandHarbor_Layout", + "width": 17, + "height": 13, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_IslandHarbor", + "border_filepath": "data/layouts/IslandHarbor/border.bin", + "blockdata_filepath": "data/layouts/IslandHarbor/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER_MARINE_CAVE", + "name": "Underwater_MarineCave_Layout", + "width": 20, + "height": 10, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater_MarineCave/border.bin", + "blockdata_filepath": "data/layouts/Underwater_MarineCave/map.bin" + }, + { + "id": "LAYOUT_MARINE_CAVE_ENTRANCE", + "name": "MarineCave_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/MarineCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/MarineCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_TERRA_CAVE_ENTRANCE", + "name": "TerraCave_Entrance_Layout", + "width": 20, + "height": 20, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/TerraCave_Entrance/border.bin", + "blockdata_filepath": "data/layouts/TerraCave_Entrance/map.bin" + }, + { + "id": "LAYOUT_TERRA_CAVE_END", + "name": "TerraCave_End_Layout", + "width": 27, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/TerraCave_End/border.bin", + "blockdata_filepath": "data/layouts/TerraCave_End/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER6", + "name": "Underwater6_Layout", + "width": 40, + "height": 80, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater6/border.bin", + "blockdata_filepath": "data/layouts/Underwater6/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER7", + "name": "Underwater7_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater7/border.bin", + "blockdata_filepath": "data/layouts/Underwater7/map.bin" + }, + { + "id": "LAYOUT_UNDERWATER5", + "name": "Underwater5_Layout", + "width": 80, + "height": 40, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Underwater", + "border_filepath": "data/layouts/Underwater5/border.bin", + "blockdata_filepath": "data/layouts/Underwater5/map.bin" + }, + { + "id": "LAYOUT_MARINE_CAVE_END", + "name": "MarineCave_End_Layout", + "width": 27, + "height": 30, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/MarineCave_End/border.bin", + "blockdata_filepath": "data/layouts/MarineCave_End/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_ENTRANCE", + "name": "TrainerHill_Entrance_Layout", + "width": 19, + "height": 17, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_Entrance/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_Entrance/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_1F", + "name": "TrainerHill_1F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_1F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_1F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_2F", + "name": "TrainerHill_2F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_2F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_2F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_3F", + "name": "TrainerHill_3F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_3F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_3F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_4F", + "name": "TrainerHill_4F_Layout", + "width": 16, + "height": 21, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_4F/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_4F/map.bin" + }, + { + "id": "LAYOUT_TRAINER_HILL_ROOF", + "name": "TrainerHill_Roof_Layout", + "width": 25, + "height": 16, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_TrainerHill", + "border_filepath": "data/layouts/TrainerHill_Roof/border.bin", + "blockdata_filepath": "data/layouts/TrainerHill_Roof/map.bin" + }, + { + "id": "LAYOUT_ALTERING_CAVE", + "name": "AlteringCave_Layout", + "width": 32, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Cave", + "border_filepath": "data/layouts/AlteringCave/border.bin", + "blockdata_filepath": "data/layouts/AlteringCave/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior_Layout", + "width": 21, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Dewford", + "border_filepath": "data/layouts/NavelRock_Exterior/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_ENTRANCE", + "name": "NavelRock_Entrance_Layout", + "width": 21, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Entrance/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Entrance/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_TOP", + "name": "NavelRock_Top_Layout", + "width": 25, + "height": 28, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Top/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Top/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_BOTTOM", + "name": "NavelRock_Bottom_Layout", + "width": 22, + "height": 22, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Bottom/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Bottom/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "name": "NavelRock_LadderRoom1_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_LadderRoom1/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_LadderRoom1/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "name": "NavelRock_LadderRoom2_Layout", + "width": 9, + "height": 8, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_LadderRoom2/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_LadderRoom2/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F_Layout", + "width": 23, + "height": 11, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_B1F/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin" + }, + { + "id": "LAYOUT_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork_Layout", + "width": 27, + "height": 86, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_NavelRock", + "border_filepath": "data/layouts/NavelRock_Fork/border.bin", + "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "name": "BattleFrontier_Lounge2_Layout", + "width": 9, + "height": 10, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_Lounge2/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_Lounge2/map.bin" + }, + { + "id": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", + "name": "BattleFrontier_ScottsHouse_Layout", + "width": 6, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_BattleFrontier", + "border_filepath": "data/layouts/BattleFrontier_ScottsHouse/border.bin", + "blockdata_filepath": "data/layouts/BattleFrontier_ScottsHouse/map.bin" + }, + { + "id": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", + "name": "MeteorFalls_StevensCave_Layout", + "width": 30, + "height": 32, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_MeteorFalls", + "border_filepath": "data/layouts/MeteorFalls_StevensCave/border.bin", + "blockdata_filepath": "data/layouts/MeteorFalls_StevensCave/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08480DAC", + "name": "UnknownMap_08480DAC_Layout", + "width": 13, + "height": 13, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_Lab", + "border_filepath": "data/layouts/UnknownMap_08480DAC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08480DAC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08480F54", + "name": "UnknownMap_08480F54_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_08480F54/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08480F54/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084810FC", + "name": "UnknownMap_084810FC_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084810FC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084810FC/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084812A4", + "name": "UnknownMap_084812A4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084812A4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084812A4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_0848144C", + "name": "UnknownMap_0848144C_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_0848144C/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_0848144C/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_084815F4", + "name": "UnknownMap_084815F4_Layout", + "width": 14, + "height": 14, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_084815F4/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_084815F4/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08481B24", + "name": "UnknownMap_08481B24_Layout", + "width": 27, + "height": 24, + "primary_tileset": "gTileset_General", + "secondary_tileset": "gTileset_Pacifidlog", + "border_filepath": "data/layouts/UnknownMap_08481B24/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08481B24/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "name": "SootopolisCity_MysteryEventsHouse_1F_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_1F/map.bin" + }, + { + "id": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "name": "SootopolisCity_MysteryEventsHouse_B1F_Layout", + "width": 12, + "height": 9, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/border.bin", + "blockdata_filepath": "data/layouts/SootopolisCity_MysteryEventsHouse_B1F/map.bin" + }, + { + "id": "LAYOUT_UNKNOWN_MAP_08481DBC", + "name": "UnknownMap_08481DBC_Layout", + "width": 11, + "height": 8, + "primary_tileset": "gTileset_Building", + "secondary_tileset": "gTileset_MysteryEventsHouse", + "border_filepath": "data/layouts/UnknownMap_08481DBC/border.bin", + "blockdata_filepath": "data/layouts/UnknownMap_08481DBC/map.bin" + } + ] +} \ No newline at end of file diff --git a/data/layouts_table.inc b/data/layouts_table.inc deleted file mode 100644 index fb1385bdb..000000000 --- a/data/layouts_table.inc +++ /dev/null @@ -1,443 +0,0 @@ - .align 2 -gMapLayouts:: - .4byte PetalburgCity_Layout - .4byte SlateportCity_Layout - .4byte MauvilleCity_Layout - .4byte RustboroCity_Layout - .4byte FortreeCity_Layout - .4byte LilycoveCity_Layout - .4byte MossdeepCity_Layout - .4byte SootopolisCity_Layout - .4byte EverGrandeCity_Layout - .4byte LittlerootTown_Layout - .4byte OldaleTown_Layout - .4byte DewfordTown_Layout - .4byte LavaridgeTown_Layout - .4byte FallarborTown_Layout - .4byte VerdanturfTown_Layout - .4byte PacifidlogTown_Layout - .4byte Route101_Layout - .4byte Route102_Layout - .4byte Route103_Layout - .4byte Route104_Layout - .4byte Route105_Layout - .4byte Route106_Layout - .4byte Route107_Layout - .4byte Route108_Layout - .4byte Route109_Layout - .4byte Route110_Layout - .4byte Route111_Layout - .4byte Route112_Layout - .4byte Route113_Layout - .4byte Route114_Layout - .4byte Route115_Layout - .4byte Route116_Layout - .4byte Route117_Layout - .4byte Route118_Layout - .4byte Route119_Layout - .4byte Route120_Layout - .4byte Route121_Layout - .4byte Route122_Layout - .4byte Route123_Layout - .4byte Route124_Layout - .4byte Route125_Layout - .4byte Route126_Layout - .4byte Route127_Layout - .4byte Route128_Layout - .4byte Route129_Layout - .4byte UnknownMap_08417FC4_Layout - .4byte Route131_Layout - .4byte Route132_Layout - .4byte Route133_Layout - .4byte Route134_Layout - .4byte Underwater2_Layout - .4byte Underwater3_Layout - .4byte Underwater4_Layout - .4byte LittlerootTown_BrendansHouse_1F_Layout - .4byte LittlerootTown_BrendansHouse_2F_Layout - .4byte LittlerootTown_MaysHouse_1F_Layout - .4byte LittlerootTown_MaysHouse_2F_Layout - .4byte LittlerootTown_ProfessorBirchsLab_Layout - .4byte House1_Layout - .4byte House2_Layout - .4byte PokemonCenter_1F_Layout - .4byte PokemonCenter_2F_Layout - .4byte Mart_Layout - .4byte House3_Layout - .4byte DewfordTown_Gym_Layout - .4byte DewfordTown_Hall_Layout - .4byte House4_Layout - .4byte LavaridgeTown_HerbShop_Layout - .4byte LavaridgeTown_Gym_1F_Layout - .4byte LavaridgeTown_Gym_B1F_Layout - .4byte LavaridgeTown_PokemonCenter_1F_Layout - .4byte FallarborTown_LeftoverRSContestLobby_Layout - .4byte FallarborTown_LeftoverRSContestHall_Layout - .4byte LilycoveCity_House2_Layout - .4byte UnknownMap_08428450_Layout - .4byte VerdanturfTown_WandasHouse_Layout - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House2_Layout - .4byte PetalburgCity_Gym_Layout - .4byte HouseWithBed_Layout - .4byte SlateportCity_SternsShipyard_1F_Layout - .4byte SlateportCity_SternsShipyard_2F_Layout - .4byte UnknownMap_084294C4_Layout - .4byte UnknownMap_084294E8_Layout - .4byte SlateportCity_PokemonFanClub_Layout - .4byte SlateportCity_OceanicMuseum_1F_Layout - .4byte SlateportCity_OceanicMuseum_2F_Layout - .4byte Harbor_Layout - .4byte MauvilleCity_Gym_Layout - .4byte MauvilleCity_BikeShop_Layout - .4byte MauvilleCity_GameCorner_Layout - .4byte RustboroCity_DevonCorp_1F_Layout - .4byte RustboroCity_DevonCorp_2F_Layout - .4byte RustboroCity_Gym_Layout - .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House1_Layout - .4byte RustboroCity_CuttersHouse_Layout - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_Gym_Layout - .4byte FortreeCity_House2_Layout - .4byte Route104_MrBrineysHouse_Layout - .4byte LilycoveCity_LilycoveMuseum_1F_Layout - .4byte LilycoveCity_LilycoveMuseum_2F_Layout - .4byte LilycoveCity_ContestLobby_Layout - .4byte LilycoveCity_ContestHall_Layout - .4byte LilycoveCity_PokemonTrainerFanClub_Layout - .4byte MossdeepCity_Gym_Layout - .4byte SootopolisCity_Gym_1F_Layout - .4byte SootopolisCity_Gym_B1F_Layout - .4byte EverGrandeCity_SidneysRoom_Layout - .4byte EverGrandeCity_PhoebesRoom_Layout - .4byte EverGrandeCity_GlaciasRoom_Layout - .4byte EverGrandeCity_DrakesRoom_Layout - .4byte EverGrandeCity_ChampionsRoom_Layout - .4byte EverGrandeCity_ShortHall_Layout - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte CableCarStation_Layout - .4byte Route114_FossilManiacsHouse_Layout - .4byte Route114_FossilManiacsTunnel_Layout - .4byte Route114_LanettesHouse_Layout - .4byte Route116_TunnelersRestHouse_Layout - .4byte Route117_PokemonDayCare_Layout - .4byte Route121_SafariZoneEntrance_Layout - .4byte MeteorFalls_1F_1R_Layout - .4byte MeteorFalls_1F_2R_Layout - .4byte MeteorFalls_B1F_1R_Layout - .4byte MeteorFalls_B1F_2R_Layout - .4byte RusturfTunnel_Layout - .4byte Underwater_SootopolisCity_Layout - .4byte DesertRuins_Layout - .4byte GraniteCave_1F_Layout - .4byte GraniteCave_B1F_Layout - .4byte GraniteCave_B2F_Layout - .4byte PetalburgWoods_Layout - .4byte MtChimney_Layout - .4byte MtPyre_1F_Layout - .4byte MtPyre_2F_Layout - .4byte MtPyre_3F_Layout - .4byte MtPyre_4F_Layout - .4byte MtPyre_5F_Layout - .4byte MtPyre_6F_Layout - .4byte AquaHideout_1F_Layout - .4byte AquaHideout_B1F_Layout - .4byte AquaHideout_B2F_Layout - .4byte Underwater_SeafloorCavern_Layout - .4byte SeafloorCavern_Entrance_Layout - .4byte SeafloorCavern_Room1_Layout - .4byte SeafloorCavern_Room2_Layout - .4byte SeafloorCavern_Room3_Layout - .4byte SeafloorCavern_Room4_Layout - .4byte SeafloorCavern_Room5_Layout - .4byte SeafloorCavern_Room6_Layout - .4byte SeafloorCavern_Room7_Layout - .4byte SeafloorCavern_Room8_Layout - .4byte SeafloorCavern_Room9_Layout - .4byte CaveOfOrigin_Entrance_Layout - .4byte CaveOfOrigin_1F_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_B1F_Layout - .4byte VictoryRoad_1F_Layout - .4byte ShoalCave_LowTideEntranceRoom_Layout - .4byte ShoalCave_LowTideInnerRoom_Layout - .4byte ShoalCave_LowTideStairsRoom_Layout - .4byte ShoalCave_LowTideLowerRoom_Layout - .4byte ShoalCave_HighTideEntranceRoom_Layout - .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte UnknownMap_0843E6C0_Layout - .4byte UnknownMap_0843E6E4_Layout - .4byte UnknownMap_0843E708_Layout - .4byte UnknownMap_0843E72C_Layout - .4byte UnknownMap_0843E750_Layout - .4byte UnknownMap_0843E774_Layout - .4byte UnknownMap_0843E798_Layout - .4byte UnknownMap_0843E7BC_Layout - .4byte UnknownMap_0843E7E0_Layout - .4byte UnknownMap_0843E804_Layout - .4byte UnknownMap_0843E828_Layout - .4byte UnknownMap_0843E84C_Layout - .4byte UnknownMap_0843E870_Layout - .4byte UnknownMap_0843E894_Layout - .4byte NewMauville_Entrance_Layout - .4byte NewMauville_Inside_Layout - .4byte AbandonedShip_Deck_Layout - .4byte AbandonedShip_Corridors_1F_Layout - .4byte AbandonedShip_Rooms_1F_Layout - .4byte AbandonedShip_Corridors_B1F_Layout - .4byte AbandonedShip_Rooms_B1F_Layout - .4byte AbandonedShip_Rooms2_B1F_Layout - .4byte AbandonedShip_Underwater1_Layout - .4byte AbandonedShip_Room_B1F_Layout - .4byte AbandonedShip_Rooms2_1F_Layout - .4byte AbandonedShip_CaptainsOffice_Layout - .4byte AbandonedShip_Underwater2_Layout - .4byte SecretBase_RedCave1_Layout - .4byte SecretBase_BrownCave1_Layout - .4byte SecretBase_BlueCave1_Layout - .4byte SecretBase_YellowCave1_Layout - .4byte SecretBase_Tree1_Layout - .4byte SecretBase_Shrub1_Layout - .4byte SecretBase_RedCave2_Layout - .4byte SecretBase_BrownCave2_Layout - .4byte SecretBase_BlueCave2_Layout - .4byte SecretBase_YellowCave2_Layout - .4byte SecretBase_Tree2_Layout - .4byte SecretBase_Shrub2_Layout - .4byte SecretBase_RedCave3_Layout - .4byte SecretBase_BrownCave3_Layout - .4byte SecretBase_BlueCave3_Layout - .4byte SecretBase_YellowCave3_Layout - .4byte SecretBase_Tree3_Layout - .4byte SecretBase_Shrub3_Layout - .4byte SecretBase_RedCave4_Layout - .4byte SecretBase_BrownCave4_Layout - .4byte SecretBase_BlueCave4_Layout - .4byte SecretBase_YellowCave4_Layout - .4byte SecretBase_Tree4_Layout - .4byte SecretBase_Shrub4_Layout - .4byte SingleBattleColosseum_Layout - .4byte TradeCenter_Layout - .4byte RecordCorner_Layout - .4byte DoubleBattleColosseum_Layout - .4byte LinkContestRoom1_Layout - .4byte UnknownMap_25_29_Layout - .4byte UnknownMap_25_30_Layout - .4byte UnknownMap_25_31_Layout - .4byte UnknownMap_25_32_Layout - .4byte UnknownMap_25_33_Layout - .4byte UnknownMap_25_34_Layout - .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom6_Layout - .4byte InsideOfTruck_Layout - .4byte SafariZone_Northwest_Layout - .4byte SafariZone_North_Layout - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_South_Layout - .4byte UnknownMap_08447028_Layout - .4byte Route109_SeashoreHouse_Layout - .4byte Route110_TrickHouseEntrance_Layout - .4byte Route110_TrickHouseEnd_Layout - .4byte Route110_TrickHouseCorridor_Layout - .4byte Route110_TrickHousePuzzle1_Layout - .4byte Route110_TrickHousePuzzle2_Layout - .4byte Route110_TrickHousePuzzle3_Layout - .4byte Route110_TrickHousePuzzle4_Layout - .4byte Route110_TrickHousePuzzle5_Layout - .4byte Route110_TrickHousePuzzle6_Layout - .4byte Route110_TrickHousePuzzle7_Layout - .4byte Route110_TrickHousePuzzle8_Layout - .4byte FortreeCity_DecorationShop_Layout - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte LilycoveCity_DepartmentStore_1F_Layout - .4byte LilycoveCity_DepartmentStore_2F_Layout - .4byte LilycoveCity_DepartmentStore_3F_Layout - .4byte LilycoveCity_DepartmentStore_4F_Layout - .4byte LilycoveCity_DepartmentStore_5F_Layout - .4byte LilycoveCity_DepartmentStoreRooftop_Layout - .4byte Route130_Layout - .4byte BattleFrontier_BattleTowerLobby_Layout - .4byte BattleFrontier_OutsideWest_Layout - .4byte BattleElevator_Layout - .4byte BattleFrontier_BattleTowerCorridor_Layout - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte EverGrandeCity_PokemonLeague_1F_Layout - .4byte Route119_WeatherInstitute_1F_Layout - .4byte Route119_WeatherInstitute_2F_Layout - .4byte LilycoveCity_DepartmentStoreElevator_Layout - .4byte Underwater1_Layout - .4byte MossdeepCity_SpaceCenter_1F_Layout - .4byte MossdeepCity_SpaceCenter_2F_Layout - .4byte SSTidalCorridor_Layout - .4byte SSTidalLowerDeck_Layout - .4byte SSTidalRooms_Layout - .4byte IslandCave_Layout - .4byte AncientTomb_Layout - .4byte Underwater_Route134_Layout - .4byte Underwater_SealedChamber_Layout - .4byte SealedChamber_OuterRoom_Layout - .4byte VictoryRoad_B1F_Layout - .4byte VictoryRoad_B2F_Layout - .4byte Route104_Prototype_Layout - .4byte GraniteCave_StevensRoom_Layout - .4byte AbandonedShip_HiddenFloorCorridors_Layout - .4byte SouthernIsland_Exterior_Layout - .4byte SouthernIsland_Interior_Layout - .4byte JaggedPass_Layout - .4byte FieryPath_Layout - .4byte RustboroCity_Flat2_1F_Layout - .4byte RustboroCity_Flat2_2F_Layout - .4byte RustboroCity_Flat2_3F_Layout - .4byte SootopolisCity_LotadAndSeedotHouse_Layout - .4byte EverGrandeCity_HallOfFame_Layout - .4byte LilycoveCity_CoveLilyMotel_1F_Layout - .4byte LilycoveCity_CoveLilyMotel_2F_Layout - .4byte Route124_DivingTreasureHuntersHouse_Layout - .4byte MtPyre_Exterior_Layout - .4byte MtPyre_Summit_Layout - .4byte SealedChamber_InnerRoom_Layout - .4byte MossdeepCity_GameCorner_1F_Layout - .4byte MossdeepCity_GameCorner_B1F_Layout - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House3_Layout - .4byte AbandonedShip_HiddenFloorRooms_Layout - .4byte ScorchedSlab_Layout - .4byte UnknownMap_0845A394_Layout - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_2F_Layout - .4byte EverGrandeCity_Hall4_Layout - .4byte AquaHideout_UnusedRubyMap1_Layout - .4byte AquaHideout_UnusedRubyMap2_Layout - .4byte AquaHideout_UnusedRubyMap3_Layout - .4byte UnknownMap_0845D470_Layout - .4byte SkyPillar_Entrance_Layout - .4byte SkyPillar_Outside_Layout - .4byte SkyPillar_1F_Layout - .4byte SkyPillar_2F_Layout - .4byte SkyPillar_3F_Layout - .4byte SkyPillar_4F_Layout - .4byte UnknownMap_0845ECB4_Layout - .4byte MossdeepCity_StevensHouse_Layout - .4byte ShoalCave_LowTideIceRoom_Layout - .4byte SafariZone_RestHouse_Layout - .4byte SkyPillar_5F_Layout - .4byte SkyPillar_Top_Layout - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_4F_Layout - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte UnknownMap_08469200_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte UnknownMap_084693AC_Layout - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare16_Layout - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_2F_3R_Layout - .4byte MirageTower_1F_Layout - .4byte MirageTower_2F_Layout - .4byte MirageTower_3F_Layout - .4byte BattleTentLobby_Layout - .4byte BattleTentCorridor_Layout - .4byte BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte MirageTower_4F_Layout - .4byte DesertUnderpass_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte Route111_NoMirageTower_Layout - .4byte UnionRoom_Layout - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Southeast_Layout - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_ReceptionGate_Layout - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_1F_Layout - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Interior_Layout - .4byte BirthIsland_Exterior_Layout - .4byte IslandHarbor_Layout - .4byte Underwater_MarineCave_Layout - .4byte MarineCave_Entrance_Layout - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_End_Layout - .4byte Underwater6_Layout - .4byte Underwater7_Layout - .4byte Underwater5_Layout - .4byte MarineCave_End_Layout - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_Roof_Layout - .4byte AlteringCave_Layout - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Top_Layout - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_B1F_Layout - .4byte NavelRock_Fork_Layout - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_ScottsHouse_Layout - .4byte MeteorFalls_StevensCave_Layout - .4byte UnknownMap_08480DAC_Layout - .4byte UnknownMap_08480F54_Layout - .4byte UnknownMap_084810FC_Layout - .4byte UnknownMap_084812A4_Layout - .4byte UnknownMap_0848144C_Layout - .4byte UnknownMap_084815F4_Layout - .4byte UnknownMap_08481B24_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte UnknownMap_08481DBC_Layout diff --git a/data/map_events.s b/data/map_events.s index 6b2062076..c6f88d305 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -12,522 +12,5 @@ .section .rodata - .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/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/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/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_SeasideCyclingRoadNorthEntrance/events.inc" - .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/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" + .include "data/maps/events.inc" diff --git a/data/maps.s b/data/maps.s index 6e6545fbc..3334fd103 100644 --- a/data/maps.s +++ b/data/maps.s @@ -10,8 +10,8 @@ .section .rodata - .include "data/layouts.inc" - .include "data/layouts_table.inc" + .include "data/layouts/layouts.inc" + .include "data/layouts/layouts_table.inc" .include "data/maps/headers.inc" .include "data/maps/groups.inc" .include "data/maps/connections.inc" diff --git a/data/maps/.gitignore b/data/maps/.gitignore new file mode 100755 index 000000000..c07d4e03a --- /dev/null +++ b/data/maps/.gitignore @@ -0,0 +1,7 @@ +connections.in +events.inc +groups.inc +headers.inc +**/connections.inc +**/events.inc +**/header.inc diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc deleted file mode 100644 index aff922c97..000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -AbandonedShip_CaptainsOffice_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY - -AbandonedShip_CaptainsOffice_MapWarps: - warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - -AbandonedShip_CaptainsOffice_MapEvents:: - map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc deleted file mode 100644 index a3fbacdc7..000000000 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_CaptainsOffice: - .4byte AbandonedShip_CaptainsOffice_Layout - .4byte AbandonedShip_CaptainsOffice_MapEvents - .4byte AbandonedShip_CaptainsOffice_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json new file mode 100644 index 000000000..69a8b31cb --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", + "name": "AbandonedShip_CaptainsOffice", + "layout": "LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_CaptainsOffice_EventScript_29126E", + "flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY" + } + ], + "warp_events": [ + { + "x": 7, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 4 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc deleted file mode 100644 index e9efcc82a..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -AbandonedShip_Corridors_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 - -AbandonedShip_Corridors_1F_MapWarps: - warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK - warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK - warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK - warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK - warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F - warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F - warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F - -AbandonedShip_Corridors_1F_MapEvents:: - map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc deleted file mode 100644 index fc296e762..000000000 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_1F: - .4byte AbandonedShip_Corridors_1F_Layout - .4byte AbandonedShip_Corridors_1F_MapEvents - .4byte AbandonedShip_Corridors_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json new file mode 100644 index 000000000..d2f65aee4 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -0,0 +1,132 @@ +{ + "id": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "name": "AbandonedShip_Corridors_1F", + "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Corridors_1F_EventScript_2379A5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Corridors_1F_EventScript_2379AE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 2 + }, + { + "x": 0, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 3 + }, + { + "x": 11, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 7 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 6 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc deleted file mode 100644 index bbe3153e0..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -AbandonedShip_Corridors_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 - -AbandonedShip_Corridors_B1F_MapWarps: - warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F - warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F - warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F - warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F - warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Corridors_B1F_MapBGEvents: - bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 - -AbandonedShip_Corridors_B1F_MapEvents:: - map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents - diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc deleted file mode 100644 index 7b03645fd..000000000 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Corridors_B1F: - .4byte AbandonedShip_Corridors_B1F_Layout - .4byte AbandonedShip_Corridors_B1F_MapEvents - .4byte AbandonedShip_Corridors_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json new file mode 100644 index 000000000..7e27751b1 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -0,0 +1,113 @@ +{ + "id": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "name": "AbandonedShip_Corridors_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Corridors_B1F_EventScript_237DBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Corridors_B1F_EventScript_237E13", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F", + "dest_warp_id": 0 + }, + { + "x": 0, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 10 + }, + { + "x": 8, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_Corridors_B1F_EventScript_237DC8" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc deleted file mode 100644 index 70fa72c4f..000000000 --- a/data/maps/AbandonedShip_Deck/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Deck_MapWarps: - warp_def 13, 15, 3, 0, MAP_ROUTE108 - warp_def 14, 15, 3, 0, MAP_ROUTE108 - warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE - -AbandonedShip_Deck_MapEvents:: - map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc deleted file mode 100644 index 395f4404d..000000000 --- a/data/maps/AbandonedShip_Deck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Deck: - .4byte AbandonedShip_Deck_Layout - .4byte AbandonedShip_Deck_MapEvents - .4byte AbandonedShip_Deck_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_DECK - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json new file mode 100644 index 000000000..b12ff4057 --- /dev/null +++ b/data/maps/AbandonedShip_Deck/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_ABANDONED_SHIP_DECK", + "name": "AbandonedShip_Deck", + "layout": "LAYOUT_ABANDONED_SHIP_DECK", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE108", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 15, + "elevation": 3, + "dest_map": "MAP_ROUTE108", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 5, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc deleted file mode 100644 index 5b0130c3e..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: - warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 3, 3, 3, 6, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - -AbandonedShip_HiddenFloorCorridors_MapBGEvents: - bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 - bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE - -AbandonedShip_HiddenFloorCorridors_MapEvents:: - map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc deleted file mode 100644 index cc268ca6e..000000000 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorCorridors: - .4byte AbandonedShip_HiddenFloorCorridors_Layout - .4byte AbandonedShip_HiddenFloorCorridors_MapEvents - .4byte AbandonedShip_HiddenFloorCorridors_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json new file mode 100644 index 000000000..1b1466fe1 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -0,0 +1,96 @@ +{ + "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "name": "AbandonedShip_HiddenFloorCorridors", + "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 8, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 7 + }, + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A19" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A50" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238A87" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorCorridors_EventScript_238ABE" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc deleted file mode 100644 index 380e7f958..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -AbandonedShip_HiddenFloorRooms_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE - -AbandonedShip_HiddenFloorRooms_MapWarps: - warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS - -AbandonedShip_HiddenFloorRooms_MapBGEvents: - bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY - bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY - bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY - bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY - bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 - -AbandonedShip_HiddenFloorRooms_MapEvents:: - map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc deleted file mode 100644 index 24889acd1..000000000 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_HiddenFloorRooms: - .4byte AbandonedShip_HiddenFloorRooms_Layout - .4byte AbandonedShip_HiddenFloorRooms_MapEvents - .4byte AbandonedShip_HiddenFloorRooms_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json new file mode 100644 index 000000000..51fc0f260 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -0,0 +1,218 @@ +{ + "id": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "name": "AbandonedShip_HiddenFloorRooms", + "layout": "LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 41, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_29127B", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_291288", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_2912A2", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_HiddenFloorRooms_EventScript_291295", + "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE" + } + ], + "warp_events": [ + { + "x": 6, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 1 + }, + { + "x": 36, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 2 + }, + { + "x": 37, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 4 + }, + { + "x": 36, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 10, + "elevation": 3, + "item": "ITEM_ROOM_1_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY" + }, + { + "type": "hidden_item", + "x": 20, + "y": 5, + "elevation": 3, + "item": "ITEM_ROOM_2_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY" + }, + { + "type": "hidden_item", + "x": 1, + "y": 12, + "elevation": 3, + "item": "ITEM_ROOM_4_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY" + }, + { + "type": "hidden_item", + "x": 1, + "y": 2, + "elevation": 0, + "item": "ITEM_ROOM_6_KEY", + "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY" + }, + { + "type": "sign", + "x": 8, + "y": 5, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 11, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 10, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 16, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 25, + "y": 2, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + }, + { + "type": "sign", + "x": 24, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AbandonedShip_HiddenFloorRooms_EventScript_238DF3" + } + ] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc deleted file mode 100644 index d0cddd45b..000000000 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_Room_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 - -AbandonedShip_Room_B1F_MapWarps: - warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Room_B1F_MapEvents:: - map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc deleted file mode 100644 index c6dd8ee37..000000000 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Room_B1F: - .4byte AbandonedShip_Room_B1F_Layout - .4byte AbandonedShip_Room_B1F_MapEvents - .4byte AbandonedShip_Room_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json new file mode 100644 index 000000000..f762b08f9 --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOM_B1F", + "name": "AbandonedShip_Room_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOM_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Room_B1F_EventScript_291254", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc deleted file mode 100644 index 71b0416e3..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 - object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 - -AbandonedShip_Rooms2_1F_MapWarps: - warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Rooms2_1F_MapEvents:: - map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc deleted file mode 100644 index e9a55f93e..000000000 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_1F: - .4byte AbandonedShip_Rooms2_1F_Layout - .4byte AbandonedShip_Rooms2_1F_MapEvents - .4byte AbandonedShip_Rooms2_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json new file mode 100644 index 000000000..84ccb93dc --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS2_1F", + "name": "AbandonedShip_Rooms2_1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "AbandonedShip_Rooms2_1F_EventScript_2380A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "AbandonedShip_Rooms2_1F_EventScript_23810B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_1F_EventScript_291261", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Rooms2_1F_EventScript_238186", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AbandonedShip_Rooms2_1F_EventScript_23816F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc deleted file mode 100644 index 3c47ae3bb..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -AbandonedShip_Rooms2_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL - -AbandonedShip_Rooms2_B1F_MapWarps: - warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Rooms2_B1F_MapEvents:: - map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc deleted file mode 100644 index 4afe51937..000000000 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms2_B1F: - .4byte AbandonedShip_Rooms2_B1F_Layout - .4byte AbandonedShip_Rooms2_B1F_MapEvents - .4byte AbandonedShip_Rooms2_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json new file mode 100644 index 000000000..2e8256331 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS2_B1F", + "name": "AbandonedShip_Rooms2_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS2_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_B1F_EventScript_238025", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms2_B1F_EventScript_291247", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc deleted file mode 100644 index b63f2bd72..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -AbandonedShip_Rooms_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 - -AbandonedShip_Rooms_1F_MapWarps: - warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F - warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F - -AbandonedShip_Rooms_1F_MapEvents:: - map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc deleted file mode 100644 index 60607565c..000000000 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_1F: - .4byte AbandonedShip_Rooms_1F_Layout - .4byte AbandonedShip_Rooms_1F_MapEvents - .4byte AbandonedShip_Rooms_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json new file mode 100644 index 000000000..789b4edb5 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS_1F", + "name": "AbandonedShip_Rooms_1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_1F_EventScript_237A93", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_1F_EventScript_29122D", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Rooms_1F_EventScript_237AB3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 10, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AbandonedShip_Rooms_1F_EventScript_237A9C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 6 + }, + { + "x": 13, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 5 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 7 + }, + { + "x": 14, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc deleted file mode 100644 index eda95460b..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -AbandonedShip_Rooms_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE - -AbandonedShip_Rooms_B1F_MapWarps: - warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F - warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F - -AbandonedShip_Rooms_B1F_MapEvents:: - map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc deleted file mode 100644 index 582123b34..000000000 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Rooms_B1F: - .4byte AbandonedShip_Rooms_B1F_Layout - .4byte AbandonedShip_Rooms_B1F_MapEvents - .4byte AbandonedShip_Rooms_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json new file mode 100644 index 000000000..224b25165 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_ABANDONED_SHIP_ROOMS_B1F", + "name": "AbandonedShip_Rooms_B1F", + "layout": "LAYOUT_ABANDONED_SHIP_ROOMS_B1F", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_B1F_EventScript_237FC6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AbandonedShip_Rooms_B1F_EventScript_29123A", + "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 3 + }, + { + "x": 22, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc deleted file mode 100644 index c6c4e226f..000000000 --- a/data/maps/AbandonedShip_Underwater1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -AbandonedShip_Underwater1_MapWarps: - warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - -AbandonedShip_Underwater1_MapEvents:: - map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc deleted file mode 100644 index d77b43cac..000000000 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater1: - .4byte AbandonedShip_Underwater1_Layout - .4byte AbandonedShip_Underwater1_MapEvents - .4byte AbandonedShip_Underwater1_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1 - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json new file mode 100644 index 000000000..de9c77815 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_ABANDONED_SHIP_UNDERWATER1", + "name": "AbandonedShip_Underwater1", + "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER1", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc deleted file mode 100644 index f4fadb1ba..000000000 --- a/data/maps/AbandonedShip_Underwater2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AbandonedShip_Underwater2_MapWarps: - warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 - -AbandonedShip_Underwater2_MapEvents:: - map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc deleted file mode 100644 index eb08a5f70..000000000 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AbandonedShip_Underwater2: - .4byte AbandonedShip_Underwater2_Layout - .4byte AbandonedShip_Underwater2_MapEvents - .4byte AbandonedShip_Underwater2_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2 - .byte MAPSEC_ABANDONED_SHIP - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json new file mode 100644 index 000000000..c1c9f24d3 --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ABANDONED_SHIP_UNDERWATER2", + "name": "AbandonedShip_Underwater2", + "layout": "LAYOUT_ABANDONED_SHIP_UNDERWATER2", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_ABANDONED_SHIP", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc deleted file mode 100644 index 0963e3801..000000000 --- a/data/maps/AlteringCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -AlteringCave_MapWarps: - warp_def 18, 22, 0, 0, MAP_ROUTE103 - -AlteringCave_MapEvents:: - map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc deleted file mode 100644 index 551d70424..000000000 --- a/data/maps/AlteringCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AlteringCave: - .4byte AlteringCave_Layout - .4byte AlteringCave_MapEvents - .4byte AlteringCave_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_ALTERING_CAVE - .byte MAPSEC_ALTERING_CAVE_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AlteringCave/map.json b/data/maps/AlteringCave/map.json new file mode 100644 index 000000000..848eb95c1 --- /dev/null +++ b/data/maps/AlteringCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_ALTERING_CAVE", + "name": "AlteringCave", + "layout": "LAYOUT_ALTERING_CAVE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_ALTERING_CAVE_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 22, + "elevation": 0, + "dest_map": "MAP_ROUTE103", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc deleted file mode 100644 index 06dedb33e..000000000 --- a/data/maps/AncientTomb/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -AncientTomb_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL - -AncientTomb_MapWarps: - warp_def 8, 29, 3, 0, MAP_ROUTE120 - warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB - warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB - -AncientTomb_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 - -AncientTomb_MapEvents:: - map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents - diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc deleted file mode 100644 index f1c3b4111..000000000 --- a/data/maps/AncientTomb/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb: - .4byte AncientTomb_Layout - .4byte AncientTomb_MapEvents - .4byte AncientTomb_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_ANCIENT_TOMB - .byte MAPSEC_ANCIENT_TOMB - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json new file mode 100644 index 000000000..327e7eded --- /dev/null +++ b/data/maps/AncientTomb/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_ANCIENT_TOMB", + "name": "AncientTomb", + "layout": "LAYOUT_ANCIENT_TOMB", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_ANCIENT_TOMB", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AncientTomb_EventScript_23905A", + "flag": "FLAG_HIDE_REGISTEEL" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE120", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239033" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239050" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "AncientTomb_EventScript_239050" + } + ] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc deleted file mode 100644 index 663ae0ada..000000000 --- a/data/maps/AquaHideout_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -AquaHideout_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_1F_MapWarps: - warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY - warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY - warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_1F_MapEvents:: - map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc deleted file mode 100644 index 30e045f79..000000000 --- a/data/maps/AquaHideout_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_1F: - .4byte AquaHideout_1F_Layout - .4byte AquaHideout_1F_MapEvents - .4byte AquaHideout_1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_1F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json new file mode 100644 index 000000000..278bc5894 --- /dev/null +++ b/data/maps/AquaHideout_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_AQUA_HIDEOUT_1F", + "name": "AquaHideout_1F", + "layout": "LAYOUT_AQUA_HIDEOUT_1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_1F_EventScript_233494", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_1F_EventScript_2334C6", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 13, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AquaHideout_1F_EventScript_2334F8", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 27, + "elevation": 1, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 6 + }, + { + "x": 14, + "y": 27, + "elevation": 1, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 6 + }, + { + "x": 22, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc deleted file mode 100644 index edc3df4c6..000000000 --- a/data/maps/AquaHideout_B1F/events.inc +++ /dev/null @@ -1,41 +0,0 @@ -AquaHideout_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_B1F_MapWarps: - warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F - warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F - warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F - warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F - warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F - warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F - warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F - warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F - warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F - warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F - warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F - warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_B1F_MapEvents:: - map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc deleted file mode 100644 index dfe453ddd..000000000 --- a/data/maps/AquaHideout_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B1F: - .4byte AquaHideout_B1F_Layout - .4byte AquaHideout_B1F_MapEvents - .4byte AquaHideout_B1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_B1F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json new file mode 100644 index 000000000..80c4af8ef --- /dev/null +++ b/data/maps/AquaHideout_B1F/map.json @@ -0,0 +1,314 @@ +{ + "id": "MAP_AQUA_HIDEOUT_B1F", + "name": "AquaHideout_B1F", + "layout": "LAYOUT_AQUA_HIDEOUT_B1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233A85", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B1F_EventScript_233AB0", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291372", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 20, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233AD5", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291358", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_2339EB", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_291365", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B1F_EventScript_233A38", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 28, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "AquaHideout_B1F_EventScript_233AEC", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 29, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_1F", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 7 + }, + { + "x": 27, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 8 + }, + { + "x": 20, + "y": 4, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 10 + }, + { + "x": 27, + "y": 12, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 4 + }, + { + "x": 3, + "y": 15, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 5 + }, + { + "x": 3, + "y": 20, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 32, + "y": 19, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 6 + }, + { + "x": 23, + "y": 10, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 22 + }, + { + "x": 45, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 9 + }, + { + "x": 42, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 18 + }, + { + "x": 45, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 48, + "y": 5, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 16 + }, + { + "x": 42, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 15 + }, + { + "x": 45, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 20 + }, + { + "x": 48, + "y": 9, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 13 + }, + { + "x": 42, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 24 + }, + { + "x": 45, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 17 + }, + { + "x": 48, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 12 + }, + { + "x": 42, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 11 + }, + { + "x": 45, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 17 + }, + { + "x": 48, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 19 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc deleted file mode 100644 index f24115c32..000000000 --- a/data/maps/AquaHideout_B2F/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -AquaHideout_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS - -AquaHideout_B2F_MapWarps: - warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F - warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F - warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F - warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F - warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F - warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F - warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F - warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F - warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F - warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F - -AquaHideout_B2F_MapCoordEvents: - coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 - coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 - -AquaHideout_B2F_MapEvents:: - map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 - diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc deleted file mode 100644 index 3d87c7ad3..000000000 --- a/data/maps/AquaHideout_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_B2F: - .4byte AquaHideout_B2F_Layout - .4byte AquaHideout_B2F_MapEvents - .4byte AquaHideout_B2F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_B2F - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_AQUA - diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json new file mode 100644 index 000000000..56bbaab30 --- /dev/null +++ b/data/maps/AquaHideout_B2F/map.json @@ -0,0 +1,189 @@ +{ + "id": "MAP_AQUA_HIDEOUT_B2F", + "name": "AquaHideout_B2F", + "layout": "LAYOUT_AQUA_HIDEOUT_B2F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_AQUA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B2F_EventScript_233E09", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "AquaHideout_B2F_EventScript_233E8A", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "AquaHideout_B2F_EventScript_29137F", + "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "x": 19, + "y": 20, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_B2F_SUBMARINE_SHADOW" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B2F_EventScript_233EAF", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "AquaHideout_B2F_EventScript_233EC6", + "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 18, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 3 + }, + { + "x": 31, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 8 + }, + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 3 + }, + { + "x": 18, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 7 + }, + { + "x": 12, + "y": 13, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 6 + }, + { + "x": 31, + "y": 17, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B2F", + "dest_warp_id": 4 + }, + { + "x": 32, + "y": 20, + "elevation": 3, + "dest_map": "MAP_AQUA_HIDEOUT_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 28, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "AquaHideout_B2F_EventScript_233DE5" + }, + { + "type": "trigger", + "x": 28, + "y": 16, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "AquaHideout_B2F_EventScript_233DE5" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc deleted file mode 100644 index f8107f479..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc deleted file mode 100644 index 30946c6f8..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap1: - .4byte AquaHideout_UnusedRubyMap1_Layout - .4byte AquaHideout_UnusedRubyMap1_MapEvents - .4byte AquaHideout_UnusedRubyMap1_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap1/map.json b/data/maps/AquaHideout_UnusedRubyMap1/map.json new file mode 100644 index 000000000..22b645413 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap1/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "name": "AquaHideout_UnusedRubyMap1", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc deleted file mode 100644 index 569e13cb0..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc deleted file mode 100644 index cd08fcc5e..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap2: - .4byte AquaHideout_UnusedRubyMap2_Layout - .4byte AquaHideout_UnusedRubyMap2_MapEvents - .4byte AquaHideout_UnusedRubyMap2_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap2/map.json b/data/maps/AquaHideout_UnusedRubyMap2/map.json new file mode 100644 index 000000000..5bee65158 --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap2/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "name": "AquaHideout_UnusedRubyMap2", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc deleted file mode 100644 index 7618c0d58..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc deleted file mode 100644 index 993f10aff..000000000 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -AquaHideout_UnusedRubyMap3: - .4byte AquaHideout_UnusedRubyMap3_Layout - .4byte AquaHideout_UnusedRubyMap3_MapEvents - .4byte AquaHideout_UnusedRubyMap3_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 - .byte MAPSEC_AQUA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_MAGMA - diff --git a/data/maps/AquaHideout_UnusedRubyMap3/map.json b/data/maps/AquaHideout_UnusedRubyMap3/map.json new file mode 100644 index 000000000..03cafd7dc --- /dev/null +++ b/data/maps/AquaHideout_UnusedRubyMap3/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "name": "AquaHideout_UnusedRubyMap3", + "layout": "LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_AQUA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_MAGMA", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc deleted file mode 100644 index f53e074b9..000000000 --- a/data/maps/ArtisanCave_1F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -ArtisanCave_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS - -ArtisanCave_1F_MapWarps: - warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F - -ArtisanCave_1F_MapEvents:: - map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc deleted file mode 100644 index 670aa6845..000000000 --- a/data/maps/ArtisanCave_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_1F: - .4byte ArtisanCave_1F_Layout - .4byte ArtisanCave_1F_MapEvents - .4byte ArtisanCave_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_ARTISAN_CAVE_1F - .byte MAPSEC_ARTISAN_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ArtisanCave_1F/map.json b/data/maps/ArtisanCave_1F/map.json new file mode 100644 index 000000000..a0792d733 --- /dev/null +++ b/data/maps/ArtisanCave_1F/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ARTISAN_CAVE_1F", + "name": "ArtisanCave_1F", + "layout": "LAYOUT_ARTISAN_CAVE_1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_ARTISAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ArtisanCave_1F_EventScript_2914D1", + "flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS" + } + ], + "warp_events": [ + { + "x": 10, + "y": 17, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 13 + }, + { + "x": 6, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_B1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc deleted file mode 100644 index 7572aaa2a..000000000 --- a/data/maps/ArtisanCave_B1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -ArtisanCave_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP - -ArtisanCave_B1F_MapWarps: - warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F - -ArtisanCave_B1F_MapBGEvents: - bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC - bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM - bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN - bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON - -ArtisanCave_B1F_MapEvents:: - map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents - diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc deleted file mode 100644 index fd1adb32f..000000000 --- a/data/maps/ArtisanCave_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ArtisanCave_B1F: - .4byte ArtisanCave_B1F_Layout - .4byte ArtisanCave_B1F_MapEvents - .4byte ArtisanCave_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_ARTISAN_CAVE_B1F - .byte MAPSEC_ARTISAN_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ArtisanCave_B1F/map.json b/data/maps/ArtisanCave_B1F/map.json new file mode 100644 index 000000000..d47609dc8 --- /dev/null +++ b/data/maps/ArtisanCave_B1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ARTISAN_CAVE_B1F", + "name": "ArtisanCave_B1F", + "layout": "LAYOUT_ARTISAN_CAVE_B1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_ARTISAN_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ArtisanCave_B1F_EventScript_2914C4", + "flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP" + } + ], + "warp_events": [ + { + "x": 8, + "y": 48, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 10 + }, + { + "x": 38, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 32, + "y": 29, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC" + }, + { + "type": "hidden_item", + "x": 27, + "y": 8, + "elevation": 0, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM" + }, + { + "type": "hidden_item", + "x": 7, + "y": 5, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN" + }, + { + "type": "hidden_item", + "x": 19, + "y": 43, + "elevation": 0, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc deleted file mode 100644 index 4d8b6ea2f..000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleArenaBattleRoom_MapEvents:: - map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc deleted file mode 100644 index 1c4cf3eb0..000000000 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaBattleRoom: - .4byte BattleFrontier_BattleArenaBattleRoom_Layout - .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents - .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json new file mode 100644 index 000000000..5b1a51ad5 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "name": "BattleFrontier_BattleArenaBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc deleted file mode 100644 index 5be3b04e6..000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleArenaCorridor_MapEvents:: - map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc deleted file mode 100644 index 17341a3e8..000000000 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaCorridor: - .4byte BattleFrontier_BattleArenaCorridor_Layout - .4byte BattleFrontier_BattleArenaCorridor_MapEvents - .4byte BattleFrontier_BattleArenaCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/map.json b/data/maps/BattleFrontier_BattleArenaCorridor/map.json new file mode 100644 index 000000000..2cacf6621 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "name": "BattleFrontier_BattleArenaCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 9, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc deleted file mode 100644 index a63202848..000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -BattleFrontier_BattleArenaLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 - -BattleFrontier_BattleArenaLobby_MapWarps: - warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattleArenaLobby_MapBGEvents: - bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 - bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA - -BattleFrontier_BattleArenaLobby_MapEvents:: - map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc deleted file mode 100644 index db8f456ff..000000000 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleArenaLobby: - .4byte BattleFrontier_BattleArenaLobby_Layout - .4byte BattleFrontier_BattleArenaLobby_MapEvents - .4byte BattleFrontier_BattleArenaLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_ARENA - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleArenaLobby/map.json b/data/maps/BattleFrontier_BattleArenaLobby/map.json new file mode 100644 index 000000000..fc8e5bd37 --- /dev/null +++ b/data/maps/BattleFrontier_BattleArenaLobby/map.json @@ -0,0 +1,111 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "name": "BattleFrontier_BattleArenaLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "music": "MUS_B_ARENA", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_255DF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560C1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 14, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560A6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 12, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleArenaLobby_EventScript_256092" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleArenaLobby_EventScript_2560CA" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc deleted file mode 100644 index ce8f66f6b..000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomeBattleRoom_MapEvents:: - map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc deleted file mode 100644 index 593adeb6f..000000000 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeBattleRoom: - .4byte BattleFrontier_BattleDomeBattleRoom_Layout - .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents - .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json new file mode 100644 index 000000000..e897866d4 --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomeBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM", + "music": "MUS_B_DOME", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 7, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 9, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 11, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 16, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 16, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 8, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 13, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 9, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 14, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc deleted file mode 100644 index 3d3f5be4b..000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomeCorridor_MapWarps: - warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomeCorridor_MapEvents:: - map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc deleted file mode 100644 index 3ce5b2b5e..000000000 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeCorridor: - .4byte BattleFrontier_BattleDomeCorridor_Layout - .4byte BattleFrontier_BattleDomeCorridor_MapEvents - .4byte BattleFrontier_BattleDomeCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME1 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/map.json b/data/maps/BattleFrontier_BattleDomeCorridor/map.json new file mode 100644 index 000000000..3f7dc3bda --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeCorridor/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "name": "BattleFrontier_BattleDomeCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR", + "music": "MUS_B_DOME1", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 23, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc deleted file mode 100644 index abf867132..000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattleDomeLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 - -BattleFrontier_BattleDomeLobby_MapWarps: - warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomeLobby_MapBGEvents: - bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 - bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 - bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B - bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 - -BattleFrontier_BattleDomeLobby_MapEvents:: - map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc deleted file mode 100644 index cf0c57619..000000000 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomeLobby: - .4byte BattleFrontier_BattleDomeLobby_Layout - .4byte BattleFrontier_BattleDomeLobby_MapEvents - .4byte BattleFrontier_BattleDomeLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME1 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomeLobby/map.json b/data/maps/BattleFrontier_BattleDomeLobby/map.json new file mode 100644 index 000000000..c94d1e1c7 --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomeLobby/map.json @@ -0,0 +1,147 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "name": "BattleFrontier_BattleDomeLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "music": "MUS_B_DOME1", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249A35", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 14, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249DFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 18, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249DED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 17, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleDomeLobby_EventScript_249A47", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 16, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 16, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D52" + }, + { + "type": "sign", + "x": 7, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D84" + }, + { + "type": "sign", + "x": 18, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249D6B" + }, + { + "type": "sign", + "x": 15, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleDomeLobby_EventScript_249E34" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc deleted file mode 100644 index 0714b7b68..000000000 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleDomePreBattleRoom_MapWarps: - warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleDomePreBattleRoom_MapEvents:: - map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc deleted file mode 100644 index 84637906d..000000000 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleDomePreBattleRoom: - .4byte BattleFrontier_BattleDomePreBattleRoom_Layout - .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents - .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_DOME - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json new file mode 100644 index 000000000..0e96decdf --- /dev/null +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleDomePreBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM", + "music": "MUS_B_DOME", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc deleted file mode 100644 index 5f3a6a218..000000000 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleFactoryBattleRoom_MapEvents:: - map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc deleted file mode 100644 index cb20b3f1e..000000000 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryBattleRoom: - .4byte BattleFrontier_BattleFactoryBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents - .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json new file mode 100644 index 000000000..de1cdd2ff --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/map.json @@ -0,0 +1,125 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 12, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc deleted file mode 100644 index 7cfccd0ff..000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -BattleFrontier_BattleFactoryLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0 - object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 - -BattleFrontier_BattleFactoryLobby_MapWarps: - warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattleFactoryLobby_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 - bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 - -BattleFrontier_BattleFactoryLobby_MapEvents:: - map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc deleted file mode 100644 index 30bd38b68..000000000 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryLobby: - .4byte BattleFrontier_BattleFactoryLobby_Layout - .4byte BattleFrontier_BattleFactoryLobby_MapEvents - .4byte BattleFrontier_BattleFactoryLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/map.json b/data/maps/BattleFrontier_BattleFactoryLobby/map.json new file mode 100644 index 000000000..87ad1077a --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryLobby/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "name": "BattleFrontier_BattleFactoryLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 4, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258813", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 14, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_25881C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 13, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258825", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 6, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258830", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2585DD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587E1" + }, + { + "type": "sign", + "x": 11, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_2587FA" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleFactoryLobby_EventScript_258839" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc deleted file mode 100644 index 944ff8142..000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: - map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc deleted file mode 100644 index ecbfc37a9..000000000 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleFactoryPreBattleRoom: - .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents - .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_FACTORY - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json new file mode 100644 index 000000000..4d9d792f7 --- /dev/null +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "name": "BattleFrontier_BattleFactoryPreBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM", + "music": "MUS_B_FACTORY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 8, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc deleted file mode 100644 index 95aacea95..000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePalaceBattleRoom_MapWarps: - warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - -BattleFrontier_BattlePalaceBattleRoom_MapEvents:: - map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc deleted file mode 100644 index 035cd8758..000000000 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceBattleRoom: - .4byte BattleFrontier_BattlePalaceBattleRoom_Layout - .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents - .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json new file mode 100644 index 000000000..b0405cff0 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "name": "BattleFrontier_BattlePalaceBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DUSCLOPS", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 13, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc deleted file mode 100644 index 578c2cc43..000000000 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePalaceCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 - -BattleFrontier_BattlePalaceCorridor_MapWarps: - warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM - -BattleFrontier_BattlePalaceCorridor_MapEvents:: - map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc deleted file mode 100644 index 6d2f8ffb0..000000000 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceCorridor: - .4byte BattleFrontier_BattlePalaceCorridor_Layout - .4byte BattleFrontier_BattlePalaceCorridor_MapEvents - .4byte BattleFrontier_BattlePalaceCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/map.json b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json new file mode 100644 index 000000000..34378700e --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/map.json @@ -0,0 +1,141 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "name": "BattleFrontier_BattlePalaceCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 3, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KIRLIA", + "x": 12, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 15, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 4, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 13, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 3, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 13, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 13, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 3, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc deleted file mode 100644 index 4c2d924b2..000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePalaceLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 - object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 - -BattleFrontier_BattlePalaceLobby_MapWarps: - warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR - -BattleFrontier_BattlePalaceLobby_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 - bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 - bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 - -BattleFrontier_BattlePalaceLobby_MapEvents:: - map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc deleted file mode 100644 index 8846982cf..000000000 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePalaceLobby: - .4byte BattleFrontier_BattlePalaceLobby_Layout - .4byte BattleFrontier_BattlePalaceLobby_MapEvents - .4byte BattleFrontier_BattlePalaceLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_PALACE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/map.json b/data/maps/BattleFrontier_BattlePalaceLobby/map.json new file mode 100644 index 000000000..ccdbe327a --- /dev/null +++ b/data/maps/BattleFrontier_BattlePalaceLobby/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "name": "BattleFrontier_BattlePalaceLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "music": "MUS_B_PALACE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D944", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 24, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC9D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 18, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 2, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 19, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24D956", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 11, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC50" + }, + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DC69" + }, + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePalaceLobby_EventScript_24DCA6" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc deleted file mode 100644 index ace2657bb..000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeCorridor_MapEvents:: - map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc deleted file mode 100644 index cecd6fba1..000000000 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeCorridor: - .4byte BattleFrontier_BattlePikeCorridor_Layout - .4byte BattleFrontier_BattlePikeCorridor_MapEvents - .4byte BattleFrontier_BattlePikeCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/map.json b/data/maps/BattleFrontier_BattlePikeCorridor/map.json new file mode 100644 index 000000000..e35831a6d --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "name": "BattleFrontier_BattlePikeCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc deleted file mode 100644 index b28d48d6a..000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 - object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 - -BattleFrontier_BattlePikeLobby_MapWarps: - warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_BattlePikeLobby_MapBGEvents: - bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 - bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 - -BattleFrontier_BattlePikeLobby_MapEvents:: - map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc deleted file mode 100644 index a3746c114..000000000 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeLobby: - .4byte BattleFrontier_BattlePikeLobby_Layout - .4byte BattleFrontier_BattlePikeLobby_MapEvents - .4byte BattleFrontier_BattlePikeLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeLobby/map.json b/data/maps/BattleFrontier_BattlePikeLobby/map.json new file mode 100644 index 000000000..938e4da3f --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeLobby/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "name": "BattleFrontier_BattlePikeLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25B868", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAAB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BABD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BA80" + }, + { + "type": "sign", + "x": 1, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePikeLobby_EventScript_25BAC6" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc deleted file mode 100644 index 34f802c91..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 - -BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: - coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 - coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 - coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D - -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc deleted file mode 100644 index ff61d1238..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom1: - .4byte BattleFrontier_BattlePikeRandomRoom1_Layout - .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json new file mode 100644 index 000000000..9ed644d79 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/map.json @@ -0,0 +1,111 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "name": "BattleFrontier_BattlePikeRandomRoom1", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 3, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + }, + { + "type": "trigger", + "x": 4, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082" + }, + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + }, + { + "type": "trigger", + "x": 5, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc deleted file mode 100644 index 0d929a2ae..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: - map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc deleted file mode 100644 index 6ab11ae02..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom2: - .4byte BattleFrontier_BattlePikeRandomRoom2_Layout - .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json new file mode 100644 index 000000000..437e7fcfd --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "name": "BattleFrontier_BattlePikeRandomRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc deleted file mode 100644 index 9b3a6234e..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: - coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 - coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 - coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D - -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: - map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc deleted file mode 100644 index fabb3a8ef..000000000 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeRandomRoom3: - .4byte BattleFrontier_BattlePikeRandomRoom3_Layout - .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents - .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json new file mode 100644 index 000000000..60aeee81c --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "name": "BattleFrontier_BattlePikeRandomRoom3", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174" + }, + { + "type": "trigger", + "x": 3, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 4, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 5, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202" + }, + { + "type": "trigger", + "x": 3, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + }, + { + "type": "trigger", + "x": 4, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + }, + { + "type": "trigger", + "x": 5, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc deleted file mode 100644 index 59abdb970..000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 - object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 - -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: - coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E - coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 - coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 - coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 - coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D - -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: - map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc deleted file mode 100644 index 718d5d3e6..000000000 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePikeThreePathRoom: - .4byte BattleFrontier_BattlePikeThreePathRoom_Layout - .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents - .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TUBE - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json new file mode 100644 index 000000000..e2d0645cb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/map.json @@ -0,0 +1,129 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "name": "BattleFrontier_BattlePikeThreePathRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM", + "music": "MUS_B_TUBE", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E" + }, + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59" + }, + { + "type": "trigger", + "x": 10, + "y": 3, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64" + }, + { + "type": "trigger", + "x": 5, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + }, + { + "type": "trigger", + "x": 6, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 5, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062" + }, + { + "type": "trigger", + "x": 7, + "y": 10, + "elevation": 0, + "var": "VAR_TEMP_3", + "var_value": 1, + "script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc deleted file mode 100644 index 3c8e0fda8..000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0 - object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0 - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 - object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 - -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: - warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: - map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc deleted file mode 100644 index c60cf97f2..000000000 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePointExchangeServiceCorner: - .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents - .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json new file mode 100644 index 000000000..2184971eb --- /dev/null +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "name": "BattleFrontier_BattlePointExchangeServiceCorner", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 0, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 14, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 9, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 12, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 10, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc deleted file mode 100644 index 793434de3..000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: - map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc deleted file mode 100644 index 46b22aa7a..000000000 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidEmptySquare: - .4byte BattleFrontier_BattlePyramidEmptySquare_Layout - .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents - .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json new file mode 100644 index 000000000..aab03982f --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json @@ -0,0 +1,229 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "name": "BattleFrontier_BattlePyramidEmptySquare", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE", + "music": "65535", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 0, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 3, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 4, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 2, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc deleted file mode 100644 index 81a4203b5..000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 - object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 - -BattleFrontier_BattlePyramidLobby_MapWarps: - warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_BattlePyramidLobby_MapBGEvents: - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 - bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 - -BattleFrontier_BattlePyramidLobby_MapEvents:: - map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc deleted file mode 100644 index f8e7408a0..000000000 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidLobby: - .4byte BattleFrontier_BattlePyramidLobby_Layout - .4byte BattleFrontier_BattlePyramidLobby_MapEvents - .4byte BattleFrontier_BattlePyramidLobby_MapScripts - .4byte 0x0 - .2byte MUS_PYRAMID - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/map.json b/data/maps/BattleFrontier_BattlePyramidLobby/map.json new file mode 100644 index 000000000..7ffd80dcf --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidLobby/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "name": "BattleFrontier_BattlePyramidLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "music": "MUS_PYRAMID", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_2508B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 14, + "y": 13, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250ACE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 2, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 17, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250D42" + }, + { + "type": "sign", + "x": 1, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattlePyramidLobby_EventScript_250E95" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc deleted file mode 100644 index 9e1cd9f4f..000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_BattlePyramidTop_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 - object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattlePyramidTop_MapCoordEvents: - coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 - -BattleFrontier_BattlePyramidTop_MapEvents:: - map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 - diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc deleted file mode 100644 index e2e8ec59a..000000000 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattlePyramidTop: - .4byte BattleFrontier_BattlePyramidTop_Layout - .4byte BattleFrontier_BattlePyramidTop_MapEvents - .4byte BattleFrontier_BattlePyramidTop_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattlePyramidTop/map.json b/data/maps/BattleFrontier_BattlePyramidTop/map.json new file mode 100644 index 000000000..09fe56ef1 --- /dev/null +++ b/data/maps/BattleFrontier_BattlePyramidTop/map.json @@ -0,0 +1,57 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "name": "BattleFrontier_BattlePyramidTop", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP", + "music": "65535", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 17, + "y": 11, + "elevation": 6, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidTop_EventScript_2551D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BRANDON", + "x": 17, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 9, + "elevation": 4, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "BattleFrontier_BattlePyramidTop_EventScript_255256" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc deleted file mode 100644 index 4de7382b2..000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerBattleRoom_MapWarps: - warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - -BattleFrontier_BattleTowerBattleRoom_MapEvents:: - map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc deleted file mode 100644 index 5f8b03ace..000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom: - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents - .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json new file mode 100644 index 000000000..736fd55c8 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc deleted file mode 100644 index 97dc0c857..000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerBattleRoom2_MapEvents:: - map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc deleted file mode 100644 index 464ed8566..000000000 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerBattleRoom2: - .4byte BattleFrontier_BattleTowerBattleRoom_Layout - .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents - .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json new file mode 100644 index 000000000..60d7bc73a --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2", + "name": "BattleFrontier_BattleTowerBattleRoom2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc deleted file mode 100644 index 80b239fbc..000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerCorridor_MapEvents:: - map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc deleted file mode 100644 index 7774e0f3b..000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor: - .4byte BattleFrontier_BattleTowerCorridor_Layout - .4byte BattleFrontier_BattleTowerCorridor_MapEvents - .4byte BattleFrontier_BattleTowerCorridor_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/map.json b/data/maps/BattleFrontier_BattleTowerCorridor/map.json new file mode 100644 index 000000000..c99dcac09 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "name": "BattleFrontier_BattleTowerCorridor", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc deleted file mode 100644 index 726c4b58a..000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BattleFrontier_BattleTowerCorridor2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerCorridor2_MapEvents:: - map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc deleted file mode 100644 index 9a8676f93..000000000 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerCorridor2: - .4byte BattleFrontier_BattleTowerCorridor2_Layout - .4byte BattleFrontier_BattleTowerCorridor2_MapEvents - .4byte BattleFrontier_BattleTowerCorridor2_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/map.json b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json new file mode 100644 index 000000000..a15882e77 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/map.json @@ -0,0 +1,73 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "name": "BattleFrontier_BattleTowerCorridor2", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_E", + "x": 14, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc deleted file mode 100644 index a33f30c9e..000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -BattleFrontier_BattleTowerElevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -BattleFrontier_BattleTowerElevator_MapEvents:: - map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc deleted file mode 100644 index 3267daa20..000000000 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerElevator: - .4byte BattleElevator_Layout - .4byte BattleFrontier_BattleTowerElevator_MapEvents - .4byte BattleFrontier_BattleTowerElevator_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_ELEVATOR - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerElevator/map.json b/data/maps/BattleFrontier_BattleTowerElevator/map.json new file mode 100644 index 000000000..6af03f7f9 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerElevator/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR", + "name": "BattleFrontier_BattleTowerElevator", + "layout": "LAYOUT_BATTLE_ELEVATOR", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc deleted file mode 100644 index ddf573eb2..000000000 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -BattleFrontier_BattleTowerLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER - object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE - object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0 - object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 - object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 - -BattleFrontier_BattleTowerLobby_MapWarps: - warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM - -BattleFrontier_BattleTowerLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 - bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 - bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 - bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE - -BattleFrontier_BattleTowerLobby_MapEvents:: - map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents - diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc deleted file mode 100644 index b1ca3914a..000000000 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerLobby: - .4byte BattleFrontier_BattleTowerLobby_Layout - .4byte BattleFrontier_BattleTowerLobby_MapEvents - .4byte BattleFrontier_BattleTowerLobby_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerLobby/map.json b/data/maps/BattleFrontier_BattleTowerLobby/map.json new file mode 100644 index 000000000..4773d78ed --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerLobby/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "name": "BattleFrontier_BattleTowerLobby", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23E936", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EEE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 17, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 15, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_28CB96", + "flag": "FLAG_HIDE_BATTLE_TOWER_REPORTER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EventScript_Apprentice", + "flag": "FLAG_HIDE_APPRENTICE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EA9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EC08", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerLobby_EventScript_23ED74", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFC7" + }, + { + "type": "sign", + "x": 8, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFE0" + }, + { + "type": "sign", + "x": 12, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23EFF9" + }, + { + "type": "sign", + "x": 16, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23F012" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_BattleTowerLobby_EventScript_23F4BE" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc deleted file mode 100644 index d7dfcd3ad..000000000 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 - -BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: - map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc deleted file mode 100644 index d8fc1abb6..000000000 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_BattleTowerMultiBattleRoom: - .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents - .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_SATTOWER - .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json new file mode 100644 index 000000000..2a9726fc0 --- /dev/null +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "name": "BattleFrontier_BattleTowerMultiBattleRoom", + "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM", + "music": "MUS_SATTOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 2, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 15, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049", + "flag": "FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc deleted file mode 100644 index 7fb5e6256..000000000 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge1_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 - -BattleFrontier_Lounge1_MapWarps: - warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge1_MapEvents:: - map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc deleted file mode 100644 index 69119443d..000000000 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge1: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge1_MapEvents - .4byte BattleFrontier_Lounge1_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge1/map.json b/data/maps/BattleFrontier_Lounge1/map.json new file mode 100644 index 000000000..3f6b1681e --- /dev/null +++ b/data/maps/BattleFrontier_Lounge1/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE1", + "name": "BattleFrontier_Lounge1", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E775", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 7, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E94D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge1_EventScript_25E956", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc deleted file mode 100644 index faa0a5608..000000000 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_Lounge2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 - object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 - object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 - -BattleFrontier_Lounge2_MapWarps: - warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge2_MapEvents:: - map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc deleted file mode 100644 index a74f85ca4..000000000 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge2: - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_Lounge2_MapEvents - .4byte BattleFrontier_Lounge2_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge2/map.json b/data/maps/BattleFrontier_Lounge2/map.json new file mode 100644 index 000000000..bade81462 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge2/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE2", + "name": "BattleFrontier_Lounge2", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_26073C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260747", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_26075D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge2_EventScript_260752", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc deleted file mode 100644 index f8a26e4dd..000000000 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Lounge3_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 - -BattleFrontier_Lounge3_MapWarps: - warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge3_MapEvents:: - map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc deleted file mode 100644 index fb27b1580..000000000 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge3: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge3_MapEvents - .4byte BattleFrontier_Lounge3_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge3/map.json b/data/maps/BattleFrontier_Lounge3/map.json new file mode 100644 index 000000000..592f65a7b --- /dev/null +++ b/data/maps/BattleFrontier_Lounge3/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE3", + "name": "BattleFrontier_Lounge3", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261D83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FC1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FD1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge3_EventScript_261FB8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc deleted file mode 100644 index c2e2f44a2..000000000 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 - object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 - -BattleFrontier_Lounge4_MapWarps: - warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge4_MapEvents:: - map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc deleted file mode 100644 index edb6171e7..000000000 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge4: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge4_MapEvents - .4byte BattleFrontier_Lounge4_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge4/map.json b/data/maps/BattleFrontier_Lounge4/map.json new file mode 100644 index 000000000..9165d21fb --- /dev/null +++ b/data/maps/BattleFrontier_Lounge4/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE4", + "name": "BattleFrontier_Lounge4", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 4, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_26358D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 6, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_263596", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 0, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge4_EventScript_26359F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc deleted file mode 100644 index e0a2ea344..000000000 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Lounge5_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 - -BattleFrontier_Lounge5_MapWarps: - warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge5_MapEvents:: - map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc deleted file mode 100644 index 9c9de0e3b..000000000 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge5: - .4byte BattleFrontier_Lounge1_Layout - .4byte BattleFrontier_Lounge5_MapEvents - .4byte BattleFrontier_Lounge5_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge5/map.json b/data/maps/BattleFrontier_Lounge5/map.json new file mode 100644 index 000000000..500b0fb71 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge5/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE5", + "name": "BattleFrontier_Lounge5", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE1", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 12, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_2645C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264617", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264620", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 11, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge5_EventScript_264629", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc deleted file mode 100644 index 8c3950d61..000000000 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -BattleFrontier_Lounge6_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 - -BattleFrontier_Lounge6_MapWarps: - warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge6_MapEvents:: - map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc deleted file mode 100644 index 2b5f8474f..000000000 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge6: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge6_MapEvents - .4byte BattleFrontier_Lounge6_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge6/map.json b/data/maps/BattleFrontier_Lounge6/map.json new file mode 100644 index 000000000..0b48dbbcf --- /dev/null +++ b/data/maps/BattleFrontier_Lounge6/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE6", + "name": "BattleFrontier_Lounge6", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 2, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge6_EventScript_264FED", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc deleted file mode 100644 index bc7f289ad..000000000 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattleFrontier_Lounge7_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 - -BattleFrontier_Lounge7_MapWarps: - warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Lounge7_MapEvents:: - map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc deleted file mode 100644 index 58b9dc3e5..000000000 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge7: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge7_MapEvents - .4byte BattleFrontier_Lounge7_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge7/map.json b/data/maps/BattleFrontier_Lounge7/map.json new file mode 100644 index 000000000..28fd390f7 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge7/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE7", + "name": "BattleFrontier_Lounge7", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 0, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_2656DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 2, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_265255", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_265445", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 8, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge7_EventScript_2656E4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc deleted file mode 100644 index 47e8e51f1..000000000 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -BattleFrontier_Lounge8_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 - -BattleFrontier_Lounge8_MapWarps: - warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge8_MapEvents:: - map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc deleted file mode 100644 index 578219cc4..000000000 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge8: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge8_MapEvents - .4byte BattleFrontier_Lounge8_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge8/map.json b/data/maps/BattleFrontier_Lounge8/map.json new file mode 100644 index 000000000..13cf5e254 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge8/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE8", + "name": "BattleFrontier_Lounge8", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Lounge8_EventScript_2676D3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc deleted file mode 100644 index ce86367cf..000000000 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_Lounge9_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -BattleFrontier_Lounge9_MapWarps: - warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_Lounge9_MapEvents:: - map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc deleted file mode 100644 index 32b1512ef..000000000 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Lounge9: - .4byte BattleFrontier_Lounge2_Layout - .4byte BattleFrontier_Lounge9_MapEvents - .4byte BattleFrontier_Lounge9_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Lounge9/map.json b/data/maps/BattleFrontier_Lounge9/map.json new file mode 100644 index 000000000..3d4faf383 --- /dev/null +++ b/data/maps/BattleFrontier_Lounge9/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_LOUNGE9", + "name": "BattleFrontier_Lounge9", + "layout": "LAYOUT_BATTLE_FRONTIER_LOUNGE2", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 6, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 11 + }, + { + "x": 2, + "y": 9, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc deleted file mode 100644 index e637b489b..000000000 --- a/data/maps/BattleFrontier_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -BattleFrontier_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 - -BattleFrontier_Mart_MapWarps: - warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_Mart_MapEvents:: - map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc deleted file mode 100644 index 97251160f..000000000 --- a/data/maps/BattleFrontier_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_Mart: - .4byte Mart_Layout - .4byte BattleFrontier_Mart_MapEvents - .4byte BattleFrontier_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_Mart/map.json b/data/maps/BattleFrontier_Mart/map.json new file mode 100644 index 000000000..068a46b72 --- /dev/null +++ b/data/maps/BattleFrontier_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_BATTLE_FRONTIER_MART", + "name": "BattleFrontier_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267ACC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B0B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B02", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_Mart_EventScript_267B20", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc deleted file mode 100644 index e042da23e..000000000 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -BattleFrontier_OutsideEast_MapConnectionsList: - connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_OutsideEast_MapConnections: - .4byte 1 - .4byte BattleFrontier_OutsideEast_MapConnectionsList - diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc deleted file mode 100644 index b5ee58e49..000000000 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ /dev/null @@ -1,57 +0,0 @@ -BattleFrontier_OutsideEast_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 - object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 54, 16, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 37, 32, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0 - object_event 6, EVENT_OBJ_GFX_COOK, 0, 41, 56, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 46, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 34, 41, 0, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0 - object_event 9, EVENT_OBJ_GFX_RICH_BOY, 0, 45, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 59, 35, 0, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0 - object_event 11, EVENT_OBJ_GFX_TWIN, 0, 18, 40, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0 - object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 17, 40, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0 - object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 40, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0 - object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 54, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 42, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0 - object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 51, 53, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 62, 18, 0, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 2, 6, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0 - object_event 18, EVENT_OBJ_GFX_MAN_3, 0, 11, 21, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 21, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 33, 14, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 54, 31, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 54, 32, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0 - object_event 24, EVENT_OBJ_GFX_OLD_WOMAN, 0, 58, 55, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 - object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 - -BattleFrontier_OutsideEast_MapWarps: - warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY - warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY - warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY - warp_def 58, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY - warp_def 35, 12, 3, 0, MAP_BATTLE_FRONTIER_RANKING_HALL - warp_def 4, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE1 - warp_def 10, 28, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER - warp_def 22, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE5 - warp_def 5, 8, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE6 - warp_def 65, 31, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE3 - warp_def 14, 51, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE8 - warp_def 21, 45, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE9 - warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F - -BattleFrontier_OutsideEast_MapBGEvents: - bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 - bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C - bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 - bg_event 62, 15, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C5E - bg_event 7, 29, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DD7 - bg_event 32, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242DCE - bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 - bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 - -BattleFrontier_OutsideEast_MapEvents:: - map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents - diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc deleted file mode 100644 index 72e10d0dd..000000000 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideEast: - .4byte BattleFrontier_OutsideEast_Layout - .4byte BattleFrontier_OutsideEast_MapEvents - .4byte BattleFrontier_OutsideEast_MapScripts - .4byte BattleFrontier_OutsideEast_MapConnections - .2byte MUS_B_FRONTIER - .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_OutsideEast/map.json b/data/maps/BattleFrontier_OutsideEast/map.json new file mode 100644 index 000000000..700c24aff --- /dev/null +++ b/data/maps/BattleFrontier_OutsideEast/map.json @@ -0,0 +1,529 @@ +{ + "id": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "name": "BattleFrontier_OutsideEast", + "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST", + "music": "MUS_B_FRONTIER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 20, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C67", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 42, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 53, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C79", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 54, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 37, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 41, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 46, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CBB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 34, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 45, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CB2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 59, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 6, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CC4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 18, + "y": 40, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CCD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 17, + "y": 40, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 40, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242C9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUDOWOODO", + "x": 54, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242CEA", + "flag": "FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 42, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D79", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 51, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 62, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 2, + "movement_range_y": 6, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 10, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242D9D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 16, + "y": 30, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DA6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 33, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DAF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 54, + "y": 31, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DB8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 54, + "y": 32, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DC3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 58, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DE9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 48, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242DE0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 14, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideEast_EventScript_242E08", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 14, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 29, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 56, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 58, + "y": 14, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 12, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 28, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 31, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 45, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 13, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C43" + }, + { + "type": "sign", + "x": 43, + "y": 56, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C4C" + }, + { + "type": "sign", + "x": 36, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C55" + }, + { + "type": "sign", + "x": 62, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242C5E" + }, + { + "type": "sign", + "x": 7, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242DD7" + }, + { + "type": "sign", + "x": 32, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_242DCE" + }, + { + "type": "sign", + "x": 4, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_271E73" + }, + { + "type": "sign", + "x": 5, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideEast_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc deleted file mode 100644 index 0755b3c44..000000000 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -BattleFrontier_OutsideWest_MapConnectionsList: - connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_OutsideWest_MapConnections: - .4byte 1 - .4byte BattleFrontier_OutsideWest_MapConnectionsList - diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc deleted file mode 100644 index 87c0db7aa..000000000 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -BattleFrontier_OutsideWest_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 20, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 27, 30, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 41, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0 - object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 28, 43, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0 - object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 20, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 13, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0 - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 14, 44, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0 - object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 23, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0 - object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 38, 27, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 45, 18, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 9, 47, 0, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0 - object_event 15, EVENT_OBJ_GFX_LASS, 0, 35, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0 - object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 11, 66, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 31, 31, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0 - object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 48, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0 - object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 38, 22, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 3, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 9, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0 - object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 12, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0 - object_event 22, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 10, 0, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0 - object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 - object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 - -BattleFrontier_OutsideWest_MapWarps: - warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY - warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY - warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY - warp_def 45, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE2 - warp_def 51, 51, 0, 0, MAP_BATTLE_FRONTIER_MART - warp_def 44, 5, 0, 0, MAP_BATTLE_FRONTIER_SCOTTS_HOUSE - warp_def 53, 44, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE4 - warp_def 5, 20, 0, 0, MAP_BATTLE_FRONTIER_LOUNGE7 - warp_def 26, 65, 0, 0, MAP_BATTLE_FRONTIER_RECEPTION_GATE - warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE - warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F - -BattleFrontier_OutsideWest_MapBGEvents: - bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 - bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 - bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB - bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A - bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A - -BattleFrontier_OutsideWest_MapEvents:: - map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents - diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc deleted file mode 100644 index 40f26c151..000000000 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_OutsideWest: - .4byte BattleFrontier_OutsideWest_Layout - .4byte BattleFrontier_OutsideWest_MapEvents - .4byte BattleFrontier_OutsideWest_MapScripts - .4byte BattleFrontier_OutsideWest_MapConnections - .2byte MUS_B_FRONTIER - .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_OutsideWest/map.json b/data/maps/BattleFrontier_OutsideWest/map.json new file mode 100644 index 000000000..43298e663 --- /dev/null +++ b/data/maps/BattleFrontier_OutsideWest/map.json @@ -0,0 +1,458 @@ +{ + "id": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "name": "BattleFrontier_OutsideWest", + "layout": "LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST", + "music": "MUS_B_FRONTIER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": 0, + "map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 26, + "y": 38, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D50F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 20, + "y": 70, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 19, + "y": 68, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D3F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 26, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 8, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D68B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 27, + "y": 30, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D52D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 33, + "y": 41, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D69D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 28, + "y": 43, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6A6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 17, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D679", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 13, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D536", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D53D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 23, + "y": 47, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D694", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 38, + "y": 27, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D5C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 45, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D635", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 9, + "y": 47, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D57F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 35, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D682", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 11, + "y": 66, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_249E19", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 31, + "y": 31, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D667", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 42, + "y": 48, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 38, + "y": 22, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 12, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 11, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 26, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_OutsideWest_EventScript_23D6EE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 42, + "y": 27, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 17, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 38, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2", + "dest_warp_id": 0 + }, + { + "x": 51, + "y": 51, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_MART", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 5, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 53, + "y": 44, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 20, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 65, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 61, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "dest_warp_id": 1 + }, + { + "x": 39, + "y": 55, + "elevation": 0, + "dest_map": "MAP_ARTISAN_CAVE_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4E2" + }, + { + "type": "sign", + "x": 45, + "y": 30, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4F4" + }, + { + "type": "sign", + "x": 16, + "y": 43, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_23D4EB" + }, + { + "type": "sign", + "x": 52, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + }, + { + "type": "sign", + "x": 53, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_OutsideWest_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc deleted file mode 100644 index 20bad9c6d..000000000 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 - object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 - -BattleFrontier_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F - -BattleFrontier_PokemonCenter_1F_MapEvents:: - map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc deleted file mode 100644 index 65445c2a1..000000000 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte BattleFrontier_PokemonCenter_1F_MapEvents - .4byte BattleFrontier_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/map.json b/data/maps/BattleFrontier_PokemonCenter_1F/map.json new file mode 100644 index 000000000..4a78ec120 --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "name": "BattleFrontier_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267908", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267916", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_26791F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267928", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_1F_EventScript_267931", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 12 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 12 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc deleted file mode 100644 index d2f3730e8..000000000 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -BattleFrontier_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -BattleFrontier_PokemonCenter_2F_MapEvents:: - map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc deleted file mode 100644 index fbd39cde9..000000000 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte BattleFrontier_PokemonCenter_2F_MapEvents - .4byte BattleFrontier_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/map.json b/data/maps/BattleFrontier_PokemonCenter_2F/map.json new file mode 100644 index 000000000..1f3babd48 --- /dev/null +++ b/data/maps/BattleFrontier_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", + "name": "BattleFrontier_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc deleted file mode 100644 index 30a0e5ebb..000000000 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -BattleFrontier_RankingHall_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 - -BattleFrontier_RankingHall_MapWarps: - warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST - -BattleFrontier_RankingHall_MapBGEvents: - bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA - bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 - bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 - bg_event 29, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4CE - bg_event 42, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4DA - bg_event 46, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4E6 - bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4F2 - bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4FE - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E50A - bg_event 44, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E516 - bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 - bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 - -BattleFrontier_RankingHall_MapEvents:: - map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents - diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc deleted file mode 100644 index 0f001d563..000000000 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_RankingHall: - .4byte BattleFrontier_RankingHall_Layout - .4byte BattleFrontier_RankingHall_MapEvents - .4byte BattleFrontier_RankingHall_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_BATTLE_FRONTIER_RANKING_HALL - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_RankingHall/map.json b/data/maps/BattleFrontier_RankingHall/map.json new file mode 100644 index 000000000..64fa727d7 --- /dev/null +++ b/data/maps/BattleFrontier_RankingHall/map.json @@ -0,0 +1,172 @@ +{ + "id": "MAP_BATTLE_FRONTIER_RANKING_HALL", + "name": "BattleFrontier_RankingHall", + "layout": "LAYOUT_BATTLE_FRONTIER_RANKING_HALL", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E52F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 4, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E54A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 44, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_RankingHall_EventScript_25E573", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 26, + "y": 14, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 4 + }, + { + "x": 27, + "y": 14, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 26, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4AA" + }, + { + "type": "sign", + "x": 23, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4B6" + }, + { + "type": "sign", + "x": 26, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4C2" + }, + { + "type": "sign", + "x": 29, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4CE" + }, + { + "type": "sign", + "x": 42, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4DA" + }, + { + "type": "sign", + "x": 46, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4E6" + }, + { + "type": "sign", + "x": 10, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4F2" + }, + { + "type": "sign", + "x": 8, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E4FE" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E50A" + }, + { + "type": "sign", + "x": 44, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "BattleFrontier_RankingHall_EventScript_25E516" + }, + { + "type": "sign", + "x": 16, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_RankingHall_EventScript_25E538" + }, + { + "type": "sign", + "x": 36, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "BattleFrontier_RankingHall_EventScript_25E541" + } + ] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc deleted file mode 100644 index c1e55ad87..000000000 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -BattleFrontier_ReceptionGate_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 - object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 - -BattleFrontier_ReceptionGate_MapWarps: - warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_ReceptionGate_MapEvents:: - map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc deleted file mode 100644 index 46a55a6b1..000000000 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ReceptionGate: - .4byte BattleFrontier_ReceptionGate_Layout - .4byte BattleFrontier_ReceptionGate_MapEvents - .4byte BattleFrontier_ReceptionGate_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_ReceptionGate/map.json b/data/maps/BattleFrontier_ReceptionGate/map.json new file mode 100644 index 000000000..ffde653f7 --- /dev/null +++ b/data/maps/BattleFrontier_ReceptionGate/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", + "name": "BattleFrontier_ReceptionGate", + "layout": "LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_2662FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 8, + "y": 11, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_266310", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_266436", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ReceptionGate_EventScript_2664F4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 13, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc deleted file mode 100644 index acb02c4d8..000000000 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleFrontier_ScottsHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 - -BattleFrontier_ScottsHouse_MapWarps: - warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST - -BattleFrontier_ScottsHouse_MapEvents:: - map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc deleted file mode 100644 index ff41a82e3..000000000 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleFrontier_ScottsHouse: - .4byte BattleFrontier_ScottsHouse_Layout - .4byte BattleFrontier_ScottsHouse_MapEvents - .4byte BattleFrontier_ScottsHouse_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE - .byte MAPSEC_BATTLE_FRONTIER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BattleFrontier_ScottsHouse/map.json b/data/maps/BattleFrontier_ScottsHouse/map.json new file mode 100644 index 000000000..aa6003a86 --- /dev/null +++ b/data/maps/BattleFrontier_ScottsHouse/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", + "name": "BattleFrontier_ScottsHouse", + "layout": "LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_BATTLE_FRONTIER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_ScottsHouse_EventScript_2636A8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 5 + }, + { + "x": 3, + "y": 7, + "elevation": 3, + "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc deleted file mode 100644 index bcc81b36c..000000000 --- a/data/maps/BattlePyramidSquare01/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare01_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 6, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare01_MapEvents:: - map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc deleted file mode 100644 index e63919e43..000000000 --- a/data/maps/BattlePyramidSquare01/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare01: - .4byte BattlePyramidSquare01_Layout - .4byte BattlePyramidSquare01_MapEvents - .4byte BattlePyramidSquare01_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE01 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare01/map.json b/data/maps/BattlePyramidSquare01/map.json new file mode 100644 index 000000000..38320ece6 --- /dev/null +++ b/data/maps/BattlePyramidSquare01/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE01", + "name": "BattlePyramidSquare01", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc deleted file mode 100644 index 978c55982..000000000 --- a/data/maps/BattlePyramidSquare02/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare02_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare02_MapEvents:: - map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc deleted file mode 100644 index 61a1272cf..000000000 --- a/data/maps/BattlePyramidSquare02/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare02: - .4byte BattlePyramidSquare02_Layout - .4byte BattlePyramidSquare02_MapEvents - .4byte BattlePyramidSquare02_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE02 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare02/map.json b/data/maps/BattlePyramidSquare02/map.json new file mode 100644 index 000000000..0dc6f713a --- /dev/null +++ b/data/maps/BattlePyramidSquare02/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE02", + "name": "BattlePyramidSquare02", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 5, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 5, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc deleted file mode 100644 index 339010e8a..000000000 --- a/data/maps/BattlePyramidSquare03/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare03_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare03_MapEvents:: - map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc deleted file mode 100644 index ef7663ed0..000000000 --- a/data/maps/BattlePyramidSquare03/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare03: - .4byte BattlePyramidSquare03_Layout - .4byte BattlePyramidSquare03_MapEvents - .4byte BattlePyramidSquare03_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE03 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare03/map.json b/data/maps/BattlePyramidSquare03/map.json new file mode 100644 index 000000000..4e446e24b --- /dev/null +++ b/data/maps/BattlePyramidSquare03/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE03", + "name": "BattlePyramidSquare03", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 6, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 3, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc deleted file mode 100644 index 4c4cf7df1..000000000 --- a/data/maps/BattlePyramidSquare04/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare04_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare04_MapEvents:: - map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc deleted file mode 100644 index 7525f2b04..000000000 --- a/data/maps/BattlePyramidSquare04/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare04: - .4byte BattlePyramidSquare04_Layout - .4byte BattlePyramidSquare04_MapEvents - .4byte BattlePyramidSquare04_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE04 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare04/map.json b/data/maps/BattlePyramidSquare04/map.json new file mode 100644 index 000000000..67dfdaa11 --- /dev/null +++ b/data/maps/BattlePyramidSquare04/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE04", + "name": "BattlePyramidSquare04", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 1, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc deleted file mode 100644 index fe794509b..000000000 --- a/data/maps/BattlePyramidSquare05/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare05_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare05_MapEvents:: - map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc deleted file mode 100644 index 673d29e25..000000000 --- a/data/maps/BattlePyramidSquare05/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare05: - .4byte BattlePyramidSquare05_Layout - .4byte BattlePyramidSquare05_MapEvents - .4byte BattlePyramidSquare05_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE05 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare05/map.json b/data/maps/BattlePyramidSquare05/map.json new file mode 100644 index 000000000..ac8bd5d7d --- /dev/null +++ b/data/maps/BattlePyramidSquare05/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE05", + "name": "BattlePyramidSquare05", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 3, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 3, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc deleted file mode 100644 index a7a1776e7..000000000 --- a/data/maps/BattlePyramidSquare06/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare06_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare06_MapEvents:: - map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc deleted file mode 100644 index 2487c4a94..000000000 --- a/data/maps/BattlePyramidSquare06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare06: - .4byte BattlePyramidSquare06_Layout - .4byte BattlePyramidSquare06_MapEvents - .4byte BattlePyramidSquare06_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare06/map.json b/data/maps/BattlePyramidSquare06/map.json new file mode 100644 index 000000000..d9fa40ccd --- /dev/null +++ b/data/maps/BattlePyramidSquare06/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE06", + "name": "BattlePyramidSquare06", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 5, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc deleted file mode 100644 index 85e987626..000000000 --- a/data/maps/BattlePyramidSquare07/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare07_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare07_MapEvents:: - map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc deleted file mode 100644 index aa31ddcb0..000000000 --- a/data/maps/BattlePyramidSquare07/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare07: - .4byte BattlePyramidSquare07_Layout - .4byte BattlePyramidSquare07_MapEvents - .4byte BattlePyramidSquare07_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE07 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare07/map.json b/data/maps/BattlePyramidSquare07/map.json new file mode 100644 index 000000000..a097f60ba --- /dev/null +++ b/data/maps/BattlePyramidSquare07/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE07", + "name": "BattlePyramidSquare07", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 0, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 4, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 4, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc deleted file mode 100644 index dac62da21..000000000 --- a/data/maps/BattlePyramidSquare08/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare08_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 2, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare08_MapEvents:: - map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc deleted file mode 100644 index f579f958b..000000000 --- a/data/maps/BattlePyramidSquare08/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare08: - .4byte BattlePyramidSquare08_Layout - .4byte BattlePyramidSquare08_MapEvents - .4byte BattlePyramidSquare08_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE08 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare08/map.json b/data/maps/BattlePyramidSquare08/map.json new file mode 100644 index 000000000..6939b8a7e --- /dev/null +++ b/data/maps/BattlePyramidSquare08/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE08", + "name": "BattlePyramidSquare08", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc deleted file mode 100644 index 17a4a1e38..000000000 --- a/data/maps/BattlePyramidSquare09/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare09_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare09_MapEvents:: - map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc deleted file mode 100644 index 6dac1b9fe..000000000 --- a/data/maps/BattlePyramidSquare09/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare09: - .4byte BattlePyramidSquare09_Layout - .4byte BattlePyramidSquare09_MapEvents - .4byte BattlePyramidSquare09_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE09 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare09/map.json b/data/maps/BattlePyramidSquare09/map.json new file mode 100644 index 000000000..56380e991 --- /dev/null +++ b/data/maps/BattlePyramidSquare09/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE09", + "name": "BattlePyramidSquare09", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 3, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc deleted file mode 100644 index f172155f9..000000000 --- a/data/maps/BattlePyramidSquare10/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare10_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare10_MapEvents:: - map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc deleted file mode 100644 index ac899c718..000000000 --- a/data/maps/BattlePyramidSquare10/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare10: - .4byte BattlePyramidSquare10_Layout - .4byte BattlePyramidSquare10_MapEvents - .4byte BattlePyramidSquare10_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE10 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare10/map.json b/data/maps/BattlePyramidSquare10/map.json new file mode 100644 index 000000000..33534391b --- /dev/null +++ b/data/maps/BattlePyramidSquare10/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE10", + "name": "BattlePyramidSquare10", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc deleted file mode 100644 index 60c5e0e2d..000000000 --- a/data/maps/BattlePyramidSquare11/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare11_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare11_MapEvents:: - map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc deleted file mode 100644 index ca560a4a7..000000000 --- a/data/maps/BattlePyramidSquare11/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare11: - .4byte BattlePyramidSquare11_Layout - .4byte BattlePyramidSquare11_MapEvents - .4byte BattlePyramidSquare11_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE11 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare11/map.json b/data/maps/BattlePyramidSquare11/map.json new file mode 100644 index 000000000..f22855aa2 --- /dev/null +++ b/data/maps/BattlePyramidSquare11/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE11", + "name": "BattlePyramidSquare11", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc deleted file mode 100644 index 7c650b972..000000000 --- a/data/maps/BattlePyramidSquare12/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare12_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 3, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare12_MapEvents:: - map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc deleted file mode 100644 index 59793abe7..000000000 --- a/data/maps/BattlePyramidSquare12/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare12: - .4byte BattlePyramidSquare12_Layout - .4byte BattlePyramidSquare12_MapEvents - .4byte BattlePyramidSquare12_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE12 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare12/map.json b/data/maps/BattlePyramidSquare12/map.json new file mode 100644 index 000000000..d8e0d45a9 --- /dev/null +++ b/data/maps/BattlePyramidSquare12/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE12", + "name": "BattlePyramidSquare12", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 3, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc deleted file mode 100644 index 90d427f2d..000000000 --- a/data/maps/BattlePyramidSquare13/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare13_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare13_MapEvents:: - map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc deleted file mode 100644 index d0012926c..000000000 --- a/data/maps/BattlePyramidSquare13/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare13: - .4byte BattlePyramidSquare13_Layout - .4byte BattlePyramidSquare13_MapEvents - .4byte BattlePyramidSquare13_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE13 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare13/map.json b/data/maps/BattlePyramidSquare13/map.json new file mode 100644 index 000000000..880178e0e --- /dev/null +++ b/data/maps/BattlePyramidSquare13/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE13", + "name": "BattlePyramidSquare13", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc deleted file mode 100644 index 80f28a83a..000000000 --- a/data/maps/BattlePyramidSquare14/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare14_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare14_MapEvents:: - map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc deleted file mode 100644 index 049d9ec94..000000000 --- a/data/maps/BattlePyramidSquare14/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare14: - .4byte BattlePyramidSquare14_Layout - .4byte BattlePyramidSquare14_MapEvents - .4byte BattlePyramidSquare14_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE14 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare14/map.json b/data/maps/BattlePyramidSquare14/map.json new file mode 100644 index 000000000..423346532 --- /dev/null +++ b/data/maps/BattlePyramidSquare14/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE14", + "name": "BattlePyramidSquare14", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc deleted file mode 100644 index 3781ec3db..000000000 --- a/data/maps/BattlePyramidSquare15/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare15_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare15_MapEvents:: - map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc deleted file mode 100644 index 980402c21..000000000 --- a/data/maps/BattlePyramidSquare15/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare15: - .4byte BattlePyramidSquare15_Layout - .4byte BattlePyramidSquare15_MapEvents - .4byte BattlePyramidSquare15_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE15 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare15/map.json b/data/maps/BattlePyramidSquare15/map.json new file mode 100644 index 000000000..12b1f4cb8 --- /dev/null +++ b/data/maps/BattlePyramidSquare15/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE15", + "name": "BattlePyramidSquare15", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 1, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc deleted file mode 100644 index 973d7c0ef..000000000 --- a/data/maps/BattlePyramidSquare16/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -BattlePyramidSquare16_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 - -BattlePyramidSquare16_MapEvents:: - map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc deleted file mode 100644 index b51e9692c..000000000 --- a/data/maps/BattlePyramidSquare16/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattlePyramidSquare16: - .4byte BattlePyramidSquare16_Layout - .4byte BattlePyramidSquare16_MapEvents - .4byte BattlePyramidSquare16_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/BattlePyramidSquare16/map.json b/data/maps/BattlePyramidSquare16/map.json new file mode 100644 index 000000000..65fa0a361 --- /dev/null +++ b/data/maps/BattlePyramidSquare16/map.json @@ -0,0 +1,112 @@ +{ + "id": "MAP_BATTLE_PYRAMID_SQUARE16", + "name": "BattlePyramidSquare16", + "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16", + "music": "65535", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 0, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 2, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc deleted file mode 100644 index daf780f73..000000000 --- a/data/maps/BirthIsland_Exterior/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BirthIsland_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE - object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS - -BirthIsland_Exterior_MapWarps: - warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR - -BirthIsland_Exterior_MapEvents:: - map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc deleted file mode 100644 index 71af6d880..000000000 --- a/data/maps/BirthIsland_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Exterior: - .4byte BirthIsland_Exterior_Layout - .4byte BirthIsland_Exterior_MapEvents - .4byte BirthIsland_Exterior_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_BIRTH_ISLAND_EXTERIOR - .byte MAPSEC_BIRTH_ISLAND_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BirthIsland_Exterior/map.json b/data/maps/BirthIsland_Exterior/map.json new file mode 100644 index 000000000..43ffc5d44 --- /dev/null +++ b/data/maps/BirthIsland_Exterior/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_BIRTH_ISLAND_EXTERIOR", + "name": "BirthIsland_Exterior", + "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR", + "music": "65535", + "region_map_section": "MAPSEC_BIRTH_ISLAND_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEOXYS_TRIANGLE", + "x": 15, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Exterior_EventScript_267F83", + "flag": "FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEOXYS", + "x": 15, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_DEOXYS" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 0, + "dest_map": "MAP_BIRTH_ISLAND_HARBOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc deleted file mode 100644 index 1cbef2874..000000000 --- a/data/maps/BirthIsland_Harbor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -BirthIsland_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -BirthIsland_Harbor_MapWarps: - warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR - -BirthIsland_Harbor_MapEvents:: - map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc deleted file mode 100644 index e3b3d53b2..000000000 --- a/data/maps/BirthIsland_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -BirthIsland_Harbor: - .4byte IslandHarbor_Layout - .4byte BirthIsland_Harbor_MapEvents - .4byte BirthIsland_Harbor_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_ISLAND_HARBOR - .byte MAPSEC_BIRTH_ISLAND_2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/BirthIsland_Harbor/map.json b/data/maps/BirthIsland_Harbor/map.json new file mode 100644 index 000000000..f55cf8e93 --- /dev/null +++ b/data/maps/BirthIsland_Harbor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_BIRTH_ISLAND_HARBOR", + "name": "BirthIsland_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "65535", + "region_map_section": "MAPSEC_BIRTH_ISLAND_2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "BirthIsland_Harbor_EventScript_26805D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc deleted file mode 100644 index 098938279..000000000 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_1F_MapWarps: - warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_1F_MapEvents:: - map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc deleted file mode 100644 index df0e323d0..000000000 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_1F: - .4byte CaveOfOrigin_1F_Layout - .4byte CaveOfOrigin_1F_MapEvents - .4byte CaveOfOrigin_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_1F - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json new file mode 100644 index 000000000..989b1cf30 --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_1F", + "name": "CaveOfOrigin_1F", + "layout": "LAYOUT_CAVE_OF_ORIGIN_1F", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 17, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc deleted file mode 100644 index 0028301c9..000000000 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -CaveOfOrigin_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE - -CaveOfOrigin_B1F_MapWarps: - warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_B1F_MapEvents:: - map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc deleted file mode 100644 index 200c90bfd..000000000 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_B1F: - .4byte CaveOfOrigin_B1F_Layout - .4byte CaveOfOrigin_B1F_MapEvents - .4byte CaveOfOrigin_B1F_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_CAVE_OF_ORIGIN_B1F - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json new file mode 100644 index 000000000..f8c584845 --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_B1F", + "name": "CaveOfOrigin_B1F", + "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F", + "music": "65535", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 9, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "CaveOfOrigin_B1F_EventScript_2357A9", + "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE" + } + ], + "warp_events": [ + { + "x": 9, + "y": 3, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc deleted file mode 100644 index 235e4afa0..000000000 --- a/data/maps/CaveOfOrigin_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_Entrance_MapWarps: - warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY - warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_Entrance_MapEvents:: - map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc deleted file mode 100644 index afbbd0312..000000000 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_Entrance: - .4byte CaveOfOrigin_Entrance_Layout - .4byte CaveOfOrigin_Entrance_MapEvents - .4byte CaveOfOrigin_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_ENTRANCE - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json new file mode 100644 index 000000000..07c7af816 --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "name": "CaveOfOrigin_Entrance", + "layout": "LAYOUT_CAVE_OF_ORIGIN_ENTRANCE", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 20, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 3 + }, + { + "x": 9, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc deleted file mode 100644 index eeb07e63a..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: - warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - -CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc deleted file mode 100644 index e0fea7bd5..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap1: - .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json new file mode 100644 index 000000000..e131e4f0c --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "name": "CaveOfOrigin_UnusedRubySapphireMap1", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 11, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc deleted file mode 100644 index 1a8e841b7..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: - warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 - warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 - -CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc deleted file mode 100644 index e8e7c0c79..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap2: - .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json new file mode 100644 index 000000000..8b83029e3 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "name": "CaveOfOrigin_UnusedRubySapphireMap2", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc deleted file mode 100644 index e1cacec43..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 - warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: - map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc deleted file mode 100644 index ec55cb0ff..000000000 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -CaveOfOrigin_UnusedRubySapphireMap3: - .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents - .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 - .byte MAPSEC_CAVE_OF_ORIGIN - .byte 1 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json new file mode 100644 index 000000000..2b7c6db19 --- /dev/null +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "name": "CaveOfOrigin_UnusedRubySapphireMap3", + "layout": "LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_CAVE_OF_ORIGIN", + "requires_flash": true, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 6, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc deleted file mode 100644 index 88dad2c28..000000000 --- a/data/maps/DesertRuins/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -DesertRuins_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK - -DesertRuins_MapWarps: - warp_def 8, 29, 3, 1, MAP_ROUTE111 - warp_def 8, 20, 0, 2, MAP_DESERT_RUINS - warp_def 8, 11, 3, 1, MAP_DESERT_RUINS - -DesertRuins_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 - -DesertRuins_MapEvents:: - map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents - diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc deleted file mode 100644 index f0af5f2e0..000000000 --- a/data/maps/DesertRuins/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins: - .4byte DesertRuins_Layout - .4byte DesertRuins_MapEvents - .4byte DesertRuins_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_DESERT_RUINS - .byte MAPSEC_DESERT_RUINS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json new file mode 100644 index 000000000..439611a39 --- /dev/null +++ b/data/maps/DesertRuins/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_DESERT_RUINS", + "name": "DesertRuins", + "layout": "LAYOUT_DESERT_RUINS", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_DESERT_RUINS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DesertRuins_EventScript_22DA02", + "flag": "FLAG_HIDE_REGIROCK" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9DB" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9F8" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DesertRuins_EventScript_22D9F8" + } + ] +} \ No newline at end of file diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc deleted file mode 100644 index 25497be27..000000000 --- a/data/maps/DesertUnderpass/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -DesertUnderpass_EventObjects: - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - -DesertUnderpass_MapWarps: - warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL - -DesertUnderpass_MapEvents:: - map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc deleted file mode 100644 index ca7ab5254..000000000 --- a/data/maps/DesertUnderpass/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertUnderpass: - .4byte DesertUnderpass_Layout - .4byte DesertUnderpass_MapEvents - .4byte DesertUnderpass_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_DESERT_UNDERPASS - .byte MAPSEC_DESERT_UNDERPASS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DesertUnderpass/map.json b/data/maps/DesertUnderpass/map.json new file mode 100644 index 000000000..3a16f2c5d --- /dev/null +++ b/data/maps/DesertUnderpass/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_DESERT_UNDERPASS", + "name": "DesertUnderpass", + "layout": "LAYOUT_DESERT_UNDERPASS", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_DESERT_UNDERPASS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 132, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DesertUnderpass_EventScript_23AF41", + "flag": "FLAG_HIDE_DESERT_UNDERPASS_FOSSIL" + } + ], + "warp_events": [ + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc deleted file mode 100644 index 294bf9956..000000000 --- a/data/maps/DewfordTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -DewfordTown_MapConnectionsList: - connection up, -60, MAP_ROUTE106 - connection right, 0, MAP_ROUTE107 - -DewfordTown_MapConnections: - .4byte 2 - .4byte DewfordTown_MapConnectionsList - diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc deleted file mode 100644 index 0b9036029..000000000 --- a/data/maps/DewfordTown/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -DewfordTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 - -DewfordTown_MapWarps: - warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL - warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM - warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 - warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 - -DewfordTown_MapBGEvents: - bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA - bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 - bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 - bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 - bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC - -DewfordTown_MapEvents:: - map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents - diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc deleted file mode 100644 index 03c5b689b..000000000 --- a/data/maps/DewfordTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown: - .4byte DewfordTown_Layout - .4byte DewfordTown_MapEvents - .4byte DewfordTown_MapScripts - .4byte DewfordTown_MapConnections - .2byte MUS_HIGHTOWN - .2byte LAYOUT_DEWFORD_TOWN - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json new file mode 100644 index 000000000..64e70fe7f --- /dev/null +++ b/data/maps/DewfordTown/map.json @@ -0,0 +1,174 @@ +{ + "id": "MAP_DEWFORD_TOWN", + "name": "DewfordTown", + "layout": "LAYOUT_DEWFORD_TOWN", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE106" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE107" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E95B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_EventScript_1E9511", + "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E95D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 8, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_EventScript_1E9922", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HALL", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 10, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 17, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_GYM", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 14, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95BA" + }, + { + "type": "sign", + "x": 11, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95C3" + }, + { + "type": "sign", + "x": 4, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 3, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 2, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_EventScript_1E95CC" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc deleted file mode 100644 index c3b718f19..000000000 --- a/data/maps/DewfordTown_Gym/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -DewfordTown_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 8, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 - object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 - -DewfordTown_Gym_MapWarps: - warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN - warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN - -DewfordTown_Gym_MapBGEvents: - bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 - bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 - bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 - -DewfordTown_Gym_MapEvents:: - map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents - diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc deleted file mode 100644 index 72b93573b..000000000 --- a/data/maps/DewfordTown_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Gym: - .4byte DewfordTown_Gym_Layout - .4byte DewfordTown_Gym_MapEvents - .4byte DewfordTown_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_DEWFORD_TOWN_GYM - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json new file mode 100644 index 000000000..e42e4ffe8 --- /dev/null +++ b/data/maps/DewfordTown_Gym/map.json @@ -0,0 +1,173 @@ +{ + "id": "MAP_DEWFORD_TOWN_GYM", + "name": "DewfordTown_Gym", + "layout": "LAYOUT_DEWFORD_TOWN_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "x": 4, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Gym_EventScript_1FC7C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 18, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC8B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC8D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "DewfordTown_Gym_EventScript_1FC8FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 5, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Gym_EventScript_1FC983", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 7, + "y": 8, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC93F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 16, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "DewfordTown_Gym_EventScript_1FC961", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 14, + "y": 12, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "DewfordTown_Gym_EventScript_1FC91D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 27, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 27, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9A2" + }, + { + "type": "sign", + "x": 7, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9B2" + }, + { + "type": "sign", + "x": 4, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9A2" + }, + { + "type": "sign", + "x": 7, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "DewfordTown_Gym_EventScript_1FC9B2" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc deleted file mode 100644 index 7fc332f90..000000000 --- a/data/maps/DewfordTown_Hall/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -DewfordTown_Hall_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0 - object_event 5, EVENT_OBJ_GFX_TWIN, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN - -DewfordTown_Hall_MapWarps: - warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN - warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN - -DewfordTown_Hall_MapBGEvents: - bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 - bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 - -DewfordTown_Hall_MapEvents:: - map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents - diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc deleted file mode 100644 index 4fc39cf21..000000000 --- a/data/maps/DewfordTown_Hall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_Hall: - .4byte DewfordTown_Hall_Layout - .4byte DewfordTown_Hall_MapEvents - .4byte DewfordTown_Hall_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_DEWFORD_TOWN_HALL - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json new file mode 100644 index 000000000..f6a8dac7b --- /dev/null +++ b/data/maps/DewfordTown_Hall/map.json @@ -0,0 +1,170 @@ +{ + "id": "MAP_DEWFORD_TOWN_HALL", + "name": "DewfordTown_Hall", + "layout": "LAYOUT_DEWFORD_TOWN_HALL", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD4D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD4F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD50A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD547", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD563", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 14, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD57F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD62F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD63B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_Hall_EventScript_1FD7DA", + "flag": "FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_Hall_EventScript_1FD590" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "DewfordTown_Hall_EventScript_1FD5A0" + } + ] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc deleted file mode 100644 index a9c8b0ae5..000000000 --- a/data/maps/DewfordTown_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -DewfordTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 - -DewfordTown_House1_MapWarps: - warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN - warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN - -DewfordTown_House1_MapEvents:: - map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc deleted file mode 100644 index 9f4eec032..000000000 --- a/data/maps/DewfordTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_House1: - .4byte House3_Layout - .4byte DewfordTown_House1_MapEvents - .4byte DewfordTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json new file mode 100644 index 000000000..fbc3e02ed --- /dev/null +++ b/data/maps/DewfordTown_House1/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_DEWFORD_TOWN_HOUSE1", + "name": "DewfordTown_House1", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House1_EventScript_1FC3E0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc deleted file mode 100644 index 9f3801afa..000000000 --- a/data/maps/DewfordTown_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -DewfordTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 - -DewfordTown_House2_MapWarps: - warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN - warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN - -DewfordTown_House2_MapEvents:: - map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc deleted file mode 100644 index ec8359b68..000000000 --- a/data/maps/DewfordTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_House2: - .4byte House4_Layout - .4byte DewfordTown_House2_MapEvents - .4byte DewfordTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_HOUSE4 - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json new file mode 100644 index 000000000..742fde706 --- /dev/null +++ b/data/maps/DewfordTown_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_DEWFORD_TOWN_HOUSE2", + "name": "DewfordTown_House2", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House2_EventScript_1FE22E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_House2_EventScript_1FE271", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 86c42ffab..000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -DewfordTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 - -DewfordTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN - warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN - warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F - -DewfordTown_PokemonCenter_1F_MapEvents:: - map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc deleted file mode 100644 index b6aa6f791..000000000 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte DewfordTown_PokemonCenter_1F_MapEvents - .4byte DewfordTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..137b9f5e9 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "name": "DewfordTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC537", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC545", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_1F_EventScript_1FC54E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_DEWFORD_TOWN", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc deleted file mode 100644 index eccedade4..000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -DewfordTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -DewfordTown_PokemonCenter_2F_MapEvents:: - map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 8bb0d81d7..000000000 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DewfordTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte DewfordTown_PokemonCenter_2F_MapEvents - .4byte DewfordTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_DEWFORD_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..e4f298d73 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", + "name": "DewfordTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_DEWFORD_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "DewfordTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc deleted file mode 100644 index 4ea0b7f61..000000000 --- a/data/maps/DoubleBattleColosseum/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum_MapWarps: - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - warp_def 8, 8, 3, 127, MAP_NONE - -DoubleBattleColosseum_MapCoordEvents: - coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 - coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE - coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 - coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 - -DoubleBattleColosseum_MapEvents:: - map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc deleted file mode 100644 index df679a918..000000000 --- a/data/maps/DoubleBattleColosseum/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -DoubleBattleColosseum: - .4byte DoubleBattleColosseum_Layout - .4byte DoubleBattleColosseum_MapEvents - .4byte DoubleBattleColosseum_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_DOUBLE_BATTLE_COLOSSEUM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json new file mode 100644 index 000000000..c0cd88761 --- /dev/null +++ b/data/maps/DoubleBattleColosseum/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", + "name": "DoubleBattleColosseum", + "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277388" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773BE" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773A3" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773D9" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc deleted file mode 100644 index 78c3ba8d1..000000000 --- a/data/maps/EverGrandeCity/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_MapConnectionsList: - connection left, 40, MAP_ROUTE128 - -EverGrandeCity_MapConnections: - .4byte 1 - .4byte EverGrandeCity_MapConnectionsList - diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc deleted file mode 100644 index 9c0cd79ef..000000000 --- a/data/maps/EverGrandeCity/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -EverGrandeCity_MapWarps: - warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F - warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F - -EverGrandeCity_MapCoordEvents: - coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 - -EverGrandeCity_MapBGEvents: - bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B - bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 - bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 - bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D - bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 - -EverGrandeCity_MapEvents:: - map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents - diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc deleted file mode 100644 index 735094578..000000000 --- a/data/maps/EverGrandeCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity: - .4byte EverGrandeCity_Layout - .4byte EverGrandeCity_MapEvents - .4byte EverGrandeCity_MapScripts - .4byte EverGrandeCity_MapConnections - .2byte MUS_RAINBOW - .2byte LAYOUT_EVER_GRANDE_CITY - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json new file mode 100644 index 000000000..4812461f7 --- /dev/null +++ b/data/maps/EverGrandeCity/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_EVER_GRANDE_CITY", + "name": "EverGrandeCity", + "layout": "LAYOUT_EVER_GRANDE_CITY", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 5, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 48, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 41, + "elevation": 0, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 27, + "elevation": 0, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 16, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 18, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 19, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 20, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 21, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 22, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 23, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 24, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 25, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + }, + { + "type": "trigger", + "x": 26, + "y": 58, + "elevation": 1, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "EverGrandeCity_EventScript_1E7D46" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 43, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D2B" + }, + { + "type": "sign", + "x": 29, + "y": 48, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EverGrandeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 18, + "y": 52, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D34" + }, + { + "type": "sign", + "x": 23, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EverGrandeCity_EventScript_1E7D3D" + }, + { + "type": "sign", + "x": 28, + "y": 48, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EverGrandeCity_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc deleted file mode 100644 index 846e7f60e..000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_ChampionsRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH - -EverGrandeCity_ChampionsRoom_MapWarps: - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME - -EverGrandeCity_ChampionsRoom_MapEvents:: - map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc deleted file mode 100644 index 0b7334685..000000000 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_ChampionsRoom: - .4byte EverGrandeCity_ChampionsRoom_Layout - .4byte EverGrandeCity_ChampionsRoom_MapEvents - .4byte EverGrandeCity_ChampionsRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json new file mode 100644 index 000000000..0281bebc5 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "name": "EverGrandeCity_ChampionsRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_CHAMPIONS_ROOM_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_CHAMPIONS_ROOM_BIRCH" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL4", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc deleted file mode 100644 index 997df5045..000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_DrakesRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 - -EverGrandeCity_DrakesRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4 - -EverGrandeCity_DrakesRoom_MapEvents:: - map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc deleted file mode 100644 index 3c5b52b21..000000000 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_DrakesRoom: - .4byte EverGrandeCity_DrakesRoom_Layout - .4byte EverGrandeCity_DrakesRoom_MapEvents - .4byte EverGrandeCity_DrakesRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_DRAKE - diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json new file mode 100644 index 000000000..92e1651e5 --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "name": "EverGrandeCity_DrakesRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_DRAKE", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_DrakesRoom_EventScript_2286F3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL3", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc deleted file mode 100644 index abe7b8564..000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_GlaciasRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 - -EverGrandeCity_GlaciasRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3 - -EverGrandeCity_GlaciasRoom_MapEvents:: - map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc deleted file mode 100644 index f330a321f..000000000 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_GlaciasRoom: - .4byte EverGrandeCity_GlaciasRoom_Layout - .4byte EverGrandeCity_GlaciasRoom_MapEvents - .4byte EverGrandeCity_GlaciasRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GLACIA - diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json new file mode 100644 index 000000000..774489415 --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "name": "EverGrandeCity_GlaciasRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GLACIA", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_GlaciasRoom_EventScript_228469", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL2", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc deleted file mode 100644 index fd3a5584d..000000000 --- a/data/maps/EverGrandeCity_Hall1/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall1_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - -EverGrandeCity_Hall1_MapEvents:: - map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc deleted file mode 100644 index 1e2f0f8eb..000000000 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall1: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall1_MapEvents - .4byte EverGrandeCity_Hall1_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall1/map.json b/data/maps/EverGrandeCity_Hall1/map.json new file mode 100644 index 000000000..1ebb9c925 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL1", + "name": "EverGrandeCity_Hall1", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc deleted file mode 100644 index e9b8ab056..000000000 --- a/data/maps/EverGrandeCity_Hall2/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall2_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM - -EverGrandeCity_Hall2_MapEvents:: - map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc deleted file mode 100644 index 242291542..000000000 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall2: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall2_MapEvents - .4byte EverGrandeCity_Hall2_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall2/map.json b/data/maps/EverGrandeCity_Hall2/map.json new file mode 100644 index 000000000..0631c14f0 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL2", + "name": "EverGrandeCity_Hall2", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc deleted file mode 100644 index 3e792fd1b..000000000 --- a/data/maps/EverGrandeCity_Hall3/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall3_MapWarps: - warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM - -EverGrandeCity_Hall3_MapEvents:: - map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc deleted file mode 100644 index fd0643345..000000000 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall3: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall3_MapEvents - .4byte EverGrandeCity_Hall3_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall3/map.json b/data/maps/EverGrandeCity_Hall3/map.json new file mode 100644 index 000000000..f181843bf --- /dev/null +++ b/data/maps/EverGrandeCity_Hall3/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL3", + "name": "EverGrandeCity_Hall3", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc deleted file mode 100644 index 3f4069896..000000000 --- a/data/maps/EverGrandeCity_Hall4/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -EverGrandeCity_Hall4_MapWarps: - warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_Hall4_MapEvents:: - map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc deleted file mode 100644 index b2a199823..000000000 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall4: - .4byte EverGrandeCity_Hall4_Layout - .4byte EverGrandeCity_Hall4_MapEvents - .4byte EverGrandeCity_Hall4_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_HALL4 - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall4/map.json b/data/maps/EverGrandeCity_Hall4/map.json new file mode 100644 index 000000000..b2c095e77 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall4/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL4", + "name": "EverGrandeCity_Hall4", + "layout": "LAYOUT_EVER_GRANDE_CITY_HALL4", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 33, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc deleted file mode 100644 index 655f4645e..000000000 --- a/data/maps/EverGrandeCity_Hall5/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_Hall5_MapWarps: - warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - -EverGrandeCity_Hall5_MapEvents:: - map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc deleted file mode 100644 index f15639e5b..000000000 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_Hall5: - .4byte EverGrandeCity_ShortHall_Layout - .4byte EverGrandeCity_Hall5_MapEvents - .4byte EverGrandeCity_Hall5_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_Hall5/map.json b/data/maps/EverGrandeCity_Hall5/map.json new file mode 100644 index 000000000..04597cf65 --- /dev/null +++ b/data/maps/EverGrandeCity_Hall5/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL5", + "name": "EverGrandeCity_Hall5", + "layout": "LAYOUT_EVER_GRANDE_CITY_SHORT_HALL", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc deleted file mode 100644 index 7d9198437..000000000 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_HallOfFame_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - -EverGrandeCity_HallOfFame_MapWarps: - warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_HallOfFame_MapEvents:: - map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc deleted file mode 100644 index 7879c19bf..000000000 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_HallOfFame: - .4byte EverGrandeCity_HallOfFame_Layout - .4byte EverGrandeCity_HallOfFame_MapEvents - .4byte EverGrandeCity_HallOfFame_MapScripts - .4byte 0x0 - .2byte MUS_EIKOU_R - .2byte LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json new file mode 100644 index 000000000..c7440cf98 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", + "name": "EverGrandeCity_HallOfFame", + "layout": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME", + "music": "MUS_EIKOU_R", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc deleted file mode 100644 index d6ad89bea..000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_PhoebesRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 - -EverGrandeCity_PhoebesRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2 - -EverGrandeCity_PhoebesRoom_MapEvents:: - map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc deleted file mode 100644 index 7869d6007..000000000 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PhoebesRoom: - .4byte EverGrandeCity_PhoebesRoom_Layout - .4byte EverGrandeCity_PhoebesRoom_MapEvents - .4byte EverGrandeCity_PhoebesRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_PHOEBE - diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json new file mode 100644 index 000000000..36bf11a13 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", + "name": "EverGrandeCity_PhoebesRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_PHOEBE", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PhoebesRoom_EventScript_2281CB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL1", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc deleted file mode 100644 index a879c3bf6..000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 - object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT - -EverGrandeCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY - warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY - warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F - -EverGrandeCity_PokemonCenter_1F_MapEvents:: - map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 060c11d0b..000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte EverGrandeCity_PokemonCenter_1F_MapEvents - .4byte EverGrandeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..7263f67cb --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "name": "EverGrandeCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A59", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A67", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_1F_EventScript_229A79", + "flag": "FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 550765922..000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -EverGrandeCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -EverGrandeCity_PokemonCenter_2F_MapEvents:: - map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc deleted file mode 100644 index ae70ad359..000000000 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte EverGrandeCity_PokemonCenter_2F_MapEvents - .4byte EverGrandeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..195197b56 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", + "name": "EverGrandeCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc deleted file mode 100644 index 524540d9d..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -EverGrandeCity_PokemonLeague_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 - -EverGrandeCity_PokemonLeague_1F_MapWarps: - warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY - warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY - warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 - warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 - warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F - -EverGrandeCity_PokemonLeague_1F_MapEvents:: - map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc deleted file mode 100644 index 497d81582..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_1F: - .4byte EverGrandeCity_PokemonLeague_1F_Layout - .4byte EverGrandeCity_PokemonLeague_1F_MapEvents - .4byte EverGrandeCity_PokemonLeague_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/map.json b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json new file mode 100644 index 000000000..5fe580001 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "name": "EverGrandeCity_PokemonLeague_1F", + "layout": "LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_2295FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_22960A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_1F_EventScript_229636", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 11, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 7, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc deleted file mode 100644 index 2f26346c8..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonLeague_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -EverGrandeCity_PokemonLeague_2F_MapWarps: - warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -EverGrandeCity_PokemonLeague_2F_MapEvents:: - map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc deleted file mode 100644 index c03c85120..000000000 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_PokemonLeague_2F: - .4byte PokemonCenter_2F_Layout - .4byte EverGrandeCity_PokemonLeague_2F_MapEvents - .4byte EverGrandeCity_PokemonLeague_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/map.json b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json new file mode 100644 index 000000000..43d777f35 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", + "name": "EverGrandeCity_PokemonLeague_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_PokemonLeague_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc deleted file mode 100644 index ca7f7278d..000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -EverGrandeCity_SidneysRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 - -EverGrandeCity_SidneysRoom_MapWarps: - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1 - -EverGrandeCity_SidneysRoom_MapEvents:: - map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc deleted file mode 100644 index e7d7f0812..000000000 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -EverGrandeCity_SidneysRoom: - .4byte EverGrandeCity_SidneysRoom_Layout - .4byte EverGrandeCity_SidneysRoom_MapEvents - .4byte EverGrandeCity_SidneysRoom_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM - .byte MAPSEC_EVER_GRANDE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_SIDNEY - diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json new file mode 100644 index 000000000..2eceb30ae --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "name": "EverGrandeCity_SidneysRoom", + "layout": "LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_EVER_GRANDE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_SIDNEY", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "EverGrandeCity_SidneysRoom_EventScript_227F64", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL5", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_EVER_GRANDE_CITY_HALL1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc deleted file mode 100644 index d5955c9e6..000000000 --- a/data/maps/FallarborTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FallarborTown_MapConnectionsList: - connection left, 0, MAP_ROUTE114 - connection right, 0, MAP_ROUTE113 - -FallarborTown_MapConnections: - .4byte 2 - .4byte FallarborTown_MapConnectionsList - diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc deleted file mode 100644 index b3c451595..000000000 --- a/data/maps/FallarborTown/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -FallarborTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL - -FallarborTown_MapWarps: - warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART - warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY - warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 - warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 - -FallarborTown_MapBGEvents: - bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A - bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 - bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 - bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 - bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB259 - bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 - bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET - -FallarborTown_MapEvents:: - map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents - diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc deleted file mode 100644 index 2e74cee38..000000000 --- a/data/maps/FallarborTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown: - .4byte FallarborTown_Layout - .4byte FallarborTown_MapEvents - .4byte FallarborTown_MapScripts - .4byte FallarborTown_MapConnections - .2byte MUS_TONEKUSA - .2byte LAYOUT_FALLARBOR_TOWN - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json new file mode 100644 index 000000000..e2519f880 --- /dev/null +++ b/data/maps/FallarborTown/map.json @@ -0,0 +1,185 @@ +{ + "id": "MAP_FALLARBOR_TOWN", + "name": "FallarborTown", + "layout": "LAYOUT_FALLARBOR_TOWN", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE114" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE113" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB22B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB20C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB234", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 8, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_EventScript_1EB23D", + "flag": "FLAG_HIDE_FALLARBOR_AZURILL" + } + ], + "warp_events": [ + { + "x": 15, + "y": 15, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 17, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 15, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB250" + }, + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 10, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB259" + }, + { + "type": "sign", + "x": 17, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FallarborTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_EventScript_1EB262" + }, + { + "type": "hidden_item", + "x": 2, + "y": 15, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc deleted file mode 100644 index d452752d7..000000000 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -FallarborTown_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - -FallarborTown_BattleTentBattleRoom_MapEvents:: - map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc deleted file mode 100644 index 615c0ed26..000000000 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentBattleRoom: - .4byte BattleTentBattleRoom_Layout - .4byte FallarborTown_BattleTentBattleRoom_MapEvents - .4byte FallarborTown_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/map.json b/data/maps/FallarborTown_BattleTentBattleRoom/map.json new file mode 100644 index 000000000..53a280196 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "FallarborTown_BattleTentBattleRoom", + "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc deleted file mode 100644 index 18c0dfb39..000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -FallarborTown_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -FallarborTown_BattleTentCorridor_MapEvents:: - map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc deleted file mode 100644 index fd64a3266..000000000 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte FallarborTown_BattleTentCorridor_MapEvents - .4byte FallarborTown_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentCorridor/map.json b/data/maps/FallarborTown_BattleTentCorridor/map.json new file mode 100644 index 000000000..51d69dc93 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR", + "name": "FallarborTown_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc deleted file mode 100644 index 2a9b758ca..000000000 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FallarborTown_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT - -FallarborTown_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN - warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN - -FallarborTown_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F - -FallarborTown_BattleTentLobby_MapEvents:: - map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents - diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc deleted file mode 100644 index 4bdba3d51..000000000 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte FallarborTown_BattleTentLobby_MapEvents - .4byte FallarborTown_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_BattleTentLobby/map.json b/data/maps/FallarborTown_BattleTentLobby/map.json new file mode 100644 index 000000000..5c36cf3d9 --- /dev/null +++ b/data/maps/FallarborTown_BattleTentLobby/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY", + "name": "FallarborTown_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200001", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_20020D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200216", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_20021F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_BattleTentLobby_EventScript_200228", + "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FallarborTown_BattleTentLobby_EventScript_20024F" + } + ] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc deleted file mode 100644 index 9db77af03..000000000 --- a/data/maps/FallarborTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FallarborTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 - -FallarborTown_House1_MapWarps: - warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN - warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN - -FallarborTown_House1_MapEvents:: - map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc deleted file mode 100644 index a17a5e0ab..000000000 --- a/data/maps/FallarborTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_House1: - .4byte House1_Layout - .4byte FallarborTown_House1_MapEvents - .4byte FallarborTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json new file mode 100644 index 000000000..fb66ad1de --- /dev/null +++ b/data/maps/FallarborTown_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FALLARBOR_TOWN_HOUSE1", + "name": "FallarborTown_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House1_EventScript_200F13", + "flag": "FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House1_EventScript_200FBC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc deleted file mode 100644 index 117322b02..000000000 --- a/data/maps/FallarborTown_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FallarborTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 - -FallarborTown_House2_MapWarps: - warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN - -FallarborTown_House2_MapEvents:: - map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc deleted file mode 100644 index bdbf10fed..000000000 --- a/data/maps/FallarborTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_House2: - .4byte House2_Layout - .4byte FallarborTown_House2_MapEvents - .4byte FallarborTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json new file mode 100644 index 000000000..2b5ea5214 --- /dev/null +++ b/data/maps/FallarborTown_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_FALLARBOR_TOWN_HOUSE2", + "name": "FallarborTown_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_House2_EventScript_201383", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc deleted file mode 100644 index b4870cf57..000000000 --- a/data/maps/FallarborTown_Mart/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 - -FallarborTown_Mart_MapWarps: - warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN - -FallarborTown_Mart_MapEvents:: - map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc deleted file mode 100644 index be4e4ae9e..000000000 --- a/data/maps/FallarborTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_Mart: - .4byte Mart_Layout - .4byte FallarborTown_Mart_MapEvents - .4byte FallarborTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json new file mode 100644 index 000000000..9416efe01 --- /dev/null +++ b/data/maps/FallarborTown_Mart/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_FALLARBOR_TOWN_MART", + "name": "FallarborTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFCFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_1FFD06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_Mart_EventScript_2C80B6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f091ffce1..000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE - -FallarborTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN - warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F - -FallarborTown_PokemonCenter_1F_MapEvents:: - map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc deleted file mode 100644 index a03b385b5..000000000 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FallarborTown_PokemonCenter_1F_MapEvents - .4byte FallarborTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..a432b8a1a --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "name": "FallarborTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200BF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_1F_EventScript_200C01", + "flag": "FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FALLARBOR_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc deleted file mode 100644 index bc3c01dd8..000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -FallarborTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -FallarborTown_PokemonCenter_2F_MapEvents:: - map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc deleted file mode 100644 index f3a761312..000000000 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte FallarborTown_PokemonCenter_2F_MapEvents - .4byte FallarborTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_FALLARBOR_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..be694d257 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F", + "name": "FallarborTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FALLARBOR_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FallarborTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc deleted file mode 100644 index 0ae752f93..000000000 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -FarawayIsland_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - -FarawayIsland_Entrance_MapWarps: - warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR - warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR - -FarawayIsland_Entrance_MapCoordEvents: - coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D - coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 - -FarawayIsland_Entrance_MapBGEvents: - bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 - -FarawayIsland_Entrance_MapEvents:: - map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents - diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc deleted file mode 100644 index b76f97aef..000000000 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Entrance: - .4byte FarawayIsland_Entrance_Layout - .4byte FarawayIsland_Entrance_MapEvents - .4byte FarawayIsland_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_FARAWAY_ISLAND_ENTRANCE - .byte MAPSEC_FARAWAY_ISLAND - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FarawayIsland_Entrance/map.json b/data/maps/FarawayIsland_Entrance/map.json new file mode 100644 index 000000000..683010e12 --- /dev/null +++ b/data/maps/FarawayIsland_Entrance/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_FARAWAY_ISLAND_ENTRANCE", + "name": "FarawayIsland_Entrance", + "layout": "LAYOUT_FARAWAY_ISLAND_ENTRANCE", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_FARAWAY_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FarawayIsland_Entrance_EventScript_267CA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 13, + "y": 41, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 22, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 7, + "elevation": 3, + "dest_map": "MAP_FARAWAY_ISLAND_INTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 18, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C98" + }, + { + "type": "trigger", + "x": 10, + "y": 20, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C9D" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "FarawayIsland_Entrance_EventScript_267C98" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 32, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FarawayIsland_Entrance_EventScript_267CF1" + } + ] +} \ No newline at end of file diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc deleted file mode 100644 index a8611c038..000000000 --- a/data/maps/FarawayIsland_Interior/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -FarawayIsland_Interior_EventObjects: - object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW - -FarawayIsland_Interior_MapWarps: - warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE - warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE - -FarawayIsland_Interior_MapEvents:: - map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc deleted file mode 100644 index 828202471..000000000 --- a/data/maps/FarawayIsland_Interior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FarawayIsland_Interior: - .4byte FarawayIsland_Interior_Layout - .4byte FarawayIsland_Interior_MapEvents - .4byte FarawayIsland_Interior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_FARAWAY_ISLAND_INTERIOR - .byte MAPSEC_FARAWAY_ISLAND - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FarawayIsland_Interior/map.json b/data/maps/FarawayIsland_Interior/map.json new file mode 100644 index 000000000..d6531d043 --- /dev/null +++ b/data/maps/FarawayIsland_Interior/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_FARAWAY_ISLAND_INTERIOR", + "name": "FarawayIsland_Interior", + "layout": "LAYOUT_FARAWAY_ISLAND_INTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_FARAWAY_ISLAND", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MEW", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 15, + "movement_range_y": 15, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "FarawayIsland_Interior_EventScript_267DF2", + "flag": "FLAG_HIDE_MEW" + } + ], + "warp_events": [ + { + "x": 12, + "y": 19, + "elevation": 0, + "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 19, + "elevation": 0, + "dest_map": "MAP_FARAWAY_ISLAND_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc deleted file mode 100644 index 7fd7e44ad..000000000 --- a/data/maps/FieryPath/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -FieryPath_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_14 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE - -FieryPath_MapWarps: - warp_def 26, 36, 3, 4, MAP_ROUTE112 - warp_def 26, 4, 3, 5, MAP_ROUTE112 - -FieryPath_MapEvents:: - map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc deleted file mode 100644 index 83e339adb..000000000 --- a/data/maps/FieryPath/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FieryPath: - .4byte FieryPath_Layout - .4byte FieryPath_MapEvents - .4byte FieryPath_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_FIERY_PATH - .byte MAPSEC_FIERY_PATH - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json new file mode 100644 index 000000000..26c609e05 --- /dev/null +++ b/data/maps/FieryPath/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_FIERY_PATH", + "name": "FieryPath", + "layout": "LAYOUT_FIERY_PATH", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_FIERY_PATH", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_29119E", + "flag": "FLAG_ITEM_FIERY_PATH_TM06" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 17, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 8, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FieryPath_EventScript_291191", + "flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE" + } + ], + "warp_events": [ + { + "x": 26, + "y": 36, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 4, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc deleted file mode 100644 index 5e48951c2..000000000 --- a/data/maps/FortreeCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -FortreeCity_MapConnectionsList: - connection left, 0, MAP_ROUTE119 - connection right, 0, MAP_ROUTE120 - -FortreeCity_MapConnections: - .4byte 2 - .4byte FortreeCity_MapConnectionsList - diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc deleted file mode 100644 index 865393404..000000000 --- a/data/maps/FortreeCity/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -FortreeCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0 - object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON - -FortreeCity_MapWarps: - warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 - warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM - warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART - warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2 - warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3 - warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4 - warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 - warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP - -FortreeCity_MapBGEvents: - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 - bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 - bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A - bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E260B - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 - bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A - -FortreeCity_MapEvents:: - map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents - diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc deleted file mode 100644 index 9d7cd5aae..000000000 --- a/data/maps/FortreeCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity: - .4byte FortreeCity_Layout - .4byte FortreeCity_MapEvents - .4byte FortreeCity_MapScripts - .4byte FortreeCity_MapConnections - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json new file mode 100644 index 000000000..0aec65572 --- /dev/null +++ b/data/maps/FortreeCity/map.json @@ -0,0 +1,236 @@ +{ + "id": "MAP_FORTREE_CITY", + "name": "FortreeCity", + "layout": "LAYOUT_FORTREE_CITY", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE119" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE120" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 31, + "y": 3, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 32, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25DE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 32, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 11, + "y": 14, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E25F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 25, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_EventScript_1E2614", + "flag": "FLAG_HIDE_FORTREE_CITY_KECLEON" + } + ], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 11, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 14, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 3, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 2, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_HOUSE5", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 13, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY_DECORATION_SHOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FortreeCity_EventScript_1E2602" + }, + { + "type": "sign", + "x": 7, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 5, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 26, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "FortreeCity_EventScript_1E260B" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc deleted file mode 100644 index 604e3fda1..000000000 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_DecorationShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 - -FortreeCity_DecorationShop_MapWarps: - warp_def 3, 5, 0, 8, MAP_FORTREE_CITY - warp_def 4, 5, 0, 8, MAP_FORTREE_CITY - -FortreeCity_DecorationShop_MapEvents:: - map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc deleted file mode 100644 index b4e0c9205..000000000 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_DecorationShop: - .4byte FortreeCity_DecorationShop_Layout - .4byte FortreeCity_DecorationShop_MapEvents - .4byte FortreeCity_DecorationShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_DECORATION_SHOP - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json new file mode 100644 index 000000000..6a8d9fdab --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_FORTREE_CITY_DECORATION_SHOP", + "name": "FortreeCity_DecorationShop", + "layout": "LAYOUT_FORTREE_CITY_DECORATION_SHOP", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_21800E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_218017", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_218020", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_DecorationShop_EventScript_21804C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc deleted file mode 100644 index e71b6ea4e..000000000 --- a/data/maps/FortreeCity_Gym/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -FortreeCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 5, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 15, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0 - object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 - -FortreeCity_Gym_MapWarps: - warp_def 15, 24, 0, 2, MAP_FORTREE_CITY - warp_def 16, 24, 0, 2, MAP_FORTREE_CITY - -FortreeCity_Gym_MapBGEvents: - bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 - bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 - -FortreeCity_Gym_MapEvents:: - map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents - diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc deleted file mode 100644 index 2bde54ddd..000000000 --- a/data/maps/FortreeCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Gym: - .4byte FortreeCity_Gym_Layout - .4byte FortreeCity_Gym_MapEvents - .4byte FortreeCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_FORTREE_CITY_GYM - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json new file mode 100644 index 000000000..ad6b7c6b9 --- /dev/null +++ b/data/maps/FortreeCity_Gym/map.json @@ -0,0 +1,157 @@ +{ + "id": "MAP_FORTREE_CITY_GYM", + "name": "FortreeCity_Gym", + "layout": "LAYOUT_FORTREE_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WINONA", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Gym_EventScript_2165C8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FortreeCity_Gym_EventScript_2166A8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FortreeCity_Gym_EventScript_2166D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 5, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FortreeCity_Gym_EventScript_2166ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "FortreeCity_Gym_EventScript_2166BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 15, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Gym_EventScript_216732", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "FortreeCity_Gym_EventScript_216704", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "FortreeCity_Gym_EventScript_21671B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 24, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 2 + }, + { + "x": 16, + "y": 24, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_Gym_EventScript_216751" + }, + { + "type": "sign", + "x": 17, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "FortreeCity_Gym_EventScript_216761" + } + ] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc deleted file mode 100644 index 5cf082d41..000000000 --- a/data/maps/FortreeCity_House1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 - -FortreeCity_House1_MapWarps: - warp_def 3, 5, 0, 1, MAP_FORTREE_CITY - warp_def 4, 5, 0, 1, MAP_FORTREE_CITY - -FortreeCity_House1_MapEvents:: - map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc deleted file mode 100644 index 636a147f4..000000000 --- a/data/maps/FortreeCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House1: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House1_MapEvents - .4byte FortreeCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json new file mode 100644 index 000000000..8f349e640 --- /dev/null +++ b/data/maps/FortreeCity_House1/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE1", + "name": "FortreeCity_House1", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_2162BB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_216368", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House1_EventScript_21635F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc deleted file mode 100644 index ca183c005..000000000 --- a/data/maps/FortreeCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 - -FortreeCity_House2_MapWarps: - warp_def 3, 5, 0, 4, MAP_FORTREE_CITY - warp_def 4, 5, 0, 4, MAP_FORTREE_CITY - -FortreeCity_House2_MapEvents:: - map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc deleted file mode 100644 index e61c000f6..000000000 --- a/data/maps/FortreeCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House2: - .4byte FortreeCity_House2_Layout - .4byte FortreeCity_House2_MapEvents - .4byte FortreeCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE2 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json new file mode 100644 index 000000000..7b9a67ab6 --- /dev/null +++ b/data/maps/FortreeCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE2", + "name": "FortreeCity_House2", + "layout": "LAYOUT_FORTREE_CITY_HOUSE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House2_EventScript_2177CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House2_EventScript_2C811E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc deleted file mode 100644 index 8a158f8ff..000000000 --- a/data/maps/FortreeCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 - -FortreeCity_House3_MapWarps: - warp_def 3, 5, 0, 5, MAP_FORTREE_CITY - warp_def 4, 5, 0, 5, MAP_FORTREE_CITY - -FortreeCity_House3_MapEvents:: - map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc deleted file mode 100644 index db66e65d8..000000000 --- a/data/maps/FortreeCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House3: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House3_MapEvents - .4byte FortreeCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json new file mode 100644 index 000000000..d886e0cdb --- /dev/null +++ b/data/maps/FortreeCity_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE3", + "name": "FortreeCity_House3", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House3_EventScript_217AE8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House3_EventScript_217AF1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc deleted file mode 100644 index bc6a4a39c..000000000 --- a/data/maps/FortreeCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL - -FortreeCity_House4_MapWarps: - warp_def 3, 5, 0, 6, MAP_FORTREE_CITY - warp_def 4, 5, 0, 6, MAP_FORTREE_CITY - -FortreeCity_House4_MapEvents:: - map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc deleted file mode 100644 index cd340c294..000000000 --- a/data/maps/FortreeCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House4: - .4byte FortreeCity_House2_Layout - .4byte FortreeCity_House4_MapEvents - .4byte FortreeCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE2 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json new file mode 100644 index 000000000..11fd05bf5 --- /dev/null +++ b/data/maps/FortreeCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE4", + "name": "FortreeCity_House4", + "layout": "LAYOUT_FORTREE_CITY_HOUSE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217C81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217C8A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House4_EventScript_217D20", + "flag": "FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc deleted file mode 100644 index bc090cb80..000000000 --- a/data/maps/FortreeCity_House5/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 - -FortreeCity_House5_MapWarps: - warp_def 3, 5, 0, 7, MAP_FORTREE_CITY - warp_def 4, 5, 0, 7, MAP_FORTREE_CITY - -FortreeCity_House5_MapEvents:: - map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc deleted file mode 100644 index a04e91eb3..000000000 --- a/data/maps/FortreeCity_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_House5: - .4byte FortreeCity_House1_Layout - .4byte FortreeCity_House5_MapEvents - .4byte FortreeCity_House5_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_FORTREE_CITY_HOUSE1 - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json new file mode 100644 index 000000000..37e23502b --- /dev/null +++ b/data/maps/FortreeCity_House5/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_FORTREE_CITY_HOUSE5", + "name": "FortreeCity_House5", + "layout": "LAYOUT_FORTREE_CITY_HOUSE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217EF2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217F04", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_House5_EventScript_217EFB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 5, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc deleted file mode 100644 index ceb68f7ea..000000000 --- a/data/maps/FortreeCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 - -FortreeCity_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_FORTREE_CITY - warp_def 4, 7, 0, 3, MAP_FORTREE_CITY - -FortreeCity_Mart_MapEvents:: - map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc deleted file mode 100644 index f4aaf9ce1..000000000 --- a/data/maps/FortreeCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_Mart: - .4byte Mart_Layout - .4byte FortreeCity_Mart_MapEvents - .4byte FortreeCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json new file mode 100644 index 000000000..3b7e0723b --- /dev/null +++ b/data/maps/FortreeCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_FORTREE_CITY_MART", + "name": "FortreeCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_217666", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_217698", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_2176A1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_Mart_EventScript_2176AA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc deleted file mode 100644 index af7b5f72e..000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 - -FortreeCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_FORTREE_CITY - warp_def 6, 8, 3, 0, MAP_FORTREE_CITY - warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F - -FortreeCity_PokemonCenter_1F_MapEvents:: - map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 543e672a2..000000000 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte FortreeCity_PokemonCenter_1F_MapEvents - .4byte FortreeCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..f51926d3b --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "name": "FortreeCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173F5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_2173FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_1F_EventScript_217407", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_FORTREE_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 7cdbc4a82..000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -FortreeCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -FortreeCity_PokemonCenter_2F_MapEvents:: - map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 8dbfeed07..000000000 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -FortreeCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte FortreeCity_PokemonCenter_2F_MapEvents - .4byte FortreeCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_FORTREE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..4984b7692 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_FORTREE_CITY_POKEMON_CENTER_2F", + "name": "FortreeCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_FORTREE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "FortreeCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_FORTREE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc deleted file mode 100644 index 1885f3cf5..000000000 --- a/data/maps/GraniteCave_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -GraniteCave_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE - -GraniteCave_1F_MapWarps: - warp_def 37, 12, 3, 0, MAP_ROUTE106 - warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F - warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F - warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM - -GraniteCave_1F_MapEvents:: - map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc deleted file mode 100644 index 2f834c7eb..000000000 --- a/data/maps/GraniteCave_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_1F: - .4byte GraniteCave_1F_Layout - .4byte GraniteCave_1F_MapEvents - .4byte GraniteCave_1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_1F - .byte MAPSEC_GRANITE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json new file mode 100644 index 000000000..3f720a569 --- /dev/null +++ b/data/maps/GraniteCave_1F/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_GRANITE_CAVE_1F", + "name": "GraniteCave_1F", + "layout": "LAYOUT_GRANITE_CAVE_1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 36, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_1F_EventScript_22DA5E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_1F_EventScript_291150", + "flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 37, + "y": 12, + "elevation": 3, + "dest_map": "MAP_ROUTE106", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 11, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 10, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_STEVENS_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc deleted file mode 100644 index f3dcbcbaf..000000000 --- a/data/maps/GraniteCave_B1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL - -GraniteCave_B1F_MapWarps: - warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F - warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F - warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F - warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F - warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F - warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F - warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F - -GraniteCave_B1F_MapEvents:: - map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc deleted file mode 100644 index 546c24658..000000000 --- a/data/maps/GraniteCave_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B1F: - .4byte GraniteCave_B1F_Layout - .4byte GraniteCave_B1F_MapEvents - .4byte GraniteCave_B1F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_B1F - .byte MAPSEC_GRANITE_CAVE - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json new file mode 100644 index 000000000..6e3a14403 --- /dev/null +++ b/data/maps/GraniteCave_B1F/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_GRANITE_CAVE_B1F", + "name": "GraniteCave_B1F", + "layout": "LAYOUT_GRANITE_CAVE_B1F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B1F_EventScript_29115D", + "flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL" + } + ], + "warp_events": [ + { + "x": 25, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 2 + }, + { + "x": 29, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 3 + }, + { + "x": 29, + "y": 2, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc deleted file mode 100644 index fc321dfb0..000000000 --- a/data/maps/GraniteCave_B2F/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -GraniteCave_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 - -GraniteCave_B2F_MapWarps: - warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F - warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F - warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F - warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F - warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F - -GraniteCave_B2F_MapBGEvents: - bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 - bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 - -GraniteCave_B2F_MapEvents:: - map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents - diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc deleted file mode 100644 index ce63017be..000000000 --- a/data/maps/GraniteCave_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_B2F: - .4byte GraniteCave_B2F_Layout - .4byte GraniteCave_B2F_MapEvents - .4byte GraniteCave_B2F_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_B2F - .byte MAPSEC_GRANITE_CAVE - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json new file mode 100644 index 000000000..18b5ca9d4 --- /dev/null +++ b/data/maps/GraniteCave_B2F/map.json @@ -0,0 +1,191 @@ +{ + "id": "MAP_GRANITE_CAVE_B2F", + "name": "GraniteCave_B2F", + "layout": "LAYOUT_GRANITE_CAVE_B2F", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_29116A", + "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_291177", + "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 2, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 4, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 6, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_B2F_EventScript_2907A6", + "flag": "FLAG_TEMP_17" + } + ], + "warp_events": [ + { + "x": 29, + "y": 13, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 2 + }, + { + "x": 28, + "y": 21, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 5, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 4 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 5 + }, + { + "x": 29, + "y": 2, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 28, + "y": 6, + "elevation": 3, + "item": "ITEM_EVERSTONE", + "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1" + }, + { + "type": "hidden_item", + "x": 15, + "y": 11, + "elevation": 3, + "item": "ITEM_EVERSTONE", + "flag": "FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc deleted file mode 100644 index 747fe2cc3..000000000 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -GraniteCave_StevensRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN - -GraniteCave_StevensRoom_MapWarps: - warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F - -GraniteCave_StevensRoom_MapEvents:: - map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc deleted file mode 100644 index 6d90fc6c8..000000000 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -GraniteCave_StevensRoom: - .4byte GraniteCave_StevensRoom_Layout - .4byte GraniteCave_StevensRoom_MapEvents - .4byte GraniteCave_StevensRoom_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_GRANITE_CAVE_STEVENS_ROOM - .byte MAPSEC_GRANITE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json new file mode 100644 index 000000000..22a6207c2 --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_GRANITE_CAVE_STEVENS_ROOM", + "name": "GraniteCave_StevensRoom", + "layout": "LAYOUT_GRANITE_CAVE_STEVENS_ROOM", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_GRANITE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "GraniteCave_StevensRoom_EventScript_22DC7B", + "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc deleted file mode 100644 index c7888165f..000000000 --- a/data/maps/InsideOfTruck/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -InsideOfTruck_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 - -InsideOfTruck_MapWarps: - warp_def 4, 1, 0, 127, MAP_NONE - warp_def 4, 2, 0, 127, MAP_NONE - warp_def 4, 3, 0, 127, MAP_NONE - -InsideOfTruck_MapCoordEvents: - coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 - -InsideOfTruck_MapBGEvents: - bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C - -InsideOfTruck_MapEvents:: - map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents - diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc deleted file mode 100644 index 7b1889e25..000000000 --- a/data/maps/InsideOfTruck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -InsideOfTruck: - .4byte InsideOfTruck_Layout - .4byte InsideOfTruck_MapEvents - .4byte InsideOfTruck_MapScripts - .4byte 0x0 - .2byte 65535 - .2byte LAYOUT_INSIDE_OF_TRUCK - .byte MAPSEC_INSIDE_OF_TRUCK - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json new file mode 100644 index 000000000..4978d841c --- /dev/null +++ b/data/maps/InsideOfTruck/map.json @@ -0,0 +1,151 @@ +{ + "id": "MAP_INSIDE_OF_TRUCK", + "name": "InsideOfTruck", + "layout": "LAYOUT_INSIDE_OF_TRUCK", + "music": "65535", + "region_map_section": "MAPSEC_INSIDE_OF_TRUCK", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 0, + "y": 0, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 0, + "y": 3, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "x": 2, + "y": 3, + "elevation": 8, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "InsideOfTruck_EventScript_23BF6C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 4, + "y": 2, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 4, + "y": 3, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 1, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + }, + { + "type": "trigger", + "x": 3, + "y": 2, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 3, + "var": "VAR_0x4092", + "var_value": 0, + "script": "InsideOfTruck_EventScript_23BF04" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 0, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 2, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + }, + { + "type": "sign", + "x": 0, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "InsideOfTruck_EventScript_23BF6C" + } + ] +} \ No newline at end of file diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc deleted file mode 100644 index fa9c3deba..000000000 --- a/data/maps/IslandCave/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -IslandCave_EventObjects: - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE - -IslandCave_MapWarps: - warp_def 8, 29, 3, 0, MAP_ROUTE105 - warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE - warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE - -IslandCave_MapBGEvents: - bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D - bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D - -IslandCave_MapEvents:: - map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents - diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc deleted file mode 100644 index 15eb2b360..000000000 --- a/data/maps/IslandCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave: - .4byte IslandCave_Layout - .4byte IslandCave_MapEvents - .4byte IslandCave_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_ISLAND_CAVE - .byte MAPSEC_ISLAND_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json new file mode 100644 index 000000000..c6365025b --- /dev/null +++ b/data/maps/IslandCave/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_ISLAND_CAVE", + "name": "IslandCave", + "layout": "LAYOUT_ISLAND_CAVE", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_ISLAND_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_REGICE", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "IslandCave_EventScript_238F58", + "flag": "FLAG_HIDE_REGICE" + } + ], + "warp_events": [ + { + "x": 8, + "y": 29, + "elevation": 3, + "dest_map": "MAP_ROUTE105", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 2 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238EEF" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238F1D" + }, + { + "type": "sign", + "x": 9, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "IslandCave_EventScript_238F1D" + } + ] +} \ No newline at end of file diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc deleted file mode 100644 index 5d33af93e..000000000 --- a/data/maps/JaggedPass/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -JaggedPass_EventObjects: - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 9, 21, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_23079C, 0 - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, JaggedPass_EventScript_230718, FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 - object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 - -JaggedPass_MapWarps: - warp_def 14, 40, 3, 2, MAP_ROUTE112 - warp_def 15, 40, 3, 3, MAP_ROUTE112 - warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY - warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY - warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F - -JaggedPass_MapCoordEvents: - coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY - coord_event 21, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 22, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 21, 20, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB - -JaggedPass_MapBGEvents: - bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL - bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL - -JaggedPass_MapEvents:: - map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents - diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc deleted file mode 100644 index 870b817ec..000000000 --- a/data/maps/JaggedPass/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -JaggedPass: - .4byte JaggedPass_Layout - .4byte JaggedPass_MapEvents - .4byte JaggedPass_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_JAGGED_PASS - .byte MAPSEC_JAGGED_PASS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json new file mode 100644 index 000000000..748fc9914 --- /dev/null +++ b/data/maps/JaggedPass/map.json @@ -0,0 +1,246 @@ +{ + "id": "MAP_JAGGED_PASS", + "name": "JaggedPass", + "layout": "LAYOUT_JAGGED_PASS", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_JAGGED_PASS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_230785", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 16, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "JaggedPass_EventScript_2307FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "JaggedPass_EventScript_291184", + "flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 9, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_23079C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 16, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "JaggedPass_EventScript_230718", + "flag": "FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 14, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_230871", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 18, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "JaggedPass_EventScript_23085A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 40, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 2 + }, + { + "x": 15, + "y": 40, + "elevation": 3, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 13, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 21, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 14, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 18, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 22, + "y": 19, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "trigger", + "x": 21, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 22, + "y": 20, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 21, + "y": 20, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 14, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + }, + { + "type": "trigger", + "x": 13, + "y": 15, + "elevation": 3, + "var": "VAR_0x40C8", + "var_value": 1, + "script": "JaggedPass_EventScript_2306BB" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 8, + "y": 10, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 7, + "y": 29, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc deleted file mode 100644 index e3d4e1fb1..000000000 --- a/data/maps/LavaridgeTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -LavaridgeTown_MapConnectionsList: - connection right, -40, MAP_ROUTE112 - -LavaridgeTown_MapConnections: - .4byte 1 - .4byte LavaridgeTown_MapConnectionsList - diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc deleted file mode 100644 index aeb55249e..000000000 --- a/data/maps/LavaridgeTown/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LavaridgeTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0 - object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 - object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 - object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 - -LavaridgeTown_MapWarps: - warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP - warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART - warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE - warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - -LavaridgeTown_MapCoordEvents: - coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA - -LavaridgeTown_MapBGEvents: - bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 - bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE - bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A - bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7A5 - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 - bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL - -LavaridgeTown_MapEvents:: - map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents - diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc deleted file mode 100644 index 5365e1a00..000000000 --- a/data/maps/LavaridgeTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown: - .4byte LavaridgeTown_Layout - .4byte LavaridgeTown_MapEvents - .4byte LavaridgeTown_MapScripts - .4byte LavaridgeTown_MapConnections - .2byte MUS_MACHI_S4 - .2byte LAYOUT_LAVARIDGE_TOWN - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json new file mode 100644 index 000000000..6bf3162c8 --- /dev/null +++ b/data/maps/LavaridgeTown/map.json @@ -0,0 +1,262 @@ +{ + "id": "MAP_LAVARIDGE_TOWN", + "name": "LavaridgeTown", + "layout": "LAYOUT_LAVARIDGE_TOWN", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE112" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA73B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA70E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA717", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 10, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA720", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA729", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA732", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 6, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 12, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_EventScript_1EA744", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_HERB_SHOP", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 3, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "LavaridgeTown_EventScript_1EA6FA" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7B7" + }, + { + "type": "sign", + "x": 7, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7AE" + }, + { + "type": "sign", + "x": 17, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 13, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LavaridgeTown_EventScript_1EA7A5" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 16, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_EventScript_271E73" + }, + { + "type": "hidden_item", + "x": 4, + "y": 5, + "elevation": 3, + "item": "ITEM_ICE_HEAL", + "flag": "FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc deleted file mode 100644 index 08d22737c..000000000 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -LavaridgeTown_Gym_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 - -LavaridgeTown_Gym_1F_MapWarps: - warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 9, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 17, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 9, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 15, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 14, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 14, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 10, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 10, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 6, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 3, 6, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 2, 3, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 5, 2, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 7, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 8, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 6, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 16, 0, 20, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 3, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 14, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F - -LavaridgeTown_Gym_1F_MapBGEvents: - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B - bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B - -LavaridgeTown_Gym_1F_MapEvents:: - map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents - diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc deleted file mode 100644 index f71786ce0..000000000 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_1F: - .4byte LavaridgeTown_Gym_1F_Layout - .4byte LavaridgeTown_Gym_1F_MapEvents - .4byte LavaridgeTown_Gym_1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_LAVARIDGE_TOWN_GYM_1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json new file mode 100644 index 000000000..dac9467f0 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -0,0 +1,299 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_GYM_1F", + "name": "LavaridgeTown_Gym_1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "x": 13, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE78C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE87F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE900", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE8AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE8E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Gym_1F_EventScript_1FE96C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 3 + }, + { + "x": 0, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 15, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 6 + }, + { + "x": 3, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 7 + }, + { + "x": 1, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 8 + }, + { + "x": 0, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 9 + }, + { + "x": 3, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 10 + }, + { + "x": 0, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 11 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 12 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 13 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 14 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 15 + }, + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 16 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 17 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 18 + }, + { + "x": 4, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 20 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 19 + }, + { + "x": 14, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 21 + }, + { + "x": 13, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 22 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "dest_warp_id": 23 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_Gym_1F_EventScript_1FE98B" + }, + { + "type": "sign", + "x": 16, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LavaridgeTown_Gym_1F_EventScript_1FE99B" + } + ] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc deleted file mode 100644 index 64512a994..000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LavaridgeTown_Gym_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 - -LavaridgeTown_Gym_B1F_MapWarps: - warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 14, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 18, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 9, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 2, 15, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 14, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 1, 14, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 10, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 10, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 3, 6, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 2, 3, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 5, 2, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 7, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 8, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 10, 6, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 12, 3, 3, 22, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 16, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 14, 6, 3, 23, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F - -LavaridgeTown_Gym_B1F_MapEvents:: - map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc deleted file mode 100644 index fc1d6308a..000000000 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Gym_B1F: - .4byte LavaridgeTown_Gym_B1F_Layout - .4byte LavaridgeTown_Gym_B1F_MapEvents - .4byte LavaridgeTown_Gym_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_LAVARIDGE_TOWN_GYM_B1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json new file mode 100644 index 000000000..c81e42dc2 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -0,0 +1,242 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_GYM_B1F", + "name": "LavaridgeTown_Gym_B1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_GYM_B1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE91B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE8CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 13, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE936", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "LavaridgeTown_Gym_B1F_EventScript_1FE951", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 2 + }, + { + "x": 0, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 6 + }, + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 18, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 9, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 15, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 8 + }, + { + "x": 3, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 14, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 10 + }, + { + "x": 0, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 11 + }, + { + "x": 3, + "y": 10, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 12 + }, + { + "x": 0, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 13 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 14 + }, + { + "x": 5, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 15 + }, + { + "x": 2, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 16 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 17 + }, + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 18 + }, + { + "x": 8, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 19 + }, + { + "x": 10, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 20 + }, + { + "x": 12, + "y": 3, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 22 + }, + { + "x": 4, + "y": 16, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 21 + }, + { + "x": 14, + "y": 6, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 23 + }, + { + "x": 13, + "y": 17, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 24 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN_GYM_1F", + "dest_warp_id": 25 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc deleted file mode 100644 index 3cce9612f..000000000 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_HerbShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 - -LavaridgeTown_HerbShop_MapWarps: - warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN - -LavaridgeTown_HerbShop_MapEvents:: - map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc deleted file mode 100644 index 68fe70df7..000000000 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_HerbShop: - .4byte LavaridgeTown_HerbShop_Layout - .4byte LavaridgeTown_HerbShop_MapEvents - .4byte LavaridgeTown_HerbShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_LAVARIDGE_TOWN_HERB_SHOP - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json new file mode 100644 index 000000000..c8091527c --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_HERB_SHOP", + "name": "LavaridgeTown_HerbShop", + "layout": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE4D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE505", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_HerbShop_EventScript_1FE4FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc deleted file mode 100644 index 77af1e746..000000000 --- a/data/maps/LavaridgeTown_House/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 - -LavaridgeTown_House_MapWarps: - warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN - -LavaridgeTown_House_MapEvents:: - map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc deleted file mode 100644 index 0815c6fb4..000000000 --- a/data/maps/LavaridgeTown_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_House: - .4byte House3_Layout - .4byte LavaridgeTown_House_MapEvents - .4byte LavaridgeTown_House_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json new file mode 100644 index 000000000..5465c81f8 --- /dev/null +++ b/data/maps/LavaridgeTown_House/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_HOUSE", + "name": "LavaridgeTown_House", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_1FF912", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_1FF91B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_House_EventScript_2C804E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc deleted file mode 100644 index 24923dc51..000000000 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -LavaridgeTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 - -LavaridgeTown_Mart_MapWarps: - warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN - -LavaridgeTown_Mart_MapEvents:: - map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc deleted file mode 100644 index 9c96370f9..000000000 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_Mart: - .4byte Mart_Layout - .4byte LavaridgeTown_Mart_MapEvents - .4byte LavaridgeTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json new file mode 100644 index 000000000..1208d3e53 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_MART", + "name": "LavaridgeTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FF9CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FF9FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_Mart_EventScript_1FFA07", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 01974866c..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 - -LavaridgeTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN - warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN - warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F - warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN - -LavaridgeTown_PokemonCenter_1F_MapEvents:: - map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 4e17b5fd0..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_1F: - .4byte LavaridgeTown_PokemonCenter_1F_Layout - .4byte LavaridgeTown_PokemonCenter_1F_MapEvents - .4byte LavaridgeTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..18980fb3c --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "name": "LavaridgeTown_PokemonCenter_1F", + "layout": "LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LAVARIDGE_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 4da5d3b1f..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -LavaridgeTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -LavaridgeTown_PokemonCenter_2F_MapEvents:: - map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 4a7226e29..000000000 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LavaridgeTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte LavaridgeTown_PokemonCenter_2F_MapEvents - .4byte LavaridgeTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_LAVARIDGE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..a8c2ef9a3 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F", + "name": "LavaridgeTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LAVARIDGE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LavaridgeTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc deleted file mode 100644 index 6e0cdff93..000000000 --- a/data/maps/LilycoveCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -LilycoveCity_MapConnectionsList: - connection left, 10, MAP_ROUTE121 - connection right, -10, MAP_ROUTE124 - -LilycoveCity_MapConnections: - .4byte 2 - .4byte LilycoveCity_MapConnectionsList - diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc deleted file mode 100644 index 71022af32..000000000 --- a/data/maps/LilycoveCity/events.inc +++ /dev/null @@ -1,58 +0,0 @@ -LilycoveCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C4A, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C72, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0 - object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0 - object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0 - object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 - object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 - -LilycoveCity_MapWarps: - warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F - warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE - warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1 - warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2 - warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3 - warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4 - warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR - warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_MapBGEvents: - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A - bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 - bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B - bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 - bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2CFF - bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D08 - bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D11 - bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D44 - bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D62 - bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D74 - bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE - bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP - bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL - -LilycoveCity_MapEvents:: - map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents - diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc deleted file mode 100644 index 93120b896..000000000 --- a/data/maps/LilycoveCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity: - .4byte LilycoveCity_Layout - .4byte LilycoveCity_MapEvents - .4byte LilycoveCity_MapScripts - .4byte LilycoveCity_MapConnections - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json new file mode 100644 index 000000000..d10f00260 --- /dev/null +++ b/data/maps/LilycoveCity/map.json @@ -0,0 +1,522 @@ +{ + "id": "MAP_LILYCOVE_CITY", + "name": "LilycoveCity", + "layout": "LAYOUT_LILYCOVE_CITY", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 10, + "map": "MAP_ROUTE121" + }, + { + "direction": "right", + "offset": -10, + "map": "MAP_ROUTE124" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 32, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C53", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 15, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C2B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 28, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C22", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C4A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 16, + "y": 9, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C91", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 35, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C72", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 35, + "y": 37, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2C9A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 34, + "y": 37, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CA3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 57, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CAC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 73, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2D7D", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 61, + "y": 36, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_2910E8", + "flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 43, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DD5", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 46, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DBA", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 45, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DC3", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 38, + "y": 9, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DCC", + "flag": "FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 50, + "y": 7, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2BD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 27, + "y": 7, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2DDE", + "flag": "FLAG_HIDE_LILYCOVE_CITY_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 16, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E302D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 41, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CEE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 40, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CDD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 16, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CCB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 16, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_EventScript_1E2CD4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 27, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 24, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "dest_warp_id": 0 + }, + { + "x": 24, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 24, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 39, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "dest_warp_id": 1 + }, + { + "x": 70, + "y": 5, + "elevation": 1, + "dest_map": "MAP_AQUA_HIDEOUT_1F", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 6, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 55, + "y": 15, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 22, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D1A" + }, + { + "type": "sign", + "x": 25, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 29, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D6B" + }, + { + "type": "sign", + "x": 26, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 6, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2CFF" + }, + { + "type": "sign", + "x": 29, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D08" + }, + { + "type": "sign", + "x": 35, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D11" + }, + { + "type": "sign", + "x": 6, + "y": 30, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D44" + }, + { + "type": "sign", + "x": 36, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D62" + }, + { + "type": "sign", + "x": 34, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_EventScript_1E2D74" + }, + { + "type": "hidden_item", + "x": 36, + "y": 31, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 61, + "y": 7, + "elevation": 0, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP" + }, + { + "type": "hidden_item", + "x": 64, + "y": 31, + "elevation": 0, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc deleted file mode 100644 index 838aec23b..000000000 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ /dev/null @@ -1,51 +0,0 @@ -LilycoveCity_ContestHall_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0 - object_event 7, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0 - object_event 9, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0 - object_event 10, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_3, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_4, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0 - object_event 16, EVENT_OBJ_GFX_TWIN, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0 - object_event 18, EVENT_OBJ_GFX_POKEFAN_F, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0 - object_event 28, EVENT_OBJ_GFX_EXPERT_F, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 - -LilycoveCity_ContestHall_MapWarps: - warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY - warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY - -LilycoveCity_ContestHall_MapBGEvents: - bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C - bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 - bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 - bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C - -LilycoveCity_ContestHall_MapEvents:: - map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents - diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc deleted file mode 100644 index d450c564e..000000000 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestHall: - .4byte LilycoveCity_ContestHall_Layout - .4byte LilycoveCity_ContestHall_MapEvents - .4byte LilycoveCity_ContestHall_MapScripts - .4byte 0x0 - .2byte MUS_CONLOBBY - .2byte LAYOUT_LILYCOVE_CITY_CONTEST_HALL - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json new file mode 100644 index 000000000..644ec55ee --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -0,0 +1,515 @@ +{ + "id": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "name": "LilycoveCity_ContestHall", + "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_HALL", + "music": "MUS_CONLOBBY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 30, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B485", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B48E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 40, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B497", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 12, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 15, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4C0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 10, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B505", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 16, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B51C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B533", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 18, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B56A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 8, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B53C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B581", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 27, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B598", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 26, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 28, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B5F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B60B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 30, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B639", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 26, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B622", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B553", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 36, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B650", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 39, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B667", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 34, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B67E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 36, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B695", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 38, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 40, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 32, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B6DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 37, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B71C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 42, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B705", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 23, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestHall_EventScript_21B4A0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 19, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 30, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 32, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 27, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B733" + }, + { + "type": "sign", + "x": 39, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B73C" + }, + { + "type": "sign", + "x": 11, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B745" + }, + { + "type": "sign", + "x": 15, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B745" + }, + { + "type": "sign", + "x": 23, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B733" + }, + { + "type": "sign", + "x": 35, + "y": 28, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestHall_EventScript_21B73C" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc deleted file mode 100644 index 68c682a25..000000000 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ /dev/null @@ -1,50 +0,0 @@ -LilycoveCity_ContestLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 9, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 4, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 23, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0 - object_event 10, EVENT_OBJ_GFX_TWIN, 0, 28, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 21, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2 - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0 - object_event 14, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0 - object_event 15, EVENT_OBJ_GFX_POKEFAN_F, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_M, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 24, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 27, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 28, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 28, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 26, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 27, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 23, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS - object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 - -LilycoveCity_ContestLobby_MapWarps: - warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL - warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL - -LilycoveCity_ContestLobby_MapBGEvents: - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink - bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E - bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 - bg_event 25, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A75A - bg_event 27, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A761 - bg_event 30, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A77A - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A73E - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A745 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A74C - bg_event 27, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_Pblock1_Ask - bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D - bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 - -LilycoveCity_ContestLobby_MapEvents:: - map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents - diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc deleted file mode 100644 index d00e7190d..000000000 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_ContestLobby: - .4byte LilycoveCity_ContestLobby_Layout - .4byte LilycoveCity_ContestLobby_MapEvents - .4byte LilycoveCity_ContestLobby_MapScripts - .4byte 0x0 - .2byte MUS_CONLOBBY - .2byte LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json new file mode 100644 index 000000000..65571d71c --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -0,0 +1,472 @@ +{ + "id": "MAP_LILYCOVE_CITY_CONTEST_LOBBY", + "name": "LilycoveCity_ContestLobby", + "layout": "LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY", + "music": "MUS_CONLOBBY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A554", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A806", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 26, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 9, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A708", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A711", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A71A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_28CA59", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 23, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A768", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 21, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A72C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 0, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A723", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A735", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FAB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_293FBD", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_POKEBLOCK_EXPERT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A771", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 27, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7B3", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 28, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7BE", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 28, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7C9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_2", + "x": 26, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7D9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7E9", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 26, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A7A8", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21A798", + "flag": "FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_ContestLobby_EventScript_21ACF1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 4 + }, + { + "x": 15, + "y": 11, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_CONTEST_HALL", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_PblockLink" + }, + { + "type": "sign", + "x": 23, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_293E1E" + }, + { + "type": "sign", + "x": 23, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A753" + }, + { + "type": "sign", + "x": 25, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A75A" + }, + { + "type": "sign", + "x": 27, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A761" + }, + { + "type": "sign", + "x": 30, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A77A" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A73E" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A745" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A74C" + }, + { + "type": "sign", + "x": 27, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_Pblock1_Ask" + }, + { + "type": "sign", + "x": 27, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_293D4D" + }, + { + "type": "sign", + "x": 18, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_ContestLobby_EventScript_21A784" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc deleted file mode 100644 index e769c3c9f..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 - -LilycoveCity_CoveLilyMotel_1F_MapWarps: - warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY - warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F - -LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: - coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 - -LilycoveCity_CoveLilyMotel_1F_MapEvents:: - map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc deleted file mode 100644 index ab7811a46..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F: - .4byte LilycoveCity_CoveLilyMotel_1F_Layout - .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json new file mode 100644 index 000000000..f00b407c7 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -0,0 +1,66 @@ +{ + "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "name": "LilycoveCity_CoveLilyMotel_1F", + "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218189", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "LilycoveCity_CoveLilyMotel_1F_EventScript_218211" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc deleted file mode 100644 index b7f973a84..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT - -LilycoveCity_CoveLilyMotel_2F_MapWarps: - warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - -LilycoveCity_CoveLilyMotel_2F_MapEvents:: - map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc deleted file mode 100644 index 769cd8b0d..000000000 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F: - .4byte LilycoveCity_CoveLilyMotel_2F_Layout - .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents - .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json new file mode 100644 index 000000000..94ae04069 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -0,0 +1,120 @@ +{ + "id": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "name": "LilycoveCity_CoveLilyMotel_2F", + "layout": "LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218729", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218732", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218720", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_218744", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21873B", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_CoveLilyMotel_2F_EventScript_21874D", + "flag": "FLAG_HIDE_LILCOVE_MOTEL_SCOTT" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc deleted file mode 100644 index 307cb2d58..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 - -LilycoveCity_DepartmentStoreElevator_MapWarps: - warp_def 1, 5, 3, 127, MAP_NONE - warp_def 2, 5, 3, 127, MAP_NONE - -LilycoveCity_DepartmentStoreElevator_MapEvents:: - map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc deleted file mode 100644 index 8576dcbf2..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreElevator: - .4byte LilycoveCity_DepartmentStoreElevator_Layout - .4byte LilycoveCity_DepartmentStoreElevator_MapEvents - .4byte LilycoveCity_DepartmentStoreElevator_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json new file mode 100644 index 000000000..2c22272ac --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "name": "LilycoveCity_DepartmentStoreElevator", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreElevator_EventScript_220624", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc deleted file mode 100644 index c44562b06..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 - -LilycoveCity_DepartmentStoreRooftop_MapWarps: - warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - -LilycoveCity_DepartmentStoreRooftop_MapBGEvents: - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 - -LilycoveCity_DepartmentStoreRooftop_MapEvents:: - map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc deleted file mode 100644 index 775260145..000000000 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop: - .4byte LilycoveCity_DepartmentStoreRooftop_Layout - .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents - .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json new file mode 100644 index 000000000..784660e36 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "name": "LilycoveCity_DepartmentStoreRooftop", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220268", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22028C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_22022F", + "flag": "FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 3, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_220295" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc deleted file mode 100644 index 12d4726fb..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LilycoveCity_DepartmentStore_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 - -LilycoveCity_DepartmentStore_1F_MapWarps: - warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_1F_MapBGEvents: - bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D - -LilycoveCity_DepartmentStore_1F_MapEvents:: - map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc deleted file mode 100644 index 27ae23d5f..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_1F: - .4byte LilycoveCity_DepartmentStore_1F_Layout - .4byte LilycoveCity_DepartmentStore_1F_MapEvents - .4byte LilycoveCity_DepartmentStore_1F_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json new file mode 100644 index 000000000..58e400ff4 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -0,0 +1,137 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "name": "LilycoveCity_DepartmentStore_1F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F693", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F69C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F82F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F838", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F841", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F84A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LilycoveCity_DepartmentStore_1F_EventScript_21F85D" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc deleted file mode 100644 index 4854c51e9..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 - -LilycoveCity_DepartmentStore_2F_MapWarps: - warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F - warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_2F_MapEvents:: - map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc deleted file mode 100644 index 62f5dcab3..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_2F: - .4byte LilycoveCity_DepartmentStore_2F_Layout - .4byte LilycoveCity_DepartmentStore_2F_MapEvents - .4byte LilycoveCity_DepartmentStore_2F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json new file mode 100644 index 000000000..b3fd03f00 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "name": "LilycoveCity_DepartmentStore_2F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB2D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB36", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB3F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_2F_EventScript_21FB48", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc deleted file mode 100644 index 2eed8c39f..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 - -LilycoveCity_DepartmentStore_3F_MapWarps: - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_3F_MapEvents:: - map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc deleted file mode 100644 index 624671aea..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_3F: - .4byte LilycoveCity_DepartmentStore_3F_Layout - .4byte LilycoveCity_DepartmentStore_3F_MapEvents - .4byte LilycoveCity_DepartmentStore_3F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json new file mode 100644 index 000000000..e9d5785e6 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "name": "LilycoveCity_DepartmentStore_3F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCB6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCBF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FCC8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_3F_EventScript_21FC8C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F", + "dest_warp_id": 1 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc deleted file mode 100644 index 77df01a38..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 - -LilycoveCity_DepartmentStore_4F_MapWarps: - warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F - warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - -LilycoveCity_DepartmentStore_4F_MapEvents:: - map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc deleted file mode 100644 index df74e3c2f..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_4F: - .4byte LilycoveCity_DepartmentStore_4F_Layout - .4byte LilycoveCity_DepartmentStore_4F_MapEvents - .4byte LilycoveCity_DepartmentStore_4F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json new file mode 100644 index 000000000..b41eecd31 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "name": "LilycoveCity_DepartmentStore_4F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDEB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDF4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FDFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_4F_EventScript_21FE2C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F", + "dest_warp_id": 1 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc deleted file mode 100644 index d4492d7e9..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -LilycoveCity_DepartmentStore_5F_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 - -LilycoveCity_DepartmentStore_5F_MapWarps: - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F - warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP - -LilycoveCity_DepartmentStore_5F_MapEvents:: - map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc deleted file mode 100644 index 938cfc7b8..000000000 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_DepartmentStore_5F: - .4byte LilycoveCity_DepartmentStore_5F_Layout - .4byte LilycoveCity_DepartmentStore_5F_MapEvents - .4byte LilycoveCity_DepartmentStore_5F_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json new file mode 100644 index 000000000..6ea8bbbf2 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -0,0 +1,134 @@ +{ + "id": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "name": "LilycoveCity_DepartmentStore_5F", + "layout": "LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_2200BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22006C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFA6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_21FFDC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22000A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 17, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_22003A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_DepartmentStore_5F_EventScript_220075", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc deleted file mode 100644 index ad43f2bf1..000000000 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER - -LilycoveCity_Harbor_MapWarps: - warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY - warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY - -LilycoveCity_Harbor_MapEvents:: - map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc deleted file mode 100644 index b332f5df7..000000000 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_Harbor: - .4byte Harbor_Layout - .4byte LilycoveCity_Harbor_MapEvents - .4byte LilycoveCity_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HARBOR - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json new file mode 100644 index 000000000..1eb68641a --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_LILYCOVE_CITY_HARBOR", + "name": "LilycoveCity_Harbor", + "layout": "LAYOUT_HARBOR", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_Harbor_EventScript_21E00F", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_Harbor_EventScript_21E637", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER" + } + ], + "warp_events": [ + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 12 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 12 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc deleted file mode 100644 index 31515dae9..000000000 --- a/data/maps/LilycoveCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LilycoveCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 - -LilycoveCity_House1_MapWarps: - warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY - -LilycoveCity_House1_MapEvents:: - map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc deleted file mode 100644 index 68da92f8a..000000000 --- a/data/maps/LilycoveCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House1: - .4byte House1_Layout - .4byte LilycoveCity_House1_MapEvents - .4byte LilycoveCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json new file mode 100644 index 000000000..b8d59e953 --- /dev/null +++ b/data/maps/LilycoveCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE1", + "name": "LilycoveCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House1_EventScript_21ECCE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House1_EventScript_21ECD7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc deleted file mode 100644 index e7c1b3cd7..000000000 --- a/data/maps/LilycoveCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 - -LilycoveCity_House2_MapWarps: - warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY - warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY - -LilycoveCity_House2_MapEvents:: - map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc deleted file mode 100644 index 93ff11013..000000000 --- a/data/maps/LilycoveCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House2: - .4byte LilycoveCity_House2_Layout - .4byte LilycoveCity_House2_MapEvents - .4byte LilycoveCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json new file mode 100644 index 000000000..87f5a52d9 --- /dev/null +++ b/data/maps/LilycoveCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE2", + "name": "LilycoveCity_House2", + "layout": "LAYOUT_LILYCOVE_CITY_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House2_EventScript_21ED75", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 9 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc deleted file mode 100644 index 4e577400b..000000000 --- a/data/maps/LilycoveCity_House3/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 - object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 - object_event 4, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0 - object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 - -LilycoveCity_House3_MapWarps: - warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY - -LilycoveCity_House3_MapEvents:: - map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc deleted file mode 100644 index 3788a2ee9..000000000 --- a/data/maps/LilycoveCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House3: - .4byte House2_Layout - .4byte LilycoveCity_House3_MapEvents - .4byte LilycoveCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json new file mode 100644 index 000000000..78dffc5f0 --- /dev/null +++ b/data/maps/LilycoveCity_House3/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE3", + "name": "LilycoveCity_House3", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EF3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EE4B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EED5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EF09", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EEA1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House3_EventScript_21EE8A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc deleted file mode 100644 index aa586c64f..000000000 --- a/data/maps/LilycoveCity_House4/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -LilycoveCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 - -LilycoveCity_House4_MapWarps: - warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY - -LilycoveCity_House4_MapEvents:: - map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc deleted file mode 100644 index b0ee0ed36..000000000 --- a/data/maps/LilycoveCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_House4: - .4byte House1_Layout - .4byte LilycoveCity_House4_MapEvents - .4byte LilycoveCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json new file mode 100644 index 000000000..72cd396f0 --- /dev/null +++ b/data/maps/LilycoveCity_House4/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_LILYCOVE_CITY_HOUSE4", + "name": "LilycoveCity_House4", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House4_EventScript_21F5B5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_House4_EventScript_21F5BE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc deleted file mode 100644 index a41748c69..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1 - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4 - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 - -LilycoveCity_LilycoveMuseum_1F_MapWarps: - warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY - warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY - warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F - -LilycoveCity_LilycoveMuseum_1F_MapBGEvents: - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6 - bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA - bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4 - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8 - bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF - bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 - bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC - -LilycoveCity_LilycoveMuseum_1F_MapEvents:: - map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc deleted file mode 100644 index 7a50114fa..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F: - .4byte LilycoveCity_LilycoveMuseum_1F_Layout - .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json new file mode 100644 index 000000000..72f376e23 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -0,0 +1,302 @@ +{ + "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "name": "LilycoveCity_LilycoveMuseum_1F", + "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E19", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 19, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E42", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218E22", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3" + } + ], + "warp_events": [ + { + "x": 9, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 3 + }, + { + "x": 10, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 13 + }, + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + }, + { + "type": "sign", + "x": 6, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + }, + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DB6" + }, + { + "type": "sign", + "x": 15, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DDA" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DC8" + }, + { + "type": "sign", + "x": 17, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + }, + { + "type": "sign", + "x": 19, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + }, + { + "type": "sign", + "x": 20, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DBF" + }, + { + "type": "sign", + "x": 18, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + }, + { + "type": "sign", + "x": 18, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3" + }, + { + "type": "sign", + "x": 16, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc deleted file mode 100644 index f6969462c..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS - -LilycoveCity_LilycoveMuseum_2F_MapWarps: - warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_LilycoveMuseum_2F_MapBGEvents: - bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219951 - bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219964 - bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_219977 - bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA - -LilycoveCity_LilycoveMuseum_2F_MapEvents:: - map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc deleted file mode 100644 index f1ba72c03..000000000 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F: - .4byte LilycoveCity_LilycoveMuseum_2F_Layout - .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents - .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts - .4byte 0x0 - .2byte MUS_BIJYUTU - .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json new file mode 100644 index 000000000..ab2ae56fb --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -0,0 +1,178 @@ +{ + "id": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "name": "LilycoveCity_LilycoveMuseum_2F", + "layout": "LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F", + "music": "MUS_BIJYUTU", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219866", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21998A", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219993", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21999C", + "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + }, + { + "type": "sign", + "x": 15, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21992B" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + }, + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_21993E" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219951" + }, + { + "type": "sign", + "x": 19, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + }, + { + "type": "sign", + "x": 18, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219964" + }, + { + "type": "sign", + "x": 6, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + }, + { + "type": "sign", + "x": 7, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_219977" + }, + { + "type": "sign", + "x": 11, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + }, + { + "type": "sign", + "x": 15, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA" + } + ] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc deleted file mode 100644 index 8a606ce7e..000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_MoveDeletersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 - -LilycoveCity_MoveDeletersHouse_MapWarps: - warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY - -LilycoveCity_MoveDeletersHouse_MapEvents:: - map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc deleted file mode 100644 index 46a0f964e..000000000 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_MoveDeletersHouse: - .4byte House2_Layout - .4byte LilycoveCity_MoveDeletersHouse_MapEvents - .4byte LilycoveCity_MoveDeletersHouse_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json new file mode 100644 index 000000000..d200fad22 --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE", + "name": "LilycoveCity_MoveDeletersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_MoveDeletersHouse_EventScript_21EA0B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 5a46fe756..000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY - -LilycoveCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY - warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY - warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F - -LilycoveCity_PokemonCenter_1F_MapEvents:: - map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc deleted file mode 100644 index e264b0955..000000000 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte LilycoveCity_PokemonCenter_1F_MapEvents - .4byte LilycoveCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..b58418edd --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "name": "LilycoveCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_21C5FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A836B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_1F_EventScript_2A89C7", + "flag": "FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc deleted file mode 100644 index accbba24d..000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -LilycoveCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -LilycoveCity_PokemonCenter_2F_MapEvents:: - map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bd96ad98b..000000000 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte LilycoveCity_PokemonCenter_2F_MapEvents - .4byte LilycoveCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..346a91173 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_CENTER_2F", + "name": "LilycoveCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_LILYCOVE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc deleted file mode 100644 index f5755f50f..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0 - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, FLAG_HIDE_FANCLUB_LITTLE_BOY - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, FLAG_HIDE_FANCLUB_BOY - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, FLAG_HIDE_FANCLUB_LADY - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - -LilycoveCity_PokemonTrainerFanClub_MapWarps: - warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY - warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY - -LilycoveCity_PokemonTrainerFanClub_MapEvents:: - map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc deleted file mode 100644 index 61f306b69..000000000 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub: - .4byte LilycoveCity_PokemonTrainerFanClub_Layout - .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents - .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json new file mode 100644 index 000000000..b48876cce --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "name": "LilycoveCity_PokemonTrainerFanClub", + "layout": "LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3", + "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55", + "flag": "FLAG_HIDE_FANCLUB_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 3, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7", + "flag": "FLAG_HIDE_FANCLUB_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19", + "flag": "FLAG_HIDE_FANCLUB_OLD_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B", + "flag": "FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER" + } + ], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 13, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc deleted file mode 100644 index 5a4eeaac9..000000000 --- a/data/maps/LilycoveCity_UnusedMart/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -LilycoveCity_UnusedMart_MapWarps: - warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY - -LilycoveCity_UnusedMart_MapEvents:: - map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc deleted file mode 100644 index 188530531..000000000 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LilycoveCity_UnusedMart: - .4byte Mart_Layout - .4byte LilycoveCity_UnusedMart_MapEvents - .4byte LilycoveCity_UnusedMart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_LILYCOVE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json new file mode 100644 index 000000000..44cd20815 --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_LILYCOVE_CITY_UNUSED_MART", + "name": "LilycoveCity_UnusedMart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_LILYCOVE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_LILYCOVE_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc deleted file mode 100644 index d8a0e93d3..000000000 --- a/data/maps/LinkContestRoom1/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -LinkContestRoom1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL - object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -LinkContestRoom1_MapEvents:: - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc deleted file mode 100644 index 24a33fdfc..000000000 --- a/data/maps/LinkContestRoom1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom1: - .4byte LinkContestRoom1_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM1 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json new file mode 100644 index 000000000..538b0af69 --- /dev/null +++ b/data/maps/LinkContestRoom1/map.json @@ -0,0 +1,216 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM1", + "name": "LinkContestRoom1", + "layout": "LAYOUT_LINK_CONTEST_ROOM1", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_LINK_CONTEST_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom2/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc deleted file mode 100644 index 50d0a7425..000000000 --- a/data/maps/LinkContestRoom2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom2: - .4byte LinkContestRoom2_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM2 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json new file mode 100644 index 000000000..b02da178f --- /dev/null +++ b/data/maps/LinkContestRoom2/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM2", + "name": "LinkContestRoom2", + "layout": "LAYOUT_LINK_CONTEST_ROOM2", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom3/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc deleted file mode 100644 index 06f9ffd19..000000000 --- a/data/maps/LinkContestRoom3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom3: - .4byte LinkContestRoom3_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM3 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json new file mode 100644 index 000000000..fb0bf29e0 --- /dev/null +++ b/data/maps/LinkContestRoom3/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM3", + "name": "LinkContestRoom3", + "layout": "LAYOUT_LINK_CONTEST_ROOM3", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom4/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc deleted file mode 100644 index eba4cb0bd..000000000 --- a/data/maps/LinkContestRoom4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom4: - .4byte LinkContestRoom4_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM4 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json new file mode 100644 index 000000000..85d12ece4 --- /dev/null +++ b/data/maps/LinkContestRoom4/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM4", + "name": "LinkContestRoom4", + "layout": "LAYOUT_LINK_CONTEST_ROOM4", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom5/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc deleted file mode 100644 index 12ec2d40d..000000000 --- a/data/maps/LinkContestRoom5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom5: - .4byte LinkContestRoom5_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM5 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json new file mode 100644 index 000000000..f312d4c2b --- /dev/null +++ b/data/maps/LinkContestRoom5/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM5", + "name": "LinkContestRoom5", + "layout": "LAYOUT_LINK_CONTEST_ROOM5", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/LinkContestRoom6/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc deleted file mode 100644 index 77f1c14c7..000000000 --- a/data/maps/LinkContestRoom6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LinkContestRoom6: - .4byte LinkContestRoom6_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_CONTEST0 - .2byte LAYOUT_LINK_CONTEST_ROOM6 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json new file mode 100644 index 000000000..38bfcd979 --- /dev/null +++ b/data/maps/LinkContestRoom6/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_LINK_CONTEST_ROOM6", + "name": "LinkContestRoom6", + "layout": "LAYOUT_LINK_CONTEST_ROOM6", + "music": "MUS_CONTEST0", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc deleted file mode 100644 index bfd3b0ab7..000000000 --- a/data/maps/LittlerootTown/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -LittlerootTown_MapConnectionsList: - connection up, 0, MAP_ROUTE101 - -LittlerootTown_MapConnections: - .4byte 1 - .4byte LittlerootTown_MapConnectionsList - diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc deleted file mode 100644 index 3d81193b0..000000000 --- a/data/maps/LittlerootTown/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -LittlerootTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK - object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL - object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH - -LittlerootTown_MapWarps: - warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB - -LittlerootTown_MapCoordEvents: - coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 - coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF - coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F - coord_event 8, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81F9 - coord_event 9, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E8205 - coord_event 10, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81E1 - coord_event 11, 9, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81ED - coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB - coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE - -LittlerootTown_MapBGEvents: - bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 - bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A - bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 - bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F - -LittlerootTown_MapEvents:: - map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents - diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc deleted file mode 100644 index c1565535c..000000000 --- a/data/maps/LittlerootTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown: - .4byte LittlerootTown_Layout - .4byte LittlerootTown_MapEvents - .4byte LittlerootTown_MapScripts - .4byte LittlerootTown_MapConnections - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json new file mode 100644 index 000000000..28decfc87 --- /dev/null +++ b/data/maps/LittlerootTown/map.json @@ -0,0 +1,268 @@ +{ + "id": "MAP_LITTLEROOT_TOWN", + "name": "LittlerootTown", + "layout": "LAYOUT_LITTLEROOT_TOWN", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE101" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 16, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E8034", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 12, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E8022", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 14, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E802B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_EventScript_1E863D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "x": 2, + "y": 10, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "x": 11, + "y": 10, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCH" + } + ], + "warp_events": [ + { + "x": 14, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 16, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "LittlerootTown_EventScript_1E8091" + }, + { + "type": "trigger", + "x": 11, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 0, + "script": "LittlerootTown_EventScript_1E80EF" + }, + { + "type": "trigger", + "x": 11, + "y": 1, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 1, + "script": "LittlerootTown_EventScript_1E811F" + }, + { + "type": "trigger", + "x": 8, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81F9" + }, + { + "type": "trigger", + "x": 9, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E8205" + }, + { + "type": "trigger", + "x": 10, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81E1" + }, + { + "type": "trigger", + "x": 11, + "y": 9, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81ED" + }, + { + "type": "trigger", + "x": 10, + "y": 2, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81BB" + }, + { + "type": "trigger", + "x": 11, + "y": 2, + "elevation": 3, + "var": "VAR_0x4050", + "var_value": 3, + "script": "LittlerootTown_EventScript_1E81CE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E8151" + }, + { + "type": "sign", + "x": 6, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E815A" + }, + { + "type": "sign", + "x": 7, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E8163" + }, + { + "type": "sign", + "x": 12, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_EventScript_1E818F" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc deleted file mode 100644 index ad4d1a4a6..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -LittlerootTown_BrendansHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM - object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING - object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN - -LittlerootTown_BrendansHouse_1F_MapWarps: - warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN - warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN - warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - -LittlerootTown_BrendansHouse_1F_MapCoordEvents: - coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 - coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE - coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA - coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 - -LittlerootTown_BrendansHouse_1F_MapEvents:: - map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc deleted file mode 100644 index 44b861056..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_1F: - .4byte LittlerootTown_BrendansHouse_1F_Layout - .4byte LittlerootTown_BrendansHouse_1F_MapEvents - .4byte LittlerootTown_BrendansHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json new file mode 100644 index 000000000..79f3c75a8 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -0,0 +1,171 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "name": "LittlerootTown_BrendansHouse_1F", + "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_2929C5", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 3, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ACD", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_292ABA", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F89F3", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN" + } + ], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 8, + "elevation": 0, + "var": "VAR_0x4092", + "var_value": 4, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78A3" + }, + { + "type": "trigger", + "x": 7, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78BE" + }, + { + "type": "trigger", + "x": 8, + "y": 4, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78CA" + }, + { + "type": "trigger", + "x": 9, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_BrendansHouse_1F_EventScript_1F78D6" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc deleted file mode 100644 index 29dddeb6a..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -LittlerootTown_BrendansHouse_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL - object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL - -LittlerootTown_BrendansHouse_2F_MapWarps: - warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - -LittlerootTown_BrendansHouse_2F_MapBGEvents: - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F - -LittlerootTown_BrendansHouse_2F_MapEvents:: - map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc deleted file mode 100644 index 5bf1113dd..000000000 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_BrendansHouse_2F: - .4byte LittlerootTown_BrendansHouse_2F_Layout - .4byte LittlerootTown_BrendansHouse_2F_MapEvents - .4byte LittlerootTown_BrendansHouse_2F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json new file mode 100644 index 000000000..4adc28388 --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -0,0 +1,270 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "name": "LittlerootTown_BrendansHouse_2F", + "layout": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F94C1", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 1, + "y": 0, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 7, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8481", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWABLU_DOLL", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL" + } + ], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "EventScript_PlayerPCMale" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F8656" + }, + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_292781" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_BrendansHouse_2F_EventScript_1F865F" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc deleted file mode 100644 index 890a6a624..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -LittlerootTown_MaysHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM - object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 - object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_PLAYERS_HOUSE_DAD - object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING - object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN - -LittlerootTown_MaysHouse_1F_MapWarps: - warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN - warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN - warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F - -LittlerootTown_MaysHouse_1F_MapCoordEvents: - coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C - coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 - coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 - coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F - -LittlerootTown_MaysHouse_1F_MapEvents:: - map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc deleted file mode 100644 index 9ab1d2f8b..000000000 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_1F: - .4byte LittlerootTown_MaysHouse_1F_Layout - .4byte LittlerootTown_MaysHouse_1F_MapEvents - .4byte LittlerootTown_MaysHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json new file mode 100644 index 000000000..817def8b2 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -0,0 +1,171 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "name": "LittlerootTown_MaysHouse_1F", + "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_2929C5", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_292ABA", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_292ACD", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F89F3", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PLAYERS_HOUSE_DAD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A3D", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 2, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 8, + "elevation": 0, + "var": "VAR_0x4092", + "var_value": 4, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A4C" + }, + { + "type": "trigger", + "x": 1, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A67" + }, + { + "type": "trigger", + "x": 2, + "y": 4, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A73" + }, + { + "type": "trigger", + "x": 3, + "y": 3, + "elevation": 0, + "var": "VAR_0x408D", + "var_value": 2, + "script": "LittlerootTown_MaysHouse_1F_EventScript_1F8A7F" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc deleted file mode 100644 index b845971ec..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -LittlerootTown_MaysHouse_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL - -LittlerootTown_MaysHouse_2F_MapWarps: - warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - -LittlerootTown_MaysHouse_2F_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale - -LittlerootTown_MaysHouse_2F_MapEvents:: - map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc deleted file mode 100644 index d68d04d0d..000000000 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_MaysHouse_2F: - .4byte LittlerootTown_MaysHouse_2F_Layout - .4byte LittlerootTown_MaysHouse_2F_MapEvents - .4byte LittlerootTown_MaysHouse_2F_MapScripts - .4byte 0x0 - .2byte MUS_MISHIRO - .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json new file mode 100644 index 000000000..be1329fbd --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -0,0 +1,270 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "name": "LittlerootTown_MaysHouse_2F", + "layout": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F", + "music": "MUS_MISHIRO", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "x": 1, + "y": 1, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F94C1", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 2, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 2, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MOM", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "x": 3, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F9334", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL" + } + ], + "warp_events": [ + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F865F" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_1F8656" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_MaysHouse_2F_EventScript_29278D" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "EventScript_PlayerPCFemale" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc deleted file mode 100644 index 94baaed20..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA - -LittlerootTown_ProfessorBirchsLab_MapWarps: - warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN - warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN - -LittlerootTown_ProfessorBirchsLab_MapBGEvents: - bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4 - bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB - -LittlerootTown_ProfessorBirchsLab_MapEvents:: - map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc deleted file mode 100644 index 3cbfbdca7..000000000 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -LittlerootTown_ProfessorBirchsLab: - .4byte LittlerootTown_ProfessorBirchsLab_Layout - .4byte LittlerootTown_ProfessorBirchsLab_MapEvents - .4byte LittlerootTown_ProfessorBirchsLab_MapScripts - .4byte 0x0 - .2byte MUS_ODAMAKI - .2byte LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB - .byte MAPSEC_LITTLEROOT_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json new file mode 100644 index 000000000..2b29f99c1 --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -0,0 +1,235 @@ +{ + "id": "MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "name": "LittlerootTown_ProfessorBirchsLab", + "layout": "LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB", + "music": "MUS_ODAMAKI", + "region_map_section": "MAPSEC_LITTLEROOT_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", + "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 12, + "elevation": 0, + "dest_map": "MAP_LITTLEROOT_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + }, + { + "type": "sign", + "x": 11, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 0, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" + }, + { + "type": "sign", + "x": 4, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 1, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 1, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 11, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" + } + ] +} \ No newline at end of file diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index ee7e1730b..b47df74b8 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex 432 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex 432 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc deleted file mode 100644 index 4ee4905b6..000000000 --- a/data/maps/MagmaHideout_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MagmaHideout_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 - -MagmaHideout_1F_MapWarps: - warp_def 10, 34, 3, 4, MAP_JAGGED_PASS - warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R - warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R - warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R - -MagmaHideout_1F_MapEvents:: - map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc deleted file mode 100644 index 2f509f088..000000000 --- a/data/maps/MagmaHideout_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_1F: - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_1F_MapEvents - .4byte MagmaHideout_1F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_1F - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json new file mode 100644 index 000000000..2d07a723a --- /dev/null +++ b/data/maps/MagmaHideout_1F/map.json @@ -0,0 +1,128 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_1F", + "name": "MagmaHideout_1F", + "layout": "LAYOUT_MAGMA_HIDEOUT_1F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 4, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MagmaHideout_1F_EventScript_23988C", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2914DE", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 30, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_1F_EventScript_2398A3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_1F_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + } + ], + "warp_events": [ + { + "x": 10, + "y": 34, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 4 + }, + { + "x": 25, + "y": 34, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 1 + }, + { + "x": 31, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 22, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc deleted file mode 100644 index e88bde884..000000000 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -MagmaHideout_2F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - -MagmaHideout_2F_1R_MapWarps: - warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R - warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F - warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R - -MagmaHideout_2F_1R_MapEvents:: - map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc deleted file mode 100644 index 29de6cac7..000000000 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_1R: - .4byte MagmaHideout_2F_1R_Layout - .4byte MagmaHideout_2F_1R_MapEvents - .4byte MagmaHideout_2F_1R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_1R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json new file mode 100644 index 000000000..75db41221 --- /dev/null +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_1R", + "name": "MagmaHideout_2F_1R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_1R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 18, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 5, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MagmaHideout_2F_1R_EventScript_239B7F", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 7, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_2F_1R_EventScript_239B96", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "MagmaHideout_2F_1R_EventScript_239B51", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_2F_1R_EventScript_239B68", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + } + ], + "warp_events": [ + { + "x": 11, + "y": 23, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_2R", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 33, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc deleted file mode 100644 index 70b234139..000000000 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE - -MagmaHideout_2F_2R_MapWarps: - warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R - warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F - -MagmaHideout_2F_2R_MapEvents:: - map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc deleted file mode 100644 index 4606ef07b..000000000 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_2R: - .4byte MagmaHideout_2F_2R_Layout - .4byte MagmaHideout_2F_2R_MapEvents - .4byte MagmaHideout_2F_2R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_2R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json new file mode 100644 index 000000000..af80ea8ff --- /dev/null +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_2R", + "name": "MagmaHideout_2F_2R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_2R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 29, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "MagmaHideout_2F_2R_EventScript_239E4D", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MagmaHideout_2F_2R_EventScript_239E36", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 21, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_2F_2R_EventScript_2914EB", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_2F_2R_EventScript_239E1F", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MagmaHideout_2F_2R_EventScript_239E08", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_2F_2R_EventScript_2914F8", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 22, + "elevation": 3, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc deleted file mode 100644 index 5b12929d8..000000000 --- a/data/maps/MagmaHideout_2F_3R/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MagmaHideout_2F_3R_MapWarps: - warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F - warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R - -MagmaHideout_2F_3R_MapEvents:: - map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc deleted file mode 100644 index dd1d0d9e7..000000000 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_2F_3R: - .4byte MagmaHideout_2F_3R_Layout - .4byte MagmaHideout_2F_3R_MapEvents - .4byte MagmaHideout_2F_3R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_2F_3R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_2F_3R/map.json b/data/maps/MagmaHideout_2F_3R/map.json new file mode 100644 index 000000000..186fa9dd8 --- /dev/null +++ b/data/maps/MagmaHideout_2F_3R/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_2F_3R", + "name": "MagmaHideout_2F_3R", + "layout": "LAYOUT_MAGMA_HIDEOUT_2F_3R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_1F", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc deleted file mode 100644 index 166e88b27..000000000 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MagmaHideout_3F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET - -MagmaHideout_3F_1R_MapWarps: - warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F - warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R - warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R - -MagmaHideout_3F_1R_MapEvents:: - map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc deleted file mode 100644 index ac8d5d9b4..000000000 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_1R: - .4byte MagmaHideout_3F_1R_Layout - .4byte MagmaHideout_3F_1R_MapEvents - .4byte MagmaHideout_3F_1R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_1R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json new file mode 100644 index 000000000..ec61d2759 --- /dev/null +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_1R", + "name": "MagmaHideout_3F_1R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_1R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 2, + "y": 7, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "MagmaHideout_3F_1R_EventScript_23A1B3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 21, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_3F_1R_EventScript_23A1CA", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_1R_EventScript_291505", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET" + } + ], + "warp_events": [ + { + "x": 7, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_4F", + "dest_warp_id": 0 + }, + { + "x": 21, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_2R", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc deleted file mode 100644 index 825e8985e..000000000 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MagmaHideout_3F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX - -MagmaHideout_3F_2R_MapWarps: - warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R - -MagmaHideout_3F_2R_MapEvents:: - map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc deleted file mode 100644 index 8fbb30b18..000000000 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_2R: - .4byte MagmaHideout_3F_2R_Layout - .4byte MagmaHideout_3F_2R_MapEvents - .4byte MagmaHideout_3F_2R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_2R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json new file mode 100644 index 000000000..23e8d0b8c --- /dev/null +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_2R", + "name": "MagmaHideout_3F_2R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_2R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 16, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_3F_2R_EventScript_23A3D5", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_2R_EventScript_291512", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX" + } + ], + "warp_events": [ + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc deleted file mode 100644 index d4346a139..000000000 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MagmaHideout_3F_3R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE - -MagmaHideout_3F_3R_MapWarps: - warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R - warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F - -MagmaHideout_3F_3R_MapEvents:: - map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc deleted file mode 100644 index c676fac3d..000000000 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_3F_3R: - .4byte MagmaHideout_3F_3R_Layout - .4byte MagmaHideout_3F_3R_MapEvents - .4byte MagmaHideout_3F_3R_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_3F_3R - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_3F_3R/map.json b/data/maps/MagmaHideout_3F_3R/map.json new file mode 100644 index 000000000..40921b8ca --- /dev/null +++ b/data/maps/MagmaHideout_3F_3R/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_3F_3R", + "name": "MagmaHideout_3F_3R", + "layout": "LAYOUT_MAGMA_HIDEOUT_3F_3R", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 19, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_3F_3R_EventScript_29152C", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE" + } + ], + "warp_events": [ + { + "x": 16, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_2F_3R", + "dest_warp_id": 1 + }, + { + "x": 16, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc deleted file mode 100644 index 2fd71b3db..000000000 --- a/data/maps/MagmaHideout_4F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MagmaHideout_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 - object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 13, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6BA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, MagmaHideout_4F_EventScript_23A6D1, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 16, 21, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MagmaHideout_4F_EventScript_23A560, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS - object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE - -MagmaHideout_4F_MapWarps: - warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R - warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R - -MagmaHideout_4F_MapEvents:: - map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc deleted file mode 100644 index 82a3e66bb..000000000 --- a/data/maps/MagmaHideout_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MagmaHideout_4F: - .4byte MagmaHideout_4F_Layout - .4byte MagmaHideout_4F_MapEvents - .4byte MagmaHideout_4F_MapScripts - .4byte 0x0 - .2byte MUS_AJITO - .2byte LAYOUT_MAGMA_HIDEOUT_4F - .byte MAPSEC_MAGMA_HIDEOUT - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json new file mode 100644 index 000000000..dcec4fdb9 --- /dev/null +++ b/data/maps/MagmaHideout_4F/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_MAGMA_HIDEOUT_4F", + "name": "MagmaHideout_4F", + "layout": "LAYOUT_MAGMA_HIDEOUT_4F", + "music": "MUS_AJITO", + "region_map_section": "MAPSEC_MAGMA_HIDEOUT", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "x": 16, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 31, + "y": 22, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A68C", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 30, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A6A3", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MagmaHideout_4F_EventScript_23A6BA", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 22, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MagmaHideout_4F_EventScript_23A6D1", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 16, + "y": 21, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_4F_EventScript_23A560", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_2", + "x": 16, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MagmaHideout_4F_EventScript_29151F", + "flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE" + } + ], + "warp_events": [ + { + "x": 46, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_1R", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 21, + "elevation": 0, + "dest_map": "MAP_MAGMA_HIDEOUT_3F_3R", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc deleted file mode 100644 index 4a97b9f15..000000000 --- a/data/maps/MarineCave_End/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MarineCave_End_EventObjects: - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE - -MarineCave_End_MapWarps: - warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE - -MarineCave_End_MapCoordEvents: - coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B - -MarineCave_End_MapEvents:: - map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc deleted file mode 100644 index e2377aa4b..000000000 --- a/data/maps/MarineCave_End/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_End: - .4byte MarineCave_End_Layout - .4byte MarineCave_End_MapEvents - .4byte MarineCave_End_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_MARINE_CAVE_END - .byte MAPSEC_MARINE_CAVE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MarineCave_End/map.json b/data/maps/MarineCave_End/map.json new file mode 100644 index 000000000..017adcc9a --- /dev/null +++ b/data/maps/MarineCave_End/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_MARINE_CAVE_END", + "name": "MarineCave_End", + "layout": "LAYOUT_MARINE_CAVE_END", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "x": 9, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MARINE_CAVE_KYOGRE" + } + ], + "warp_events": [ + { + "x": 20, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MARINE_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "MarineCave_End_EventScript_23B01B" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc deleted file mode 100644 index 9e96bf225..000000000 --- a/data/maps/MarineCave_Entrance/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -MarineCave_Entrance_MapWarps: - warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END - -MarineCave_Entrance_MapEvents:: - map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc deleted file mode 100644 index a1ce8ac61..000000000 --- a/data/maps/MarineCave_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MarineCave_Entrance: - .4byte MarineCave_Entrance_Layout - .4byte MarineCave_Entrance_MapEvents - .4byte MarineCave_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_MARINE_CAVE_ENTRANCE - .byte MAPSEC_MARINE_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MarineCave_Entrance/map.json b/data/maps/MarineCave_Entrance/map.json new file mode 100644 index 000000000..545fe1c9b --- /dev/null +++ b/data/maps/MarineCave_Entrance/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_MARINE_CAVE_ENTRANCE", + "name": "MarineCave_Entrance", + "layout": "LAYOUT_MARINE_CAVE_ENTRANCE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 14, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MARINE_CAVE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc deleted file mode 100644 index 97f97982c..000000000 --- a/data/maps/MauvilleCity/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_MapConnectionsList: - connection up, 0, MAP_ROUTE111 - connection down, 0, MAP_ROUTE110 - connection left, 0, MAP_ROUTE117 - connection right, 0, MAP_ROUTE118 - -MauvilleCity_MapConnections: - .4byte 4 - .4byte MauvilleCity_MapConnectionsList - diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc deleted file mode 100644 index 961eb4005..000000000 --- a/data/maps/MauvilleCity/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -MauvilleCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 - object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, FLAG_HIDE_MAUVILLE_CITY_WALLY - object_event 7, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, FLAG_HIDE_MAUVILLE_CITY_WATTSON - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_2910CE, FLAG_ITEM_MAUVILLE_CITY_X_SPEED - object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 - object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT - -MauvilleCity_MapWarps: - warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM - warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP - warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART - warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1 - warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER - warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 - -MauvilleCity_MapBGEvents: - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 - bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 - bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A - bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A - bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3D7 - bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 - bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 - -MauvilleCity_MapEvents:: - map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents - diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc deleted file mode 100644 index 566eb49e7..000000000 --- a/data/maps/MauvilleCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity: - .4byte MauvilleCity_Layout - .4byte MauvilleCity_MapEvents - .4byte MauvilleCity_MapScripts - .4byte MauvilleCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_MAUVILLE_CITY - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json new file mode 100644 index 000000000..4ee667f2b --- /dev/null +++ b/data/maps/MauvilleCity/map.json @@ -0,0 +1,300 @@ +{ + "id": "MAP_MAUVILLE_CITY", + "name": "MauvilleCity", + "layout": "LAYOUT_MAUVILLE_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE111" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE110" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE117" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE118" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 29, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 24, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3C5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 17, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF3FB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF452", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF41D", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "x": 29, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_1DF73A", + "flag": "FLAG_HIDE_MAUVILLE_CITY_WATTSON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_2910CE", + "flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_EventScript_2C7F7E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MAUVILLE_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 8, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 35, + "y": 5, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_BIKE_SHOP", + "dest_warp_id": 0 + }, + { + "x": 23, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 13, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_GAME_CORNER", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 14, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3E0" + }, + { + "type": "sign", + "x": 24, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 25, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 24, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3D7" + }, + { + "type": "sign", + "x": 33, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3E9" + }, + { + "type": "sign", + "x": 11, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_EventScript_1DF3F2" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc deleted file mode 100644 index ac9abae2a..000000000 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 - -MauvilleCity_BikeShop_MapWarps: - warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY - -MauvilleCity_BikeShop_MapBGEvents: - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A - bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE - -MauvilleCity_BikeShop_MapEvents:: - map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents - diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc deleted file mode 100644 index 244439fed..000000000 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_BikeShop: - .4byte MauvilleCity_BikeShop_Layout - .4byte MauvilleCity_BikeShop_MapEvents - .4byte MauvilleCity_BikeShop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MAUVILLE_CITY_BIKE_SHOP - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json new file mode 100644 index 000000000..c774718f0 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_MAUVILLE_CITY_BIKE_SHOP", + "name": "MauvilleCity_BikeShop", + "layout": "LAYOUT_MAUVILLE_CITY_BIKE_SHOP", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_BikeShop_EventScript_20EBBC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_BikeShop_EventScript_20ED31", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_BikeShop_EventScript_20ED3A" + }, + { + "type": "sign", + "x": 11, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_BikeShop_EventScript_20EDAE" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc deleted file mode 100644 index c5ef3b7f6..000000000 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ /dev/null @@ -1,47 +0,0 @@ -MauvilleCity_GameCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0 - object_event 6, EVENT_OBJ_GFX_POKEFAN_M, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0 - object_event 10, EVENT_OBJ_GFX_MAN_3, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 - -MauvilleCity_GameCorner_MapWarps: - warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY - warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY - -MauvilleCity_GameCorner_MapBGEvents: - bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 - bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 - bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210336 - bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210356 - bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210376 - bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210396 - bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103B6 - bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2103D6 - bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_2103F6 - bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210416 - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_210436 - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5AB1 - bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF - -MauvilleCity_GameCorner_MapEvents:: - map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents - diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc deleted file mode 100644 index f13c98c77..000000000 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_GameCorner: - .4byte MauvilleCity_GameCorner_Layout - .4byte MauvilleCity_GameCorner_MapEvents - .4byte MauvilleCity_GameCorner_MapScripts - .4byte 0x0 - .2byte MUS_CASINO - .2byte LAYOUT_MAUVILLE_CITY_GAME_CORNER - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json new file mode 100644 index 000000000..696694a6b --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -0,0 +1,385 @@ +{ + "id": "MAP_MAUVILLE_CITY_GAME_CORNER", + "name": "MauvilleCity_GameCorner", + "layout": "LAYOUT_MAUVILLE_CITY_GAME_CORNER", + "music": "MUS_CASINO", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210125", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 16, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_21012E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FBB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FCF1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210137", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_21021D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 20, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210279", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 6, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210289", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_20FE9F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_210299", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_2102B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_GameCorner_EventScript_2102C6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 5 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2102D6" + }, + { + "type": "sign", + "x": 2, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2102F6" + }, + { + "type": "sign", + "x": 2, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_210316" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210336" + }, + { + "type": "sign", + "x": 3, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210356" + }, + { + "type": "sign", + "x": 3, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210376" + }, + { + "type": "sign", + "x": 7, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_210396" + }, + { + "type": "sign", + "x": 7, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2103B6" + }, + { + "type": "sign", + "x": 7, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_EAST", + "script": "MauvilleCity_GameCorner_EventScript_2103D6" + }, + { + "type": "sign", + "x": 8, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_2103F6" + }, + { + "type": "sign", + "x": 8, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210416" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_WEST", + "script": "MauvilleCity_GameCorner_EventScript_210436" + }, + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 14, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 14, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 15, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5AB1" + }, + { + "type": "sign", + "x": 18, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 18, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + }, + { + "type": "sign", + "x": 19, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MauvilleCity_GameCorner_EventScript_2A5ADF" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc deleted file mode 100644 index 10c3c039d..000000000 --- a/data/maps/MauvilleCity_Gym/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -MauvilleCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 1, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 - -MauvilleCity_Gym_MapWarps: - warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY - warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY - -MauvilleCity_Gym_MapCoordEvents: - coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E - coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 - coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 - coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 - -MauvilleCity_Gym_MapBGEvents: - bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B - bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B - -MauvilleCity_Gym_MapEvents:: - map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents - diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc deleted file mode 100644 index 5f9666eeb..000000000 --- a/data/maps/MauvilleCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Gym: - .4byte MauvilleCity_Gym_Layout - .4byte MauvilleCity_Gym_MapEvents - .4byte MauvilleCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_MAUVILLE_CITY_GYM - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json new file mode 100644 index 000000000..2ae4cb474 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/map.json @@ -0,0 +1,181 @@ +{ + "id": "MAP_MAUVILLE_CITY_GYM", + "name": "MauvilleCity_Gym", + "layout": "LAYOUT_MAUVILLE_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "x": 5, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Gym_EventScript_20DEEB", + "flag": "FLAG_HIDE_MAUVILLE_GYM_WATTSON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MauvilleCity_Gym_EventScript_20E0D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 1, + "y": 16, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 5, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0E7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 1, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MauvilleCity_Gym_EventScript_20E0B9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 7, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Gym_EventScript_20E12C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MauvilleCity_Gym_EventScript_20E115", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E01E" + }, + { + "type": "trigger", + "x": 3, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E043" + }, + { + "type": "trigger", + "x": 0, + "y": 15, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20DFF9" + }, + { + "type": "trigger", + "x": 8, + "y": 9, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "MauvilleCity_Gym_EventScript_20E068" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_Gym_EventScript_20E14B" + }, + { + "type": "sign", + "x": 6, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MauvilleCity_Gym_EventScript_20E15B" + } + ] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc deleted file mode 100644 index 19b88a97e..000000000 --- a/data/maps/MauvilleCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 - -MauvilleCity_House1_MapWarps: - warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY - -MauvilleCity_House1_MapEvents:: - map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc deleted file mode 100644 index c36670be5..000000000 --- a/data/maps/MauvilleCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_House1: - .4byte House2_Layout - .4byte MauvilleCity_House1_MapEvents - .4byte MauvilleCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json new file mode 100644 index 000000000..ec2d63cf9 --- /dev/null +++ b/data/maps/MauvilleCity_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAUVILLE_CITY_HOUSE1", + "name": "MauvilleCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_House1_EventScript_20F976", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc deleted file mode 100644 index a27fec042..000000000 --- a/data/maps/MauvilleCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MauvilleCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 - -MauvilleCity_House2_MapWarps: - warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY - -MauvilleCity_House2_MapEvents:: - map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc deleted file mode 100644 index 60fc3ae22..000000000 --- a/data/maps/MauvilleCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_House2: - .4byte House1_Layout - .4byte MauvilleCity_House2_MapEvents - .4byte MauvilleCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json new file mode 100644 index 000000000..f29a2a34c --- /dev/null +++ b/data/maps/MauvilleCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MAUVILLE_CITY_HOUSE2", + "name": "MauvilleCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_House2_EventScript_210C5D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc deleted file mode 100644 index 1a5f9a3b7..000000000 --- a/data/maps/MauvilleCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MauvilleCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 - -MauvilleCity_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY - -MauvilleCity_Mart_MapEvents:: - map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc deleted file mode 100644 index b986d7e3b..000000000 --- a/data/maps/MauvilleCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_Mart: - .4byte Mart_Layout - .4byte MauvilleCity_Mart_MapEvents - .4byte MauvilleCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json new file mode 100644 index 000000000..23b451ae2 --- /dev/null +++ b/data/maps/MauvilleCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MAUVILLE_CITY_MART", + "name": "MauvilleCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_2110E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_21111C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_Mart_EventScript_211125", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc deleted file mode 100644 index f97d61136..000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 - -MauvilleCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY - warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY - warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F - -MauvilleCity_PokemonCenter_1F_MapEvents:: - map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 623cd61e6..000000000 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte MauvilleCity_PokemonCenter_1F_MapEvents - .4byte MauvilleCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..3e63670ab --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "name": "MauvilleCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E78", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_28E066", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E86", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E8F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_1F_EventScript_210E98", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MAUVILLE_CITY", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc deleted file mode 100644 index b4b2d15ba..000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 - -MauvilleCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -MauvilleCity_PokemonCenter_2F_MapEvents:: - map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bde4b4376..000000000 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte MauvilleCity_PokemonCenter_2F_MapEvents - .4byte MauvilleCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_MAUVILLE_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..956868d68 --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MAUVILLE_CITY_POKEMON_CENTER_2F", + "name": "MauvilleCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MAUVILLE_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 8, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MauvilleCity_PokemonCenter_2F_EventScript_21102F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MAUVILLE_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc deleted file mode 100644 index 63c17fc0d..000000000 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ /dev/null @@ -1,29 +0,0 @@ -MeteorFalls_1F_1R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO - -MeteorFalls_1F_1R_MapWarps: - warp_def 27, 18, 4, 0, MAP_ROUTE114 - warp_def 6, 39, 3, 0, MAP_ROUTE115 - warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R - warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R - warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R - warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE - -MeteorFalls_1F_1R_MapCoordEvents: - coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F - -MeteorFalls_1F_1R_MapBGEvents: - bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 - -MeteorFalls_1F_1R_MapEvents:: - map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents - diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc deleted file mode 100644 index 5bffcd6ba..000000000 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_1R: - .4byte MeteorFalls_1F_1R_Layout - .4byte MeteorFalls_1F_1R_MapEvents - .4byte MeteorFalls_1F_1R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_1F_1R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json new file mode 100644 index 000000000..c7611f2fd --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -0,0 +1,213 @@ +{ + "id": "MAP_METEOR_FALLS_1F_1R", + "name": "MeteorFalls_1F_1R", + "layout": "LAYOUT_METEOR_FALLS_1F_1R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911AB", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911C5", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911B8", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_2911D2", + "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 14, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 6, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_METEOR_FALLS_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_1F_1R_EventScript_22BF25", + "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO" + } + ], + "warp_events": [ + { + "x": 27, + "y": 18, + "elevation": 4, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 39, + "elevation": 3, + "dest_map": "MAP_ROUTE115", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 4 + }, + { + "x": 26, + "y": 28, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 2, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_STEVENS_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 18, + "elevation": 4, + "var": "VAR_0x40BF", + "var_value": 0, + "script": "MeteorFalls_1F_1R_EventScript_22BD5F" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 58, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "0x0" + } + ] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc deleted file mode 100644 index fe845ae67..000000000 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MeteorFalls_1F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 - -MeteorFalls_1F_2R_MapWarps: - warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R - warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R - warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R - warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_1F_2R_MapBGEvents: - bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 - -MeteorFalls_1F_2R_MapEvents:: - map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents - diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc deleted file mode 100644 index 4ee1d78c9..000000000 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_1F_2R: - .4byte MeteorFalls_1F_2R_Layout - .4byte MeteorFalls_1F_2R_MapEvents - .4byte MeteorFalls_1F_2R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_1F_2R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json new file mode 100644 index 000000000..f1e47c986 --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -0,0 +1,98 @@ +{ + "id": "MAP_METEOR_FALLS_1F_2R", + "name": "MeteorFalls_1F_2R", + "layout": "LAYOUT_METEOR_FALLS_1F_2R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C4DE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C540", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MeteorFalls_1F_2R_EventScript_22C5A4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 29, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 14, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 20, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 23, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 58, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "0x0" + } + ] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc deleted file mode 100644 index 1407f4e99..000000000 --- a/data/maps/MeteorFalls_B1F_1R/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MeteorFalls_B1F_1R_MapWarps: - warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R - warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R - warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R - warp_def 17, 3, 3, 0, MAP_METEOR_FALLS_B1F_2R - warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R - warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R - -MeteorFalls_B1F_1R_MapEvents:: - map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc deleted file mode 100644 index 9ae4d6e68..000000000 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_1R: - .4byte MeteorFalls_B1F_1R_Layout - .4byte MeteorFalls_B1F_1R_MapEvents - .4byte MeteorFalls_B1F_1R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_B1F_1R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json new file mode 100644 index 000000000..c234bd8b8 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -0,0 +1,63 @@ +{ + "id": "MAP_METEOR_FALLS_B1F_1R", + "name": "MeteorFalls_B1F_1R", + "layout": "LAYOUT_METEOR_FALLS_B1F_1R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 6, + "elevation": 4, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 11, + "elevation": 5, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 2 + }, + { + "x": 18, + "y": 15, + "elevation": 4, + "dest_map": "MAP_METEOR_FALLS_1F_2R", + "dest_warp_id": 3 + }, + { + "x": 17, + "y": 3, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_2R", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 23, + "elevation": 5, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 3 + }, + { + "x": 20, + "y": 36, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc deleted file mode 100644 index fb1826f6e..000000000 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MeteorFalls_B1F_2R_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 - -MeteorFalls_B1F_2R_MapWarps: - warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_B1F_2R_MapEvents:: - map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc deleted file mode 100644 index d48c61b6d..000000000 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_B1F_2R: - .4byte MeteorFalls_B1F_2R_Layout - .4byte MeteorFalls_B1F_2R_MapEvents - .4byte MeteorFalls_B1F_2R_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_B1F_2R - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json new file mode 100644 index 000000000..527813efb --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_METEOR_FALLS_B1F_2R", + "name": "MeteorFalls_B1F_2R", + "layout": "LAYOUT_METEOR_FALLS_B1F_2R", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_B1F_2R_EventScript_2911DF", + "flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02" + } + ], + "warp_events": [ + { + "x": 5, + "y": 15, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_B1F_1R", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc deleted file mode 100644 index c9fcf8bd3..000000000 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MeteorFalls_StevensCave_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 - -MeteorFalls_StevensCave_MapWarps: - warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R - -MeteorFalls_StevensCave_MapEvents:: - map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc deleted file mode 100644 index c615b53de..000000000 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MeteorFalls_StevensCave: - .4byte MeteorFalls_StevensCave_Layout - .4byte MeteorFalls_StevensCave_MapEvents - .4byte MeteorFalls_StevensCave_MapScripts - .4byte 0x0 - .2byte MUS_DAN03 - .2byte LAYOUT_METEOR_FALLS_STEVENS_CAVE - .byte MAPSEC_METEOR_FALLS - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MeteorFalls_StevensCave/map.json b/data/maps/MeteorFalls_StevensCave/map.json new file mode 100644 index 000000000..b3d696c8e --- /dev/null +++ b/data/maps/MeteorFalls_StevensCave/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_METEOR_FALLS_STEVENS_CAVE", + "name": "MeteorFalls_StevensCave", + "layout": "LAYOUT_METEOR_FALLS_STEVENS_CAVE", + "music": "MUS_DAN03", + "region_map_section": "MAPSEC_METEOR_FALLS", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 19, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MeteorFalls_StevensCave_EventScript_23B182", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 29, + "elevation": 3, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc deleted file mode 100644 index f797b84c8..000000000 --- a/data/maps/MirageTower_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_1F_MapWarps: - warp_def 10, 14, 3, 3, MAP_ROUTE111 - warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F - -MirageTower_1F_MapEvents:: - map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc deleted file mode 100644 index 67035316e..000000000 --- a/data/maps/MirageTower_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_1F: - .4byte MirageTower_1F_Layout - .4byte MirageTower_1F_MapEvents - .4byte MirageTower_1F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_1F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_1F/map.json b/data/maps/MirageTower_1F/map.json new file mode 100644 index 000000000..886e0bf88 --- /dev/null +++ b/data/maps/MirageTower_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MIRAGE_TOWER_1F", + "name": "MirageTower_1F", + "layout": "LAYOUT_MIRAGE_TOWER_1F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 14, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 3 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc deleted file mode 100644 index 6cbb1fb37..000000000 --- a/data/maps/MirageTower_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -MirageTower_2F_MapWarps: - warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F - warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F - -MirageTower_2F_MapEvents:: - map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc deleted file mode 100644 index 65a5c4665..000000000 --- a/data/maps/MirageTower_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_2F: - .4byte MirageTower_2F_Layout - .4byte MirageTower_2F_MapEvents - .4byte MirageTower_2F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_2F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_2F/map.json b/data/maps/MirageTower_2F/map.json new file mode 100644 index 000000000..d8953d3da --- /dev/null +++ b/data/maps/MirageTower_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_MIRAGE_TOWER_2F", + "name": "MirageTower_2F", + "layout": "LAYOUT_MIRAGE_TOWER_2F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 18, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_3F", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_1F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc deleted file mode 100644 index 9fbc189dd..000000000 --- a/data/maps/MirageTower_3F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 - -MirageTower_3F_MapWarps: - warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F - warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F - -MirageTower_3F_MapEvents:: - map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc deleted file mode 100644 index 565ff1f6d..000000000 --- a/data/maps/MirageTower_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_3F: - .4byte MirageTower_3F_Layout - .4byte MirageTower_3F_MapEvents - .4byte MirageTower_3F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_3F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_3F/map.json b/data/maps/MirageTower_3F/map.json new file mode 100644 index 000000000..7ba9772da --- /dev/null +++ b/data/maps/MirageTower_3F/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MIRAGE_TOWER_3F", + "name": "MirageTower_3F", + "layout": "LAYOUT_MIRAGE_TOWER_3F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_3F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_3F_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + } + ], + "warp_events": [ + { + "x": 18, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_2F", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 4, + "elevation": 0, + "dest_map": "MAP_MIRAGE_TOWER_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc deleted file mode 100644 index a2b22cad1..000000000 --- a/data/maps/MirageTower_4F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MirageTower_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL - object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 - -MirageTower_4F_MapWarps: - warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F - -MirageTower_4F_MapEvents:: - map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc deleted file mode 100644 index b3bc8341a..000000000 --- a/data/maps/MirageTower_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MirageTower_4F: - .4byte MirageTower_4F_Layout - .4byte MirageTower_4F_MapEvents - .4byte MirageTower_4F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MIRAGE_TOWER_4F - .byte MAPSEC_MIRAGE_TOWER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MirageTower_4F/map.json b/data/maps/MirageTower_4F/map.json new file mode 100644 index 000000000..a39ed14a9 --- /dev/null +++ b/data/maps/MirageTower_4F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_MIRAGE_TOWER_4F", + "name": "MirageTower_4F", + "layout": "LAYOUT_MIRAGE_TOWER_4F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MIRAGE_TOWER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 5, + "y": 4, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_23AD48", + "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_23AD89", + "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MirageTower_4F_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + } + ], + "warp_events": [ + { + "x": 1, + "y": 4, + "elevation": 3, + "dest_map": "MAP_MIRAGE_TOWER_3F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc deleted file mode 100644 index c22091fe7..000000000 --- a/data/maps/MossdeepCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_MapConnectionsList: - connection up, 0, MAP_ROUTE125 - connection down, 0, MAP_ROUTE127 - connection left, -40, MAP_ROUTE124 - -MossdeepCity_MapConnections: - .4byte 3 - .4byte MossdeepCity_MapConnectionsList - diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc deleted file mode 100644 index a8284ae5d..000000000 --- a/data/maps/MossdeepCity/events.inc +++ /dev/null @@ -1,56 +0,0 @@ -MossdeepCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 - object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_1E4AF0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, FLAG_ITEM_MOSSDEEP_CITY_NET_BALL - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 55, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_1E4B0B, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4C26, 0 - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 23, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 24, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 25, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 44, 26, 5, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 45, 25, 5, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA - object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 25, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_2C81EE, 0 - object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT - object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 - -MossdeepCity_MapWarps: - warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 - warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM - warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 67, 25, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2 - warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART - warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3 - warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE - warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4 - warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_MapCoordEvents: - coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 - coord_event 42, 21, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 22, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 23, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 41, 24, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 - -MossdeepCity_MapBGEvents: - bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 - bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D - bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 - bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A - bg_event 66, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B2F - bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 - bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A - bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 - -MossdeepCity_MapEvents:: - map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents - diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc deleted file mode 100644 index 5ac6ceeaa..000000000 --- a/data/maps/MossdeepCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity: - .4byte MossdeepCity_Layout - .4byte MossdeepCity_MapEvents - .4byte MossdeepCity_MapScripts - .4byte MossdeepCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json new file mode 100644 index 000000000..66d426780 --- /dev/null +++ b/data/maps/MossdeepCity/map.json @@ -0,0 +1,485 @@ +{ + "id": "MAP_MOSSDEEP_CITY", + "name": "MossdeepCity", + "layout": "LAYOUT_MOSSDEEP_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": -40, + "map": "MAP_ROUTE124" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 38, + "y": 12, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AD1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 50, + "y": 34, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AF9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 32, + "y": 12, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AB2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 26, + "y": 21, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4AF0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 45, + "y": 18, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4B02", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 62, + "y": 35, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_2910F5", + "flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 55, + "y": 5, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 56, + "y": 21, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4B0B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 23, + "y": 13, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C26", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 23, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 24, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 25, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 44, + "y": 26, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 45, + "y": 25, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 19, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_2C81EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 61, + "y": 29, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C85", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 31, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_EventScript_1E4C7C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 28, + "y": 16, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 25, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 37, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 49, + "y": 6, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 10, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 16, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_HOUSE4", + "dest_warp_id": 1 + }, + { + "x": 64, + "y": 15, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 24, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 25, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 26, + "y": 25, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 32, + "y": 27, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 33, + "y": 27, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_EventScript_1E4B38" + }, + { + "type": "trigger", + "x": 42, + "y": 21, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 22, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 23, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 41, + "y": 24, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 40, + "y": 25, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + }, + { + "type": "trigger", + "x": 40, + "y": 26, + "elevation": 5, + "var": "VAR_0x405D", + "var_value": 1, + "script": "MossdeepCity_EventScript_1E4B41" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 25, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B26" + }, + { + "type": "sign", + "x": 34, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B1D" + }, + { + "type": "sign", + "x": 29, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 38, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 66, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B2F" + }, + { + "type": "sign", + "x": 30, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 39, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 57, + "y": 21, + "elevation": 7, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_EventScript_1E4B14" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc deleted file mode 100644 index e9b491f4d..000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MossdeepCity_GameCorner_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 - -MossdeepCity_GameCorner_1F_MapWarps: - warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY - warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY - warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F - -MossdeepCity_GameCorner_1F_MapBGEvents: - bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 - -MossdeepCity_GameCorner_1F_MapEvents:: - map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents - diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc deleted file mode 100644 index 572a5fbe9..000000000 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_1F: - .4byte MossdeepCity_GameCorner_1F_Layout - .4byte MossdeepCity_GameCorner_1F_MapEvents - .4byte MossdeepCity_GameCorner_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json new file mode 100644 index 000000000..ffb52896e --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -0,0 +1,94 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "name": "MossdeepCity_GameCorner_1F", + "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_GameCorner_1F_EventScript_224B54", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_GameCorner_1F_EventScript_224B4B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 9 + }, + { + "x": 2, + "y": 0, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 0, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_224B5D" + }, + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_277E9D" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_GameCorner_1F_EventScript_277E96" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc deleted file mode 100644 index d86974ae9..000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_GameCorner_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 - -MossdeepCity_GameCorner_B1F_MapWarps: - warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_GameCorner_B1F_MapEvents:: - map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc deleted file mode 100644 index ee2f55731..000000000 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_GameCorner_B1F: - .4byte MossdeepCity_GameCorner_B1F_Layout - .4byte MossdeepCity_GameCorner_B1F_MapEvents - .4byte MossdeepCity_GameCorner_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json new file mode 100644 index 000000000..4469b2642 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GAME_CORNER_B1F", + "name": "MossdeepCity_GameCorner_B1F", + "layout": "LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GAME_CORNER_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc deleted file mode 100644 index bc18f4eb7..000000000 --- a/data/maps/MossdeepCity_Gym/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -MossdeepCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 4, 23, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 6, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 5, 33, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 24, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 - object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 2, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 1, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 30, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 5, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0 - object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0 - object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 11, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 12, 34, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 22, 25, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0 - object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 27, EVENT_OBJ_GFX_LASS, 0, 25, 25, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0 - object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 22, 23, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0 - object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 21, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 22, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 25, 22, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0 - object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 24, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -MossdeepCity_Gym_MapWarps: - warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY - warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY - warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM - warp_def 1, 23, 3, 2, MAP_MOSSDEEP_CITY_GYM - warp_def 7, 18, 0, 5, MAP_MOSSDEEP_CITY_GYM - warp_def 8, 12, 0, 4, MAP_MOSSDEEP_CITY_GYM - warp_def 9, 18, 0, 7, MAP_MOSSDEEP_CITY_GYM - warp_def 23, 20, 0, 6, MAP_MOSSDEEP_CITY_GYM - warp_def 1, 33, 3, 9, MAP_MOSSDEEP_CITY_GYM - warp_def 20, 24, 0, 8, MAP_MOSSDEEP_CITY_GYM - warp_def 11, 3, 0, 11, MAP_MOSSDEEP_CITY_GYM - warp_def 11, 35, 3, 10, MAP_MOSSDEEP_CITY_GYM - warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM - warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM - -MossdeepCity_Gym_MapCoordEvents: - coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 - coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D - coord_event 15, 34, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C93 - coord_event 23, 24, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 23, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CA9 - coord_event 8, 6, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220CBF - coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 - coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 - -MossdeepCity_Gym_MapBGEvents: - bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 - bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 - -MossdeepCity_Gym_MapEvents:: - map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents - diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc deleted file mode 100644 index e596d834b..000000000 --- a/data/maps/MossdeepCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Gym: - .4byte MossdeepCity_Gym_Layout - .4byte MossdeepCity_Gym_MapEvents - .4byte MossdeepCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_MOSSDEEP_CITY_GYM - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json new file mode 100644 index 000000000..37c41435b --- /dev/null +++ b/data/maps/MossdeepCity_Gym/map.json @@ -0,0 +1,687 @@ +{ + "id": "MAP_MOSSDEEP_CITY_GYM", + "name": "MossdeepCity_Gym", + "layout": "LAYOUT_MOSSDEEP_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TATE", + "x": 23, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 1, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220AFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 5, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B2B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B70", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 23, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B59", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B14", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 6, + "y": 3, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B42", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 5, + "y": 33, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220C11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LIZA", + "x": 24, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Gym_EventScript_220898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 2, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 1, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 5, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 7, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B9E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220B87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 11, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 12, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 22, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BCC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 23, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 25, + "y": 25, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 22, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 21, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 21, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 22, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 25, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MossdeepCity_Gym_EventScript_220BE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 24, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 24, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 23, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 28, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 23, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 8, + "y": 12, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 18, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 7 + }, + { + "x": 23, + "y": 20, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 33, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 20, + "y": 24, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 11, + "y": 3, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 11 + }, + { + "x": 11, + "y": 35, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 13, + "y": 32, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 13 + }, + { + "x": 21, + "y": 10, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_GYM", + "dest_warp_id": 12 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 21, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C67" + }, + { + "type": "trigger", + "x": 8, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C7D" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C7D" + }, + { + "type": "trigger", + "x": 15, + "y": 34, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C93" + }, + { + "type": "trigger", + "x": 23, + "y": 24, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CA9" + }, + { + "type": "trigger", + "x": 23, + "y": 21, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CA9" + }, + { + "type": "trigger", + "x": 8, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220CBF" + }, + { + "type": "trigger", + "x": 21, + "y": 6, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220AF1" + }, + { + "type": "trigger", + "x": 3, + "y": 30, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "MossdeepCity_Gym_EventScript_220C67" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_Gym_EventScript_220C33" + }, + { + "type": "sign", + "x": 8, + "y": 34, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "MossdeepCity_Gym_EventScript_220C43" + } + ] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc deleted file mode 100644 index c16a852df..000000000 --- a/data/maps/MossdeepCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MossdeepCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 - -MossdeepCity_House1_MapWarps: - warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY - -MossdeepCity_House1_MapEvents:: - map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc deleted file mode 100644 index c0a3de2c9..000000000 --- a/data/maps/MossdeepCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House1: - .4byte House2_Layout - .4byte MossdeepCity_House1_MapEvents - .4byte MossdeepCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json new file mode 100644 index 000000000..55e573f69 --- /dev/null +++ b/data/maps/MossdeepCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE1", + "name": "MossdeepCity_House1", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House1_EventScript_221FD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House1_EventScript_222006", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc deleted file mode 100644 index 57d398ce9..000000000 --- a/data/maps/MossdeepCity_House2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL - -MossdeepCity_House2_MapWarps: - warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY - warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY - -MossdeepCity_House2_MapEvents:: - map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc deleted file mode 100644 index ffa15e327..000000000 --- a/data/maps/MossdeepCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House2: - .4byte House1_Layout - .4byte MossdeepCity_House2_MapEvents - .4byte MossdeepCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json new file mode 100644 index 000000000..7f2121b7f --- /dev/null +++ b/data/maps/MossdeepCity_House2/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE2", + "name": "MossdeepCity_House2", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220DF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House2_EventScript_2220F1", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc deleted file mode 100644 index 7eb2c3416..000000000 --- a/data/maps/MossdeepCity_House3/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -MossdeepCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 - -MossdeepCity_House3_MapWarps: - warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY - -MossdeepCity_House3_MapEvents:: - map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc deleted file mode 100644 index b8caf392d..000000000 --- a/data/maps/MossdeepCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House3: - .4byte House2_Layout - .4byte MossdeepCity_House3_MapEvents - .4byte MossdeepCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json new file mode 100644 index 000000000..1f28d4d22 --- /dev/null +++ b/data/maps/MossdeepCity_House3/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE3", + "name": "MossdeepCity_House3", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House3_EventScript_2225C3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc deleted file mode 100644 index 71dd54a5e..000000000 --- a/data/maps/MossdeepCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 - -MossdeepCity_House4_MapWarps: - warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY - warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY - -MossdeepCity_House4_MapEvents:: - map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc deleted file mode 100644 index 1e748b7b4..000000000 --- a/data/maps/MossdeepCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_House4: - .4byte HouseWithBed_Layout - .4byte MossdeepCity_House4_MapEvents - .4byte MossdeepCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json new file mode 100644 index 000000000..9f9f01ebd --- /dev/null +++ b/data/maps/MossdeepCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MOSSDEEP_CITY_HOUSE4", + "name": "MossdeepCity_House4", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222DD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222DF7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_House4_EventScript_222E1E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 7 + }, + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc deleted file mode 100644 index 770cb7ee5..000000000 --- a/data/maps/MossdeepCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 - -MossdeepCity_Mart_MapWarps: - warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY - -MossdeepCity_Mart_MapEvents:: - map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc deleted file mode 100644 index 75ea708d1..000000000 --- a/data/maps/MossdeepCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_Mart: - .4byte Mart_Layout - .4byte MossdeepCity_Mart_MapEvents - .4byte MossdeepCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json new file mode 100644 index 000000000..6b739a2d2 --- /dev/null +++ b/data/maps/MossdeepCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_MOSSDEEP_CITY_MART", + "name": "MossdeepCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223C8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_2223FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_Mart_EventScript_222408", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 53aa69470..000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 - -MossdeepCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY - warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY - warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F - -MossdeepCity_PokemonCenter_1F_MapEvents:: - map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 719394a94..000000000 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte MossdeepCity_PokemonCenter_1F_MapEvents - .4byte MossdeepCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..6f1f3f774 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "name": "MossdeepCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_22224E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_22225C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_1F_EventScript_222265", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc deleted file mode 100644 index ce27a0804..000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 - -MossdeepCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -MossdeepCity_PokemonCenter_2F_MapEvents:: - map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 7bb1d541c..000000000 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte MossdeepCity_PokemonCenter_2F_MapEvents - .4byte MossdeepCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..7aa2e7ccb --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F", + "name": "MossdeepCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_PokemonCenter_2F_EventScript_22235B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc deleted file mode 100644 index 84466046f..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -MossdeepCity_SpaceCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA - object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY - object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN - -MossdeepCity_SpaceCenter_1F_MapWarps: - warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY - warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY - warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F - -MossdeepCity_SpaceCenter_1F_MapEvents:: - map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc deleted file mode 100644 index 5bce64c21..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_1F: - .4byte MossdeepCity_SpaceCenter_1F_Layout - .4byte MossdeepCity_SpaceCenter_1F_MapEvents - .4byte MossdeepCity_SpaceCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json new file mode 100644 index 000000000..f53950394 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -0,0 +1,186 @@ +{ + "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "name": "MossdeepCity_SpaceCenter_1F", + "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_222FD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223063", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22308E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223168", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22312D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231DA", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231F1", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_223208", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_22321F", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 2, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231CF", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_1F_EventScript_2231B9", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 8 + }, + { + "x": 8, + "y": 9, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 8 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc deleted file mode 100644 index 624185dfc..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MossdeepCity_SpaceCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 - object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA - -MossdeepCity_SpaceCenter_2F_MapWarps: - warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - -MossdeepCity_SpaceCenter_2F_MapEvents:: - map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc deleted file mode 100644 index 1d6b5834f..000000000 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_SpaceCenter_2F: - .4byte MossdeepCity_SpaceCenter_2F_Layout - .4byte MossdeepCity_SpaceCenter_2F_MapEvents - .4byte MossdeepCity_SpaceCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json new file mode 100644 index 000000000..a40f6ca9d --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -0,0 +1,146 @@ +{ + "id": "MAP_MOSSDEEP_CITY_SPACE_CENTER_2F", + "name": "MossdeepCity_SpaceCenter_2F", + "layout": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F03", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223EC8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223E8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F7A", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F3E", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F50", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F47", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 0, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F59", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 1, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_SpaceCenter_2F_EventScript_223F6F", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY_SPACE_CENTER_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc deleted file mode 100644 index c9fa20d62..000000000 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -MossdeepCity_StevensHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY - -MossdeepCity_StevensHouse_MapWarps: - warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY - -MossdeepCity_StevensHouse_MapBGEvents: - bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 - -MossdeepCity_StevensHouse_MapEvents:: - map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents - diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc deleted file mode 100644 index a6e197f20..000000000 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_StevensHouse: - .4byte MossdeepCity_StevensHouse_Layout - .4byte MossdeepCity_StevensHouse_MapEvents - .4byte MossdeepCity_StevensHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE - .byte MAPSEC_MOSSDEEP_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json new file mode 100644 index 000000000..beedbd75a --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_MOSSDEEP_CITY_STEVENS_HOUSE", + "name": "MossdeepCity_StevensHouse", + "layout": "LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_MOSSDEEP_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_222912", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_222841", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MossdeepCity_StevensHouse_EventScript_22291B", + "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_MOSSDEEP_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 1, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MossdeepCity_StevensHouse_EventScript_222909" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc deleted file mode 100644 index e341872a7..000000000 --- a/data/maps/MtChimney/events.inc +++ /dev/null @@ -1,45 +0,0 @@ -MtChimney_EventObjects: - object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F05C, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F053, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F065, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY - object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F09C, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_22F085, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 25, EVENT_OBJ_GFX_EXPERT_F, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_22F14A, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1C3, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_22F1DA, FLAG_HIDE_MT_CHIMNEY_TRAINERS - object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA - object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS - -MtChimney_MapWarps: - warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION - warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION - warp_def 20, 41, 3, 2, MAP_JAGGED_PASS - warp_def 21, 41, 3, 3, MAP_JAGGED_PASS - -MtChimney_MapBGEvents: - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 - bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 - -MtChimney_MapEvents:: - map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents - diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc deleted file mode 100644 index a7f03617e..000000000 --- a/data/maps/MtChimney/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney: - .4byte MtChimney_Layout - .4byte MtChimney_MapEvents - .4byte MtChimney_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_MT_CHIMNEY - .byte MAPSEC_MT_CHIMNEY - .byte 0 - .byte WEATHER_ASH - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json new file mode 100644 index 000000000..b8dd7bb09 --- /dev/null +++ b/data/maps/MtChimney/map.json @@ -0,0 +1,457 @@ +{ + "id": "MAP_MT_CHIMNEY", + "name": "MtChimney", + "layout": "LAYOUT_MT_CHIMNEY", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_MT_CHIMNEY", + "requires_flash": false, + "weather": "WEATHER_ASH", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 24, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EDD5", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EE0B", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtChimney_EventScript_22F06E", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0C0", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0B7", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 19, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F05C", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 29, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F053", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 31, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F065", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 19, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22EEF3", + "flag": "FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 22, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0C9", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_RUN_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 23, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0A5", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 23, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 22, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 23, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0AE", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 21, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F09C", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 30, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 29, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 31, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F085", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 20, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0DB", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 21, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_EventScript_22F0D2", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F14A", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "MtChimney_EventScript_22F1AC", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 29, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1C3", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 27, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1DA", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 13, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtChimney_EventScript_22F1F1", + "flag": "FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "MtChimney_EventScript_22F208", + "flag": "FLAG_HIDE_MT_CHIMNEY_TRAINERS" + } + ], + "warp_events": [ + { + "x": 17, + "y": 36, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 36, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 41, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 2 + }, + { + "x": 21, + "y": 41, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MtChimney_EventScript_22F0E4" + }, + { + "type": "sign", + "x": 24, + "y": 37, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "MtChimney_EventScript_22F141" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc deleted file mode 100644 index 24f64fbbb..000000000 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -MtChimney_CableCarStation_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - -MtChimney_CableCarStation_MapWarps: - warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY - warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY - -MtChimney_CableCarStation_MapEvents:: - map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc deleted file mode 100644 index 7b3d628cc..000000000 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtChimney_CableCarStation: - .4byte CableCarStation_Layout - .4byte MtChimney_CableCarStation_MapEvents - .4byte MtChimney_CableCarStation_MapScripts - .4byte 0x0 - .2byte MUS_DOORO_X1 - .2byte LAYOUT_CABLE_CAR_STATION - .byte MAPSEC_MT_CHIMNEY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json new file mode 100644 index 000000000..155686bbb --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_MT_CHIMNEY_CABLE_CAR_STATION", + "name": "MtChimney_CableCarStation", + "layout": "LAYOUT_CABLE_CAR_STATION", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_MT_CHIMNEY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtChimney_CableCarStation_EventScript_22AC4B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 11, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 11, + "elevation": 0, + "dest_map": "MAP_MT_CHIMNEY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc deleted file mode 100644 index 7b1d79e16..000000000 --- a/data/maps/MtPyre_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -MtPyre_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 - -MtPyre_1F_MapWarps: - warp_def 17, 18, 3, 0, MAP_ROUTE122 - warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR - warp_def 18, 18, 3, 0, MAP_ROUTE122 - warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR - warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F - warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F - -MtPyre_1F_MapEvents:: - map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc deleted file mode 100644 index b4d6603df..000000000 --- a/data/maps/MtPyre_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F: - .4byte MtPyre_1F_Layout - .4byte MtPyre_1F_MapEvents - .4byte MtPyre_1F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_1F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json new file mode 100644 index 000000000..1969ba9cd --- /dev/null +++ b/data/maps/MtPyre_1F/map.json @@ -0,0 +1,103 @@ +{ + "id": "MAP_MT_PYRE_1F", + "name": "MtPyre_1F", + "layout": "LAYOUT_MT_PYRE_1F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 21, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F3F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 17, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F78", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_1F_EventScript_230F81", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 17, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROUTE122", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 18, + "elevation": 3, + "dest_map": "MAP_ROUTE122", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc deleted file mode 100644 index f0ec0d0a3..000000000 --- a/data/maps/MtPyre_2F/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -MtPyre_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 - object_event 4, EVENT_OBJ_GFX_POKEFAN_M, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_23111F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23115A, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MtPyre_2F_EventScript_23113F, 0 - object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 - object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 - -MtPyre_2F_MapWarps: - warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F - warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F - warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F - warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F - warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F - -MtPyre_2F_MapEvents:: - map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc deleted file mode 100644 index b1906b82e..000000000 --- a/data/maps/MtPyre_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_2F: - .4byte MtPyre_2F_Layout - .4byte MtPyre_2F_MapEvents - .4byte MtPyre_2F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_2F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json new file mode 100644 index 000000000..07b20b3b3 --- /dev/null +++ b/data/maps/MtPyre_2F/map.json @@ -0,0 +1,161 @@ +{ + "id": "MAP_MT_PYRE_2F", + "name": "MtPyre_2F", + "layout": "LAYOUT_MT_PYRE_2F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_231128", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_2912FD", + "flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_231116", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_2F_EventScript_23111F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtPyre_2F_EventScript_23115A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "MtPyre_2F_EventScript_23113F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_23118C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_2F_EventScript_231175", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 5 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc deleted file mode 100644 index 4d6f3c9ea..000000000 --- a/data/maps/MtPyre_3F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -MtPyre_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 - -MtPyre_3F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F - warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F - warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F - warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F - warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F - warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F - -MtPyre_3F_MapEvents:: - map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc deleted file mode 100644 index 96026c7d9..000000000 --- a/data/maps/MtPyre_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F: - .4byte MtPyre_3F_Layout - .4byte MtPyre_3F_MapEvents - .4byte MtPyre_3F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_3F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json new file mode 100644 index 000000000..a1b39048e --- /dev/null +++ b/data/maps/MtPyre_3F/map.json @@ -0,0 +1,116 @@ +{ + "id": "MAP_MT_PYRE_3F", + "name": "MtPyre_3F", + "layout": "LAYOUT_MT_PYRE_3F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_231753", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_23176A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_3F_EventScript_29130A", + "flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "MtPyre_3F_EventScript_231781", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 4 + }, + { + "x": 1, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 5 + }, + { + "x": 10, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_2F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc deleted file mode 100644 index 030039d18..000000000 --- a/data/maps/MtPyre_4F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE - -MtPyre_4F_MapWarps: - warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F - warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F - warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F - warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F - warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F - warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F - -MtPyre_4F_MapEvents:: - map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc deleted file mode 100644 index 86edc3843..000000000 --- a/data/maps/MtPyre_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_4F: - .4byte MtPyre_4F_Layout - .4byte MtPyre_4F_MapEvents - .4byte MtPyre_4F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_4F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json new file mode 100644 index 000000000..a7bf954e7 --- /dev/null +++ b/data/maps/MtPyre_4F/map.json @@ -0,0 +1,90 @@ +{ + "id": "MAP_MT_PYRE_4F", + "name": "MtPyre_4F", + "layout": "LAYOUT_MT_PYRE_4F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_4F_EventScript_231C6E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_4F_EventScript_291317", + "flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 3 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_3F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc deleted file mode 100644 index fd6261356..000000000 --- a/data/maps/MtPyre_5F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_5F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE - -MtPyre_5F_MapWarps: - warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F - warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F - warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F - warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F - warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F - -MtPyre_5F_MapEvents:: - map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc deleted file mode 100644 index 8296f03dc..000000000 --- a/data/maps/MtPyre_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_5F: - .4byte MtPyre_5F_Layout - .4byte MtPyre_5F_MapEvents - .4byte MtPyre_5F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_5F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json new file mode 100644 index 000000000..b27d426ac --- /dev/null +++ b/data/maps/MtPyre_5F/map.json @@ -0,0 +1,83 @@ +{ + "id": "MAP_MT_PYRE_5F", + "name": "MtPyre_5F", + "layout": "LAYOUT_MT_PYRE_5F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "MtPyre_5F_EventScript_231BC9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_5F_EventScript_291324", + "flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_6F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 5, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_6F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 12, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_4F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc deleted file mode 100644 index df862d84e..000000000 --- a/data/maps/MtPyre_6F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -MtPyre_6F_EventObjects: - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 - -MtPyre_6F_MapWarps: - warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F - warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F - -MtPyre_6F_MapEvents:: - map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc deleted file mode 100644 index ca0e545aa..000000000 --- a/data/maps/MtPyre_6F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_6F: - .4byte MtPyre_6F_Layout - .4byte MtPyre_6F_MapEvents - .4byte MtPyre_6F_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_MT_PYRE_6F - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json new file mode 100644 index 000000000..a169953f2 --- /dev/null +++ b/data/maps/MtPyre_6F/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_MT_PYRE_6F", + "name": "MtPyre_6F", + "layout": "LAYOUT_MT_PYRE_6F", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_6F_EventScript_231D3B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_6F_EventScript_291331", + "flag": "FLAG_ITEM_MT_PYRE_6F_TM_30" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_6F_EventScript_231D9D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_5F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc deleted file mode 100644 index 1b8248e02..000000000 --- a/data/maps/MtPyre_Exterior/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -MtPyre_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 - -MtPyre_Exterior_MapWarps: - warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F - warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT - warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT - -MtPyre_Exterior_MapCoordEvents: - coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 - coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED - -MtPyre_Exterior_MapBGEvents: - bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL - bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER - -MtPyre_Exterior_MapEvents:: - map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents - diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc deleted file mode 100644 index 9b9dfe1fa..000000000 --- a/data/maps/MtPyre_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Exterior: - .4byte MtPyre_Exterior_Layout - .4byte MtPyre_Exterior_MapEvents - .4byte MtPyre_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_EXTERIOR - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json new file mode 100644 index 000000000..2075fed62 --- /dev/null +++ b/data/maps/MtPyre_Exterior/map.json @@ -0,0 +1,132 @@ +{ + "id": "MAP_MT_PYRE_EXTERIOR", + "name": "MtPyre_Exterior", + "layout": "LAYOUT_MT_PYRE_EXTERIOR", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Exterior_EventScript_29133E", + "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Exterior_EventScript_29134B", + "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48" + } + ], + "warp_events": [ + { + "x": 10, + "y": 42, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_SUMMIT", + "dest_warp_id": 1 + }, + { + "x": 20, + "y": 10, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_SUMMIT", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 24, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + }, + { + "type": "trigger", + "x": 25, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + }, + { + "type": "trigger", + "x": 22, + "y": 27, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FF2" + }, + { + "type": "trigger", + "x": 23, + "y": 28, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FF2" + }, + { + "type": "trigger", + "x": 26, + "y": 21, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "MtPyre_Exterior_EventScript_231FED" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 8, + "elevation": 0, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 16, + "y": 22, + "elevation": 0, + "item": "ITEM_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER" + } + ] +} \ No newline at end of file diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc deleted file mode 100644 index abe957f28..000000000 --- a/data/maps/MtPyre_Summit/events.inc +++ /dev/null @@ -1,30 +0,0 @@ -MtPyre_Summit_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA - object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE - -MtPyre_Summit_MapWarps: - warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR - -MtPyre_Summit_MapCoordEvents: - coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 - coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 - coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 - coord_event 22, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321EC - coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 - coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 - -MtPyre_Summit_MapBGEvents: - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY - -MtPyre_Summit_MapEvents:: - map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents - diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc deleted file mode 100644 index 483afb989..000000000 --- a/data/maps/MtPyre_Summit/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_Summit: - .4byte MtPyre_Summit_Layout - .4byte MtPyre_Summit_MapEvents - .4byte MtPyre_Summit_MapScripts - .4byte 0x0 - .2byte MUS_MACHUPI - .2byte LAYOUT_MT_PYRE_SUMMIT - .byte MAPSEC_MT_PYRE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json new file mode 100644 index 000000000..cc9efce09 --- /dev/null +++ b/data/maps/MtPyre_Summit/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_MT_PYRE_SUMMIT", + "name": "MtPyre_Summit", + "layout": "LAYOUT_MT_PYRE_SUMMIT", + "music": "MUS_MACHUPI", + "region_map_section": "MAPSEC_MT_PYRE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_23213C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "MtPyre_Summit_EventScript_2321A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_2323FD", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232414", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_23242B", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 25, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "MtPyre_Summit_EventScript_232442", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE" + } + ], + "warp_events": [ + { + "x": 22, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 23, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + }, + { + "x": 24, + "y": 31, + "elevation": 3, + "dest_map": "MAP_MT_PYRE_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 22, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232018" + }, + { + "type": "trigger", + "x": 23, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232024" + }, + { + "type": "trigger", + "x": 24, + "y": 7, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 0, + "script": "MtPyre_Summit_EventScript_232030" + }, + { + "type": "trigger", + "x": 22, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321EC" + }, + { + "type": "trigger", + "x": 23, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_2321F8" + }, + { + "type": "trigger", + "x": 24, + "y": 9, + "elevation": 3, + "var": "VAR_0x40B9", + "var_value": 2, + "script": "MtPyre_Summit_EventScript_232204" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 9, + "y": 25, + "elevation": 0, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC" + }, + { + "type": "hidden_item", + "x": 37, + "y": 7, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc deleted file mode 100644 index 5142b09a2..000000000 --- a/data/maps/NavelRock_B1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_B1F_MapWarps: - warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE - warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK - -NavelRock_B1F_MapEvents:: - map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc deleted file mode 100644 index 08842ade1..000000000 --- a/data/maps/NavelRock_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_B1F: - .4byte NavelRock_B1F_Layout - .4byte NavelRock_B1F_MapEvents - .4byte NavelRock_B1F_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_B1F - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_B1F/map.json b/data/maps/NavelRock_B1F/map.json new file mode 100644 index 000000000..6b5cd0089 --- /dev/null +++ b/data/maps/NavelRock_B1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_B1F", + "name": "NavelRock_B1F", + "layout": "LAYOUT_NAVEL_ROCK_B1F", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc deleted file mode 100644 index 16fa053ce..000000000 --- a/data/maps/NavelRock_Bottom/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -NavelRock_Bottom_EventObjects: - object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA - -NavelRock_Bottom_MapWarps: - warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 - -NavelRock_Bottom_MapEvents:: - map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc deleted file mode 100644 index b768e916a..000000000 --- a/data/maps/NavelRock_Bottom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Bottom: - .4byte NavelRock_Bottom_Layout - .4byte NavelRock_Bottom_MapEvents - .4byte NavelRock_Bottom_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_BOTTOM - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Bottom/map.json b/data/maps/NavelRock_Bottom/map.json new file mode 100644 index 000000000..e4fb5a2fe --- /dev/null +++ b/data/maps/NavelRock_Bottom/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_NAVEL_ROCK_BOTTOM", + "name": "NavelRock_Bottom", + "layout": "LAYOUT_NAVEL_ROCK_BOTTOM", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LUGIA", + "x": 11, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Bottom_EventScript_2692A2", + "flag": "FLAG_HIDE_LUGIA" + } + ], + "warp_events": [ + { + "x": 14, + "y": 19, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_DOWN11", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc deleted file mode 100644 index 9874119a9..000000000 --- a/data/maps/NavelRock_Down01/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down01_MapWarps: - warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 - -NavelRock_Down01_MapEvents:: - map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc deleted file mode 100644 index 7cddeeae7..000000000 --- a/data/maps/NavelRock_Down01/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down01: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down01_MapEvents - .4byte NavelRock_Down01_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down01/map.json b/data/maps/NavelRock_Down01/map.json new file mode 100644 index 000000000..50f60b52e --- /dev/null +++ b/data/maps/NavelRock_Down01/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN01", + "name": "NavelRock_Down01", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN02", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc deleted file mode 100644 index 449085ea5..000000000 --- a/data/maps/NavelRock_Down02/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down02_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 - -NavelRock_Down02_MapEvents:: - map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc deleted file mode 100644 index 03d45822b..000000000 --- a/data/maps/NavelRock_Down02/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down02: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down02_MapEvents - .4byte NavelRock_Down02_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down02/map.json b/data/maps/NavelRock_Down02/map.json new file mode 100644 index 000000000..fb2d15145 --- /dev/null +++ b/data/maps/NavelRock_Down02/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN02", + "name": "NavelRock_Down02", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN01", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN03", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc deleted file mode 100644 index 7b74ad412..000000000 --- a/data/maps/NavelRock_Down03/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down03_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 - -NavelRock_Down03_MapEvents:: - map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc deleted file mode 100644 index 694f840e4..000000000 --- a/data/maps/NavelRock_Down03/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down03: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down03_MapEvents - .4byte NavelRock_Down03_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down03/map.json b/data/maps/NavelRock_Down03/map.json new file mode 100644 index 000000000..a82e03610 --- /dev/null +++ b/data/maps/NavelRock_Down03/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN03", + "name": "NavelRock_Down03", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN02", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN04", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc deleted file mode 100644 index 5459b1d50..000000000 --- a/data/maps/NavelRock_Down04/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down04_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 - -NavelRock_Down04_MapEvents:: - map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc deleted file mode 100644 index 0275b6422..000000000 --- a/data/maps/NavelRock_Down04/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down04: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down04_MapEvents - .4byte NavelRock_Down04_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down04/map.json b/data/maps/NavelRock_Down04/map.json new file mode 100644 index 000000000..58e81b709 --- /dev/null +++ b/data/maps/NavelRock_Down04/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN04", + "name": "NavelRock_Down04", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN03", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN05", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc deleted file mode 100644 index de52fa07f..000000000 --- a/data/maps/NavelRock_Down05/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down05_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 - -NavelRock_Down05_MapEvents:: - map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc deleted file mode 100644 index 50e298b6e..000000000 --- a/data/maps/NavelRock_Down05/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down05: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down05_MapEvents - .4byte NavelRock_Down05_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down05/map.json b/data/maps/NavelRock_Down05/map.json new file mode 100644 index 000000000..a1fcef804 --- /dev/null +++ b/data/maps/NavelRock_Down05/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN05", + "name": "NavelRock_Down05", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN04", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN06", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc deleted file mode 100644 index 54e5f229e..000000000 --- a/data/maps/NavelRock_Down06/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down06_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 - -NavelRock_Down06_MapEvents:: - map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc deleted file mode 100644 index 8e18db5b9..000000000 --- a/data/maps/NavelRock_Down06/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down06: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down06_MapEvents - .4byte NavelRock_Down06_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down06/map.json b/data/maps/NavelRock_Down06/map.json new file mode 100644 index 000000000..204a2a2cf --- /dev/null +++ b/data/maps/NavelRock_Down06/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN06", + "name": "NavelRock_Down06", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN05", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN07", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc deleted file mode 100644 index 55b4dd10c..000000000 --- a/data/maps/NavelRock_Down07/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down07_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 - -NavelRock_Down07_MapEvents:: - map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc deleted file mode 100644 index 75c41046e..000000000 --- a/data/maps/NavelRock_Down07/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down07: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down07_MapEvents - .4byte NavelRock_Down07_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down07/map.json b/data/maps/NavelRock_Down07/map.json new file mode 100644 index 000000000..f48063d8a --- /dev/null +++ b/data/maps/NavelRock_Down07/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN07", + "name": "NavelRock_Down07", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN06", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN08", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc deleted file mode 100644 index b1180ed83..000000000 --- a/data/maps/NavelRock_Down08/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down08_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 - -NavelRock_Down08_MapEvents:: - map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc deleted file mode 100644 index bcb69b412..000000000 --- a/data/maps/NavelRock_Down08/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down08: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down08_MapEvents - .4byte NavelRock_Down08_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down08/map.json b/data/maps/NavelRock_Down08/map.json new file mode 100644 index 000000000..d5f7ea8fe --- /dev/null +++ b/data/maps/NavelRock_Down08/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN08", + "name": "NavelRock_Down08", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN07", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN09", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc deleted file mode 100644 index e7279c4d0..000000000 --- a/data/maps/NavelRock_Down09/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down09_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 - -NavelRock_Down09_MapEvents:: - map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc deleted file mode 100644 index cb80dd7fa..000000000 --- a/data/maps/NavelRock_Down09/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down09: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down09_MapEvents - .4byte NavelRock_Down09_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down09/map.json b/data/maps/NavelRock_Down09/map.json new file mode 100644 index 000000000..348739b31 --- /dev/null +++ b/data/maps/NavelRock_Down09/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN09", + "name": "NavelRock_Down09", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN08", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN10", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc deleted file mode 100644 index b9eadabf1..000000000 --- a/data/maps/NavelRock_Down10/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down10_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 - -NavelRock_Down10_MapEvents:: - map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc deleted file mode 100644 index 308a89e05..000000000 --- a/data/maps/NavelRock_Down10/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down10: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Down10_MapEvents - .4byte NavelRock_Down10_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down10/map.json b/data/maps/NavelRock_Down10/map.json new file mode 100644 index 000000000..3aa128fa0 --- /dev/null +++ b/data/maps/NavelRock_Down10/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN10", + "name": "NavelRock_Down10", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN09", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN11", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc deleted file mode 100644 index 9822ee8ff..000000000 --- a/data/maps/NavelRock_Down11/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Down11_MapWarps: - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 - -NavelRock_Down11_MapEvents:: - map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc deleted file mode 100644 index 2c5a0862b..000000000 --- a/data/maps/NavelRock_Down11/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Down11: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Down11_MapEvents - .4byte NavelRock_Down11_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Down11/map.json b/data/maps/NavelRock_Down11/map.json new file mode 100644 index 000000000..0ed44f0fc --- /dev/null +++ b/data/maps/NavelRock_Down11/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_DOWN11", + "name": "NavelRock_Down11", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_BOTTOM", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN10", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc deleted file mode 100644 index b063f08d8..000000000 --- a/data/maps/NavelRock_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Entrance_MapWarps: - warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F - warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR - -NavelRock_Entrance_MapEvents:: - map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc deleted file mode 100644 index 793ab85cd..000000000 --- a/data/maps/NavelRock_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Entrance: - .4byte NavelRock_Entrance_Layout - .4byte NavelRock_Entrance_MapEvents - .4byte NavelRock_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_ENTRANCE - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Entrance/map.json b/data/maps/NavelRock_Entrance/map.json new file mode 100644 index 000000000..983df45df --- /dev/null +++ b/data/maps/NavelRock_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_ENTRANCE", + "name": "NavelRock_Entrance", + "layout": "LAYOUT_NAVEL_ROCK_ENTRANCE", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 26, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc deleted file mode 100644 index 1ec151c8c..000000000 --- a/data/maps/NavelRock_Exterior/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Exterior_MapWarps: - warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR - warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE - -NavelRock_Exterior_MapEvents:: - map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc deleted file mode 100644 index f355dbf55..000000000 --- a/data/maps/NavelRock_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Exterior: - .4byte NavelRock_Exterior_Layout - .4byte NavelRock_Exterior_MapEvents - .4byte NavelRock_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANASHIMA - .2byte LAYOUT_NAVEL_ROCK_EXTERIOR - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Exterior/map.json b/data/maps/NavelRock_Exterior/map.json new file mode 100644 index 000000000..b98f08d4e --- /dev/null +++ b/data/maps/NavelRock_Exterior/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_EXTERIOR", + "name": "NavelRock_Exterior", + "layout": "LAYOUT_NAVEL_ROCK_EXTERIOR", + "music": "MUS_RG_NANASHIMA", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 10, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc deleted file mode 100644 index fde5e5930..000000000 --- a/data/maps/NavelRock_Fork/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -NavelRock_Fork_MapWarps: - warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 - warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F - warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 - -NavelRock_Fork_MapEvents:: - map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc deleted file mode 100644 index 01e4f7bcc..000000000 --- a/data/maps/NavelRock_Fork/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Fork: - .4byte NavelRock_Fork_Layout - .4byte NavelRock_Fork_MapEvents - .4byte NavelRock_Fork_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_FORK - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Fork/map.json b/data/maps/NavelRock_Fork/map.json new file mode 100644 index 000000000..728b8a7aa --- /dev/null +++ b/data/maps/NavelRock_Fork/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_NAVEL_ROCK_FORK", + "name": "NavelRock_Fork", + "layout": "LAYOUT_NAVEL_ROCK_FORK", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP1", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 79, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_B1F", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 6, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_DOWN01", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc deleted file mode 100644 index 0c687f1fc..000000000 --- a/data/maps/NavelRock_Harbor/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -NavelRock_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -NavelRock_Harbor_MapWarps: - warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR - -NavelRock_Harbor_MapEvents:: - map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc deleted file mode 100644 index 2af7e6e35..000000000 --- a/data/maps/NavelRock_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Harbor: - .4byte IslandHarbor_Layout - .4byte NavelRock_Harbor_MapEvents - .4byte NavelRock_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANASHIMA - .2byte LAYOUT_ISLAND_HARBOR - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Harbor/map.json b/data/maps/NavelRock_Harbor/map.json new file mode 100644 index 000000000..39c8d9f0f --- /dev/null +++ b/data/maps/NavelRock_Harbor/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_NAVEL_ROCK_HARBOR", + "name": "NavelRock_Harbor", + "layout": "LAYOUT_ISLAND_HARBOR", + "music": "MUS_RG_NANASHIMA", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 8, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NavelRock_Harbor_EventScript_2690BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 2, + "elevation": 0, + "dest_map": "MAP_NAVEL_ROCK_EXTERIOR", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc deleted file mode 100644 index 7ba534d02..000000000 --- a/data/maps/NavelRock_Top/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top_EventObjects: - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH - -NavelRock_Top_MapWarps: - warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 - -NavelRock_Top_MapCoordEvents: - coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F - -NavelRock_Top_MapBGEvents: - bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH - -NavelRock_Top_MapEvents:: - map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents - diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc deleted file mode 100644 index 6e8acfce8..000000000 --- a/data/maps/NavelRock_Top/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Top: - .4byte NavelRock_Top_Layout - .4byte NavelRock_Top_MapEvents - .4byte NavelRock_Top_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_TOP - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Top/map.json b/data/maps/NavelRock_Top/map.json new file mode 100644 index 000000000..cc2070e7e --- /dev/null +++ b/data/maps/NavelRock_Top/map.json @@ -0,0 +1,61 @@ +{ + "id": "MAP_NAVEL_ROCK_TOP", + "name": "NavelRock_Top", + "layout": "LAYOUT_NAVEL_ROCK_TOP", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_HOOH", + "x": 12, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_HO_OH" + } + ], + "warp_events": [ + { + "x": 13, + "y": 20, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP4", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NavelRock_Top_EventScript_26916F" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 9, + "elevation": 3, + "item": "ITEM_SACRED_ASH", + "flag": "FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH" + } + ] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc deleted file mode 100644 index c0dba5dd3..000000000 --- a/data/maps/NavelRock_Up1/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up1_MapWarps: - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 - -NavelRock_Up1_MapEvents:: - map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc deleted file mode 100644 index 2ddaf1dcc..000000000 --- a/data/maps/NavelRock_Up1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up1: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Up1_MapEvents - .4byte NavelRock_Up1_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up1/map.json b/data/maps/NavelRock_Up1/map.json new file mode 100644 index 000000000..24d1b5a32 --- /dev/null +++ b/data/maps/NavelRock_Up1/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP1", + "name": "NavelRock_Up1", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_FORK", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc deleted file mode 100644 index 8d6f64dbc..000000000 --- a/data/maps/NavelRock_Up2/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up2_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 - -NavelRock_Up2_MapEvents:: - map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc deleted file mode 100644 index 68fe366f2..000000000 --- a/data/maps/NavelRock_Up2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up2: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Up2_MapEvents - .4byte NavelRock_Up2_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up2/map.json b/data/maps/NavelRock_Up2/map.json new file mode 100644 index 000000000..2d16e798c --- /dev/null +++ b/data/maps/NavelRock_Up2/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP2", + "name": "NavelRock_Up2", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP1", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc deleted file mode 100644 index 3853f75c7..000000000 --- a/data/maps/NavelRock_Up3/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up3_MapWarps: - warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 - warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 - -NavelRock_Up3_MapEvents:: - map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc deleted file mode 100644 index b357349b7..000000000 --- a/data/maps/NavelRock_Up3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up3: - .4byte NavelRock_LadderRoom1_Layout - .4byte NavelRock_Up3_MapEvents - .4byte NavelRock_Up3_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up3/map.json b/data/maps/NavelRock_Up3/map.json new file mode 100644 index 000000000..2e984b379 --- /dev/null +++ b/data/maps/NavelRock_Up3/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP3", + "name": "NavelRock_Up3", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM1", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP2", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc deleted file mode 100644 index 449e1f29d..000000000 --- a/data/maps/NavelRock_Up4/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -NavelRock_Up4_MapWarps: - warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 - warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP - -NavelRock_Up4_MapEvents:: - map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc deleted file mode 100644 index 4c44746f0..000000000 --- a/data/maps/NavelRock_Up4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NavelRock_Up4: - .4byte NavelRock_LadderRoom2_Layout - .4byte NavelRock_Up4_MapEvents - .4byte NavelRock_Up4_MapScripts - .4byte 0x0 - .2byte MUS_RG_NANADUNGEON - .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 - .byte MAPSEC_NAVEL_ROCK2 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NavelRock_Up4/map.json b/data/maps/NavelRock_Up4/map.json new file mode 100644 index 000000000..e448e6a9a --- /dev/null +++ b/data/maps/NavelRock_Up4/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_NAVEL_ROCK_UP4", + "name": "NavelRock_Up4", + "layout": "LAYOUT_NAVEL_ROCK_LADDER_ROOM2", + "music": "MUS_RG_NANADUNGEON", + "region_map_section": "MAPSEC_NAVEL_ROCK2", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 3, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_UP3", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 5, + "elevation": 3, + "dest_map": "MAP_NAVEL_ROCK_TOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc deleted file mode 100644 index d230fc4e9..000000000 --- a/data/maps/NewMauville_Entrance/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -NewMauville_Entrance_MapWarps: - warp_def 4, 6, 3, 0, MAP_ROUTE110 - warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE - -NewMauville_Entrance_MapCoordEvents: - coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF - -NewMauville_Entrance_MapEvents:: - map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 - diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc deleted file mode 100644 index c0b8938ca..000000000 --- a/data/maps/NewMauville_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Entrance: - .4byte NewMauville_Entrance_Layout - .4byte NewMauville_Entrance_MapEvents - .4byte NewMauville_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_NEW_MAUVILLE_ENTRANCE - .byte MAPSEC_NEW_MAUVILLE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json new file mode 100644 index 000000000..bfc15c8a0 --- /dev/null +++ b/data/maps/NewMauville_Entrance/map.json @@ -0,0 +1,45 @@ +{ + "id": "MAP_NEW_MAUVILLE_ENTRANCE", + "name": "NewMauville_Entrance", + "layout": "LAYOUT_NEW_MAUVILLE_ENTRANCE", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_NEW_MAUVILLE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 4, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_INSIDE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 2, + "elevation": 3, + "var": "VAR_0x40BA", + "var_value": 0, + "script": "NewMauville_Entrance_EventScript_2372FF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc deleted file mode 100644 index c366496f4..000000000 --- a/data/maps/NewMauville_Inside/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -NewMauville_Inside_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291213, FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291220, FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377AF, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 - -NewMauville_Inside_MapWarps: - warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE - -NewMauville_Inside_MapCoordEvents: - coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 - coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 - coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 - -NewMauville_Inside_MapBGEvents: - bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F - -NewMauville_Inside_MapEvents:: - map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents - diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc deleted file mode 100644 index c4e736885..000000000 --- a/data/maps/NewMauville_Inside/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -NewMauville_Inside: - .4byte NewMauville_Inside_Layout - .4byte NewMauville_Inside_MapEvents - .4byte NewMauville_Inside_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_NEW_MAUVILLE_INSIDE - .byte MAPSEC_NEW_MAUVILLE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json new file mode 100644 index 000000000..223faec2d --- /dev/null +++ b/data/maps/NewMauville_Inside/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_NEW_MAUVILLE_INSIDE", + "name": "NewMauville_Inside", + "layout": "LAYOUT_NEW_MAUVILLE_INSIDE", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_NEW_MAUVILLE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2911EC", + "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2911F9", + "flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291206", + "flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 17, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291213", + "flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_291220", + "flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2377AF", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_2377FC", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "NewMauville_Inside_EventScript_237849", + "flag": "FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3" + } + ], + "warp_events": [ + { + "x": 32, + "y": 33, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 30, + "y": 38, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 18, + "y": 36, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 4, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 16, + "y": 22, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 25, + "y": 18, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 2, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 6, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237459" + }, + { + "type": "trigger", + "x": 17, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "NewMauville_Inside_EventScript_237471" + }, + { + "type": "trigger", + "x": 33, + "y": 6, + "elevation": 3, + "var": "VAR_0x40BA", + "var_value": 1, + "script": "NewMauville_Inside_EventScript_237725" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 32, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 32, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 33, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 34, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + }, + { + "type": "sign", + "x": 35, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "NewMauville_Inside_EventScript_23778F" + } + ] +} \ No newline at end of file diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc deleted file mode 100644 index a82523c9c..000000000 --- a/data/maps/OldaleTown/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -OldaleTown_MapConnectionsList: - connection up, 0, MAP_ROUTE103 - connection down, 0, MAP_ROUTE101 - connection left, 0, MAP_ROUTE102 - -OldaleTown_MapConnections: - .4byte 3 - .4byte OldaleTown_MapConnectionsList - diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc deleted file mode 100644 index aa56e67f6..000000000 --- a/data/maps/OldaleTown/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -OldaleTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL - -OldaleTown_MapWarps: - warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 - warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 - warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART - -OldaleTown_MapCoordEvents: - coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F - coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 - coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 - coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 - -OldaleTown_MapBGEvents: - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA - bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 - bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A - bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A - -OldaleTown_MapEvents:: - map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents - diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc deleted file mode 100644 index 30025e1f1..000000000 --- a/data/maps/OldaleTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown: - .4byte OldaleTown_Layout - .4byte OldaleTown_MapEvents - .4byte OldaleTown_MapScripts - .4byte OldaleTown_MapConnections - .2byte MUS_MACHI_S4 - .2byte LAYOUT_OLDALE_TOWN - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json new file mode 100644 index 000000000..378d108e2 --- /dev/null +++ b/data/maps/OldaleTown/map.json @@ -0,0 +1,196 @@ +{ + "id": "MAP_OLDALE_TOWN", + "name": "OldaleTown", + "layout": "LAYOUT_OLDALE_TOWN", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE103" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE101" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE102" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 16, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E8EF3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E8EFC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E901F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_EventScript_1E9070", + "flag": "FLAG_HIDE_OLDALE_TOWN_RIVAL" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 16, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 6, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 0, + "y": 10, + "elevation": 3, + "var": "VAR_0x4051", + "var_value": 0, + "script": "OldaleTown_EventScript_1E903F" + }, + { + "type": "trigger", + "x": 8, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E9086" + }, + { + "type": "trigger", + "x": 9, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E90A6" + }, + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_0x40C7", + "var_value": 1, + "script": "OldaleTown_EventScript_1E90C6" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "OldaleTown_EventScript_1E8EEA" + }, + { + "type": "sign", + "x": 7, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 15, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 8, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "OldaleTown_EventScript_271E6A" + } + ] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc deleted file mode 100644 index 8fc37079c..000000000 --- a/data/maps/OldaleTown_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -OldaleTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 - -OldaleTown_House1_MapWarps: - warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN - warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN - -OldaleTown_House1_MapEvents:: - map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc deleted file mode 100644 index 7dc2d6b70..000000000 --- a/data/maps/OldaleTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House1: - .4byte House1_Layout - .4byte OldaleTown_House1_MapEvents - .4byte OldaleTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json new file mode 100644 index 000000000..fe0ac7b6a --- /dev/null +++ b/data/maps/OldaleTown_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_OLDALE_TOWN_HOUSE1", + "name": "OldaleTown_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House1_EventScript_1FBE86", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc deleted file mode 100644 index 45678ebb8..000000000 --- a/data/maps/OldaleTown_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -OldaleTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 - -OldaleTown_House2_MapWarps: - warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN - -OldaleTown_House2_MapEvents:: - map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc deleted file mode 100644 index 4ae5e078c..000000000 --- a/data/maps/OldaleTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_House2: - .4byte House2_Layout - .4byte OldaleTown_House2_MapEvents - .4byte OldaleTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S4 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json new file mode 100644 index 000000000..2de7632fd --- /dev/null +++ b/data/maps/OldaleTown_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_OLDALE_TOWN_HOUSE2", + "name": "OldaleTown_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MACHI_S4", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House2_EventScript_1FBF5B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_House2_EventScript_1FBF64", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc deleted file mode 100644 index 2d29aedba..000000000 --- a/data/maps/OldaleTown_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -OldaleTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 - -OldaleTown_Mart_MapWarps: - warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN - -OldaleTown_Mart_MapEvents:: - map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc deleted file mode 100644 index a371273bd..000000000 --- a/data/maps/OldaleTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_Mart: - .4byte Mart_Layout - .4byte OldaleTown_Mart_MapEvents - .4byte OldaleTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json new file mode 100644 index 000000000..1226dd17f --- /dev/null +++ b/data/maps/OldaleTown_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_OLDALE_TOWN_MART", + "name": "OldaleTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC240", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC28A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_Mart_EventScript_1FC2A9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc deleted file mode 100644 index f05c854b4..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 - -OldaleTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN - warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN - warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F - -OldaleTown_PokemonCenter_1F_MapEvents:: - map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 394ca4969..000000000 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte OldaleTown_PokemonCenter_1F_MapEvents - .4byte OldaleTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..94cbe1627 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "name": "OldaleTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC01A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC028", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC031", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_1F_EventScript_1FC03A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_OLDALE_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 2f155ed57..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -OldaleTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -OldaleTown_PokemonCenter_2F_MapEvents:: - map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc deleted file mode 100644 index 33437b863..000000000 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -OldaleTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte OldaleTown_PokemonCenter_2F_MapEvents - .4byte OldaleTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_OLDALE_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..7a899e4a9 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_OLDALE_TOWN_POKEMON_CENTER_2F", + "name": "OldaleTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_OLDALE_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "OldaleTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_OLDALE_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc deleted file mode 100644 index bea3619dd..000000000 --- a/data/maps/PacifidlogTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -PacifidlogTown_MapConnectionsList: - connection left, 0, MAP_ROUTE132 - connection right, 0, MAP_ROUTE131 - -PacifidlogTown_MapConnections: - .4byte 2 - .4byte PacifidlogTown_MapConnectionsList - diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc deleted file mode 100644 index 2754afc4d..000000000 --- a/data/maps/PacifidlogTown/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -PacifidlogTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 - -PacifidlogTown_MapWarps: - warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 - warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 - warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3 - warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 - warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 - -PacifidlogTown_MapBGEvents: - bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 - bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 - -PacifidlogTown_MapEvents:: - map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents - diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc deleted file mode 100644 index 0232c0613..000000000 --- a/data/maps/PacifidlogTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown: - .4byte PacifidlogTown_Layout - .4byte PacifidlogTown_MapEvents - .4byte PacifidlogTown_MapScripts - .4byte PacifidlogTown_MapConnections - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json new file mode 100644 index 000000000..1219eabad --- /dev/null +++ b/data/maps/PacifidlogTown/map.json @@ -0,0 +1,139 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN", + "name": "PacifidlogTown", + "layout": "LAYOUT_PACIFIDLOG_TOWN", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE132" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE131" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 10, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBACC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 11, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBAD5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 9, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_EventScript_1EBAC3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 15, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 13, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 22, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 24, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 2, + "y": 12, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 21, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN_HOUSE5", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PacifidlogTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 7, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PacifidlogTown_EventScript_1EBADE" + }, + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PacifidlogTown_EventScript_271E73" + } + ] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc deleted file mode 100644 index 3b5b06af7..000000000 --- a/data/maps/PacifidlogTown_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 - -PacifidlogTown_House1_MapWarps: - warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House1_MapEvents:: - map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc deleted file mode 100644 index 53a3499ce..000000000 --- a/data/maps/PacifidlogTown_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House1: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House1_MapEvents - .4byte PacifidlogTown_House1_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json new file mode 100644 index 000000000..19f592374 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE1", + "name": "PacifidlogTown_House1", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House1_EventScript_20365D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House1_EventScript_203666", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc deleted file mode 100644 index 5a521ab4b..000000000 --- a/data/maps/PacifidlogTown_House2/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PacifidlogTown_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 - -PacifidlogTown_House2_MapWarps: - warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House2_MapEvents:: - map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc deleted file mode 100644 index f41349ba5..000000000 --- a/data/maps/PacifidlogTown_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House2: - .4byte PacifidlogTown_House2_Layout - .4byte PacifidlogTown_House2_MapEvents - .4byte PacifidlogTown_House2_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json new file mode 100644 index 000000000..370b37d73 --- /dev/null +++ b/data/maps/PacifidlogTown_House2/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE2", + "name": "PacifidlogTown_House2", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_203792", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_203891", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House2_EventScript_2038AC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc deleted file mode 100644 index 7f18a831e..000000000 --- a/data/maps/PacifidlogTown_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 - -PacifidlogTown_House3_MapWarps: - warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House3_MapEvents:: - map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc deleted file mode 100644 index 9f6286b13..000000000 --- a/data/maps/PacifidlogTown_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House3: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House3_MapEvents - .4byte PacifidlogTown_House3_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json new file mode 100644 index 000000000..578824525 --- /dev/null +++ b/data/maps/PacifidlogTown_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE3", + "name": "PacifidlogTown_House3", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House3_EventScript_203CB5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House3_EventScript_203C11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc deleted file mode 100644 index ed736434f..000000000 --- a/data/maps/PacifidlogTown_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -PacifidlogTown_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 - -PacifidlogTown_House4_MapWarps: - warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House4_MapEvents:: - map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc deleted file mode 100644 index ff9240d0d..000000000 --- a/data/maps/PacifidlogTown_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House4: - .4byte PacifidlogTown_House2_Layout - .4byte PacifidlogTown_House4_MapEvents - .4byte PacifidlogTown_House4_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json new file mode 100644 index 000000000..2db52fe9b --- /dev/null +++ b/data/maps/PacifidlogTown_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE4", + "name": "PacifidlogTown_House4", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F55", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F4C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House4_EventScript_203F5E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 4 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc deleted file mode 100644 index d3e00938a..000000000 --- a/data/maps/PacifidlogTown_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 - -PacifidlogTown_House5_MapWarps: - warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House5_MapEvents:: - map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc deleted file mode 100644 index a70ac3992..000000000 --- a/data/maps/PacifidlogTown_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_House5: - .4byte PacifidlogTown_House1_Layout - .4byte PacifidlogTown_House5_MapEvents - .4byte PacifidlogTown_House5_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json new file mode 100644 index 000000000..b8c4a0352 --- /dev/null +++ b/data/maps/PacifidlogTown_House5/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_HOUSE5", + "name": "PacifidlogTown_House5", + "layout": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House5_EventScript_204111", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_House5_EventScript_204137", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 5 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc deleted file mode 100644 index edc6e916f..000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 - object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 - -PacifidlogTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN - warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN - warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F - -PacifidlogTown_PokemonCenter_1F_MapEvents:: - map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc deleted file mode 100644 index 39135ef6a..000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte PacifidlogTown_PokemonCenter_1F_MapEvents - .4byte PacifidlogTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..1f141dec5 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "name": "PacifidlogTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2034CD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PACIFIDLOG_TOWN", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc deleted file mode 100644 index 1d0e1a449..000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -PacifidlogTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -PacifidlogTown_PokemonCenter_2F_MapEvents:: - map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc deleted file mode 100644 index a6c1609d3..000000000 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PacifidlogTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte PacifidlogTown_PokemonCenter_2F_MapEvents - .4byte PacifidlogTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_PACIFIDLOG_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..2b6a43ce0 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F", + "name": "PacifidlogTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PACIFIDLOG_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PacifidlogTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc deleted file mode 100644 index 0c576c79f..000000000 --- a/data/maps/PetalburgCity/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -PetalburgCity_MapConnectionsList: - connection left, -50, MAP_ROUTE104 - connection right, 10, MAP_ROUTE102 - -PetalburgCity_MapConnections: - .4byte 2 - .4byte PetalburgCity_MapConnectionsList - diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc deleted file mode 100644 index 83b3d227e..000000000 --- a/data/maps/PetalburgCity/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -PetalburgCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_1DC488, 0 - object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, FLAG_ITEM_PETALBURG_CITY_ETHER - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0 - object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT - -PetalburgCity_MapWarps: - warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 - warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE - warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM - warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2 - warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART - -PetalburgCity_MapCoordEvents: - coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A - coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6 - coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2 - coord_event 8, 13, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4BE - coord_event 4, 10, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC691 - coord_event 4, 11, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6A7 - coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD - coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3 - -PetalburgCity_MapBGEvents: - bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476 - bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A - bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 - bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC47F - bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73 - bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491 - bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY - -PetalburgCity_MapEvents:: - map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents - diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc deleted file mode 100644 index 4aafc87a6..000000000 --- a/data/maps/PetalburgCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity: - .4byte PetalburgCity_Layout - .4byte PetalburgCity_MapEvents - .4byte PetalburgCity_MapScripts - .4byte PetalburgCity_MapConnections - .2byte MUS_MACHI_S2 - .2byte LAYOUT_PETALBURG_CITY - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json new file mode 100644 index 000000000..e62590b81 --- /dev/null +++ b/data/maps/PetalburgCity/map.json @@ -0,0 +1,330 @@ +{ + "id": "MAP_PETALBURG_CITY", + "name": "PetalburgCity", + "layout": "LAYOUT_PETALBURG_CITY", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": -50, + "map": "MAP_ROUTE104" + }, + { + "direction": "right", + "offset": 10, + "map": "MAP_ROUTE102" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC3FD", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 8, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC3E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC488", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_2910B4", + "flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_2910C1", + "flag": "FLAG_ITEM_PETALBURG_CITY_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 12, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_EventScript_1DC82E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_WALLYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 16, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 20, + "y": 24, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 25, + "y": 12, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY_MART", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 10, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC49A" + }, + { + "type": "trigger", + "x": 8, + "y": 11, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4A6" + }, + { + "type": "trigger", + "x": 8, + "y": 12, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4B2" + }, + { + "type": "trigger", + "x": 8, + "y": 13, + "elevation": 3, + "var": "VAR_0x4057", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC4BE" + }, + { + "type": "trigger", + "x": 4, + "y": 10, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC691" + }, + { + "type": "trigger", + "x": 4, + "y": 11, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6A7" + }, + { + "type": "trigger", + "x": 4, + "y": 12, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6BD" + }, + { + "type": "trigger", + "x": 4, + "y": 13, + "elevation": 3, + "var": "VAR_0x40C9", + "var_value": 0, + "script": "PetalburgCity_EventScript_1DC6D3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 17, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC476" + }, + { + "type": "sign", + "x": 26, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 21, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 17, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC47F" + }, + { + "type": "sign", + "x": 22, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 27, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_EventScript_1DC491" + }, + { + "type": "hidden_item", + "x": 11, + "y": 29, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc deleted file mode 100644 index 81b244f2e..000000000 --- a/data/maps/PetalburgCity_Gym/events.inc +++ /dev/null @@ -1,72 +0,0 @@ -PetalburgCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0 - object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, FLAG_HIDE_PETALBURG_GYM_GREETER - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE - -PetalburgCity_Gym_MapWarps: - warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY - warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY - warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM - warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM - warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM - warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM - warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM - warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM - warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM - warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM - warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM - warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM - warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM - warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM - warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM - warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM - warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM - warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM - warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM - warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM - warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM - warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM - warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM - warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM - warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM - warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM - warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM - warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM - warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM - warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM - warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM - warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM - warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM - warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM - warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM - warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM - warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM - warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM - -PetalburgCity_Gym_MapBGEvents: - bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 - bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 - bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC - bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051EF - bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205222 - bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205255 - bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205288 - bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052BB - bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2052EE - bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205321 - bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205354 - bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205387 - bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E - bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E - -PetalburgCity_Gym_MapEvents:: - map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents - diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc deleted file mode 100644 index d58d30b90..000000000 --- a/data/maps/PetalburgCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Gym: - .4byte PetalburgCity_Gym_Layout - .4byte PetalburgCity_Gym_MapEvents - .4byte PetalburgCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_PETALBURG_CITY_GYM - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json new file mode 100644 index 000000000..6f133a979 --- /dev/null +++ b/data/maps/PetalburgCity_Gym/map.json @@ -0,0 +1,544 @@ +{ + "id": "MAP_PETALBURG_CITY_GYM", + "name": "PetalburgCity_Gym", + "layout": "LAYOUT_PETALBURG_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "x": 4, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2049F1", + "flag": "FLAG_HIDE_PETALYBURG_GYM_NORMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 94, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2054AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 81, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2053BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2053F6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_2054E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_205432", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_205522", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_20546E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 109, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Gym_EventScript_20574F", + "flag": "FLAG_HIDE_PETALBURG_GYM_GREETER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 4, + "y": 111, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE" + } + ], + "warp_events": [ + { + "x": 4, + "y": 111, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 111, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 105, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 85, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 85, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 105, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 6 + }, + { + "x": 1, + "y": 98, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 2, + "y": 98, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 79, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 10 + }, + { + "x": 7, + "y": 79, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 12 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 8 + }, + { + "x": 1, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 2, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 92, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 16 + }, + { + "x": 7, + "y": 92, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 18 + }, + { + "x": 7, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 6, + "y": 59, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 14 + }, + { + "x": 1, + "y": 72, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 2, + "y": 72, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 15 + }, + { + "x": 7, + "y": 40, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 24 + }, + { + "x": 1, + "y": 53, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 26 + }, + { + "x": 7, + "y": 53, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 28 + }, + { + "x": 1, + "y": 66, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 30 + }, + { + "x": 1, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 2, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 20 + }, + { + "x": 7, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 6, + "y": 20, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 21 + }, + { + "x": 1, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 2, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 22 + }, + { + "x": 7, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 6, + "y": 33, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 23 + }, + { + "x": 7, + "y": 14, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 34 + }, + { + "x": 1, + "y": 27, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 36 + }, + { + "x": 1, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 2, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 32 + }, + { + "x": 7, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 33 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY_GYM", + "dest_warp_id": 33 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 105, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205137" + }, + { + "type": "sign", + "x": 7, + "y": 105, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205187" + }, + { + "type": "sign", + "x": 1, + "y": 79, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2051BC" + }, + { + "type": "sign", + "x": 7, + "y": 79, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2051EF" + }, + { + "type": "sign", + "x": 1, + "y": 92, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205222" + }, + { + "type": "sign", + "x": 7, + "y": 92, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205255" + }, + { + "type": "sign", + "x": 7, + "y": 40, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205288" + }, + { + "type": "sign", + "x": 1, + "y": 53, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2052BB" + }, + { + "type": "sign", + "x": 7, + "y": 53, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_2052EE" + }, + { + "type": "sign", + "x": 1, + "y": 66, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205321" + }, + { + "type": "sign", + "x": 7, + "y": 14, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205354" + }, + { + "type": "sign", + "x": 1, + "y": 27, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgCity_Gym_EventScript_205387" + }, + { + "type": "sign", + "x": 1, + "y": 110, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_Gym_EventScript_20576E" + }, + { + "type": "sign", + "x": 7, + "y": 110, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "PetalburgCity_Gym_EventScript_20577E" + } + ] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc deleted file mode 100644 index 9a22e581d..000000000 --- a/data/maps/PetalburgCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 - -PetalburgCity_House1_MapWarps: - warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY - warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY - -PetalburgCity_House1_MapEvents:: - map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc deleted file mode 100644 index 7582e6336..000000000 --- a/data/maps/PetalburgCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_House1: - .4byte House1_Layout - .4byte PetalburgCity_House1_MapEvents - .4byte PetalburgCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json new file mode 100644 index 000000000..1345f8d6b --- /dev/null +++ b/data/maps/PetalburgCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_HOUSE1", + "name": "PetalburgCity_House1", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House1_EventScript_2077A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House1_EventScript_20779A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc deleted file mode 100644 index cc964b56c..000000000 --- a/data/maps/PetalburgCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 - -PetalburgCity_House2_MapWarps: - warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY - -PetalburgCity_House2_MapEvents:: - map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc deleted file mode 100644 index 36eb663c0..000000000 --- a/data/maps/PetalburgCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_House2: - .4byte HouseWithBed_Layout - .4byte PetalburgCity_House2_MapEvents - .4byte PetalburgCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json new file mode 100644 index 000000000..cc193445e --- /dev/null +++ b/data/maps/PetalburgCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_HOUSE2", + "name": "PetalburgCity_House2", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House2_EventScript_2078F3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_House2_EventScript_2078FC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc deleted file mode 100644 index 9cb05df7d..000000000 --- a/data/maps/PetalburgCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -PetalburgCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 - -PetalburgCity_Mart_MapWarps: - warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY - -PetalburgCity_Mart_MapEvents:: - map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc deleted file mode 100644 index e95fb3553..000000000 --- a/data/maps/PetalburgCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_Mart: - .4byte Mart_Layout - .4byte PetalburgCity_Mart_MapEvents - .4byte PetalburgCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json new file mode 100644 index 000000000..c811ece3c --- /dev/null +++ b/data/maps/PetalburgCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_PETALBURG_CITY_MART", + "name": "PetalburgCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207D69", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DE8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DDF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_Mart_EventScript_207DD6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc deleted file mode 100644 index de02c8a8e..000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 - -PetalburgCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY - warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY - warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F - -PetalburgCity_PokemonCenter_1F_MapEvents:: - map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 08ec4783f..000000000 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte PetalburgCity_PokemonCenter_1F_MapEvents - .4byte PetalburgCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..a82cbb85a --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "name": "PetalburgCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_2079FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_291539", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A0A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A13", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_1F_EventScript_207A1C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 49514363b..000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -PetalburgCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -PetalburgCity_PokemonCenter_2F_MapEvents:: - map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 779a106b9..000000000 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte PetalburgCity_PokemonCenter_2F_MapEvents - .4byte PetalburgCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..49f2942b3 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_PETALBURG_CITY_POKEMON_CENTER_2F", + "name": "PetalburgCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_PETALBURG_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc deleted file mode 100644 index 98487bd2c..000000000 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -PetalburgCity_WallysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 - -PetalburgCity_WallysHouse_MapWarps: - warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY - -PetalburgCity_WallysHouse_MapEvents:: - map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc deleted file mode 100644 index 2c49b77f6..000000000 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgCity_WallysHouse: - .4byte House2_Layout - .4byte PetalburgCity_WallysHouse_MapEvents - .4byte PetalburgCity_WallysHouse_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_PETALBURG_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json new file mode 100644 index 000000000..b6a152be2 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_PETALBURG_CITY_WALLYS_HOUSE", + "name": "PetalburgCity_WallysHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_PETALBURG_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_WallysHouse_EventScript_204278", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgCity_WallysHouse_EventScript_2042C0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_PETALBURG_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc deleted file mode 100644 index 95326cedf..000000000 --- a/data/maps/PetalburgWoods/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -PetalburgWoods_EventObjects: - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, FLAG_ITEM_PETALBURG_WOODS_X_ATTACK - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, FLAG_ITEM_PETALBURG_WOODS_ETHER - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_22E210, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_22E219, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 - -PetalburgWoods_MapWarps: - warp_def 14, 5, 0, 2, MAP_ROUTE104 - warp_def 15, 5, 0, 3, MAP_ROUTE104 - warp_def 16, 38, 0, 4, MAP_ROUTE104 - warp_def 17, 38, 0, 5, MAP_ROUTE104 - warp_def 36, 38, 0, 6, MAP_ROUTE104 - warp_def 37, 38, 0, 7, MAP_ROUTE104 - -PetalburgWoods_MapCoordEvents: - coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 - coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 - -PetalburgWoods_MapBGEvents: - bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B - bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION - bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 - bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2 - bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL - bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 - -PetalburgWoods_MapEvents:: - map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents - diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc deleted file mode 100644 index 530c2f2aa..000000000 --- a/data/maps/PetalburgWoods/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -PetalburgWoods: - .4byte PetalburgWoods_Layout - .4byte PetalburgWoods_MapEvents - .4byte PetalburgWoods_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_PETALBURG_WOODS - .byte MAPSEC_PETALBURG_WOODS - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json new file mode 100644 index 000000000..9a5f051b3 --- /dev/null +++ b/data/maps/PetalburgWoods/map.json @@ -0,0 +1,301 @@ +{ + "id": "MAP_PETALBURG_WOODS", + "name": "PetalburgWoods", + "layout": "LAYOUT_PETALBURG_WOODS", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_PETALBURG_WOODS", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 26, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 26, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_PETALBURG_WOODS_DEVON_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 45, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_29110F", + "flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 35, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_291102", + "flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_29111C", + "flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 15, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E210", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 7, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PetalburgWoods_EventScript_22E26D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "PetalburgWoods_EventScript_22E284", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 30, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E219", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_291129", + "flag": "FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "PetalburgWoods_EventScript_22E222", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 2 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 3 + }, + { + "x": 16, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 4 + }, + { + "x": 17, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 5 + }, + { + "x": 36, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 6 + }, + { + "x": 37, + "y": 38, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 7 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 26, + "y": 23, + "elevation": 3, + "var": "VAR_0x4098", + "var_value": 0, + "script": "PetalburgWoods_EventScript_22DFD7" + }, + { + "type": "trigger", + "x": 27, + "y": 23, + "elevation": 3, + "var": "VAR_0x4098", + "var_value": 0, + "script": "PetalburgWoods_EventScript_22E079" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 32, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgWoods_EventScript_22E25B" + }, + { + "type": "hidden_item", + "x": 39, + "y": 35, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION" + }, + { + "type": "hidden_item", + "x": 26, + "y": 6, + "elevation": 3, + "item": "ITEM_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1" + }, + { + "type": "hidden_item", + "x": 40, + "y": 29, + "elevation": 3, + "item": "ITEM_TINY_MUSHROOM", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2" + }, + { + "type": "hidden_item", + "x": 4, + "y": 19, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL" + }, + { + "type": "sign", + "x": 11, + "y": 8, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "PetalburgWoods_EventScript_22E264" + } + ] +} \ No newline at end of file diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc deleted file mode 100644 index 44829f60d..000000000 --- a/data/maps/RecordCorner/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -RecordCorner_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 - -RecordCorner_MapWarps: - warp_def 8, 9, 3, 127, MAP_NONE - warp_def 9, 9, 3, 127, MAP_NONE - warp_def 11, 9, 3, 127, MAP_NONE - warp_def 10, 9, 3, 127, MAP_NONE - -RecordCorner_MapCoordEvents: - coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D - coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 - coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 - coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C - -RecordCorner_MapEvents:: - map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 - diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc deleted file mode 100644 index 0a3254abd..000000000 --- a/data/maps/RecordCorner/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RecordCorner: - .4byte RecordCorner_Layout - .4byte RecordCorner_MapEvents - .4byte RecordCorner_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_RECORD_CORNER - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json new file mode 100644 index 000000000..98bcc0201 --- /dev/null +++ b/data/maps/RecordCorner/map.json @@ -0,0 +1,100 @@ +{ + "id": "MAP_RECORD_CORNER", + "name": "RecordCorner", + "layout": "LAYOUT_RECORD_CORNER", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RecordCorner_EventScript_2774C6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 9, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 11, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827741D" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277447" + }, + { + "type": "trigger", + "x": 13, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277432" + }, + { + "type": "trigger", + "x": 13, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827745C" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc deleted file mode 100644 index 32ee511a8..000000000 --- a/data/maps/Route101/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route101_MapConnectionsList: - connection up, 0, MAP_OLDALE_TOWN - connection down, 0, MAP_LITTLEROOT_TOWN - -Route101_MapConnections: - .4byte 2 - .4byte Route101_MapConnectionsList - diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc deleted file mode 100644 index b14649cc0..000000000 --- a/data/maps/Route101/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -Route101_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_ZIGZAGOON - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY - -Route101_MapCoordEvents: - coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE - coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE - coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E - coord_event 11, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E - coord_event 6, 16, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 15, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 17, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 - coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A - -Route101_MapBGEvents: - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D - -Route101_MapEvents:: - map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents - diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc deleted file mode 100644 index b40de8df9..000000000 --- a/data/maps/Route101/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route101: - .4byte Route101_Layout - .4byte Route101_MapEvents - .4byte Route101_MapScripts - .4byte Route101_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE101 - .byte MAPSEC_ROUTE_101 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json new file mode 100644 index 000000000..673db80ea --- /dev/null +++ b/data/maps/Route101/map.json @@ -0,0 +1,201 @@ +{ + "id": "MAP_ROUTE101", + "name": "Route101", + "layout": "LAYOUT_ROUTE101", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_101", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_LITTLEROOT_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 16, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBDFB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 9, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBE16", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_1", + "x": 10, + "y": 13, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_JOG_IN_PLACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_101_ZIGZAGOON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_272141", + "flag": "FLAG_HIDE_ROUTE_101_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 2, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route101_EventScript_1EBE04", + "flag": "FLAG_HIDE_ROUTE_101_BOY" + } + ], + "warp_events": [], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 1, + "script": "Route101_EventScript_1EBCDE" + }, + { + "type": "trigger", + "x": 11, + "y": 19, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 1, + "script": "Route101_EventScript_1EBCDE" + }, + { + "type": "trigger", + "x": 10, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD4E" + }, + { + "type": "trigger", + "x": 11, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD4E" + }, + { + "type": "trigger", + "x": 6, + "y": 16, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 15, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 17, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 6, + "y": 18, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD64" + }, + { + "type": "trigger", + "x": 7, + "y": 13, + "elevation": 3, + "var": "VAR_0x4060", + "var_value": 2, + "script": "Route101_EventScript_1EBD7A" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route101_EventScript_1EBE0D" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc deleted file mode 100644 index 1b76d47f5..000000000 --- a/data/maps/Route102/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route102_MapConnectionsList: - connection left, -10, MAP_PETALBURG_CITY - connection right, 0, MAP_OLDALE_TOWN - -Route102_MapConnections: - .4byte 2 - .4byte Route102_MapConnectionsList - diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc deleted file mode 100644 index 65acbee41..000000000 --- a/data/maps/Route102/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route102_EventObjects: - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, FLAG_ITEM_ROUTE_102_POTION - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 - -Route102_MapBGEvents: - bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 - bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA - -Route102_MapEvents:: - map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents - diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc deleted file mode 100644 index 6b5c24b0c..000000000 --- a/data/maps/Route102/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route102: - .4byte Route102_Layout - .4byte Route102_MapEvents - .4byte Route102_MapScripts - .4byte Route102_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE102 - .byte MAPSEC_ROUTE_102 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json new file mode 100644 index 000000000..e6418c42c --- /dev/null +++ b/data/maps/Route102/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_ROUTE102", + "name": "Route102", + "layout": "LAYOUT_ROUTE102", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_102", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": -10, + "map": "MAP_PETALBURG_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 18, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_1EC0E1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 33, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC105", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 25, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route102_EventScript_1EC1B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC1CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 37, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_1EC0FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route102_EventScript_290CD8", + "flag": "FLAG_ITEM_ROUTE_102_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 2, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 25, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 1, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 19, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route102_EventScript_1EC1E1", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 17, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route102_EventScript_1EC0F3" + }, + { + "type": "sign", + "x": 40, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route102_EventScript_1EC0EA" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc deleted file mode 100644 index cff488cf2..000000000 --- a/data/maps/Route103/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route103_MapConnectionsList: - connection down, 0, MAP_OLDALE_TOWN - connection right, -60, MAP_ROUTE110 - -Route103_MapConnections: - .4byte 2 - .4byte Route103_MapConnectionsList - diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc deleted file mode 100644 index 879412157..000000000 --- a/data/maps/Route103/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route103_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 65, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0 - object_event 5, EVENT_OBJ_GFX_TWIN, 0, 64, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_1EC6D1, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_1EC5D9, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_272141, FLAG_HIDE_ROUTE_103_BIRCH - object_event 12, EVENT_OBJ_GFX_POKEFAN_M, 0, 56, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CE5, FLAG_ITEM_ROUTE_103_GUARD_SPEC - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_12 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 72, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_2906BB, FLAG_TEMP_13 - object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 67, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route103_EventScript_1EC761, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 67, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route103_EventScript_1EC74A, 0 - object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 6, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route103_EventScript_1EC78F, 0 - object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP - -Route103_MapWarps: - warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE - -Route103_MapBGEvents: - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB - -Route103_MapEvents:: - map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents - diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc deleted file mode 100644 index 942ec632c..000000000 --- a/data/maps/Route103/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route103: - .4byte Route103_Layout - .4byte Route103_MapEvents - .4byte Route103_MapScripts - .4byte Route103_MapConnections - .2byte MUS_DOORO1 - .2byte LAYOUT_ROUTE103 - .byte MAPSEC_ROUTE_103 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json new file mode 100644 index 000000000..516c4ed8f --- /dev/null +++ b/data/maps/Route103/map.json @@ -0,0 +1,309 @@ +{ + "id": "MAP_ROUTE103", + "name": "Route103", + "layout": "LAYOUT_ROUTE103", + "music": "MUS_DOORO1", + "region_map_section": "MAPSEC_ROUTE_103", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_OLDALE_TOWN" + }, + { + "direction": "right", + "offset": -60, + "map": "MAP_ROUTE110" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 49, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC5E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC3C1", + "flag": "FLAG_HIDE_ROUTE_103_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 71, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route103_EventScript_1EC5F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 65, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route103_EventScript_1EC66E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 64, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route103_EventScript_1EC60B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 50, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route103_EventScript_1EC6D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 58, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 5, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 59, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 6, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 60, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 7, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 20, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_1EC5D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_272141", + "flag": "FLAG_HIDE_ROUTE_103_BIRCH" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 56, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC6E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 50, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_290CE5", + "flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 67, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 72, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 67, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route103_EventScript_1EC761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 67, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route103_EventScript_1EC74A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 36, + "y": 6, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC78F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 36, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route103_EventScript_1EC778", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 64, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route103_EventScript_290CF2", + "flag": "FLAG_ITEM_ROUTE_103_PP_UP" + } + ], + "warp_events": [ + { + "x": 45, + "y": 6, + "elevation": 0, + "dest_map": "MAP_ALTERING_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route103_EventScript_1EC5EB" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc deleted file mode 100644 index 193f89833..000000000 --- a/data/maps/Route104/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route104_MapConnectionsList: - connection up, 0, MAP_RUSTBORO_CITY - connection down, 0, MAP_ROUTE105 - connection right, 50, MAP_PETALBURG_CITY - -Route104_MapConnections: - .4byte 3 - .4byte Route104_MapConnectionsList - diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc deleted file mode 100644 index 8b67a0854..000000000 --- a/data/maps/Route104/events.inc +++ /dev/null @@ -1,64 +0,0 @@ -Route104_EventObjects: - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_1ED045, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED04E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_1ED090, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT - object_event 8, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_104_MR_BRINEY - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_EXPERT_F, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_1ECF8C, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_290CFF, FLAG_ITEM_ROUTE_104_PP_UP - object_event 22, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_1ECFCD, FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST - object_event 23, EVENT_OBJ_GFX_TWIN, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED597, 0 - object_event 24, EVENT_OBJ_GFX_TWIN, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0 - object_event 25, EVENT_OBJ_GFX_RICH_BOY, 0, 21, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D0C, FLAG_ITEM_ROUTE_104_POKE_BALL - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_1ED376, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D19, FLAG_ITEM_ROUTE_104_X_ACCURACY - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_2906BB, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_290D26, FLAG_ITEM_ROUTE_104_POTION - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED057, 0 - object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 - object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL - -Route104_MapWarps: - warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE - warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS - warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS - warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS - warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS - warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS - warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS - -Route104_MapCoordEvents: - coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 - -Route104_MapBGEvents: - bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 - bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 - bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A - bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED033 - bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED03C - bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION - bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL - bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_ROUTE_104_POTION - bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE - bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE - -Route104_MapEvents:: - map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents - diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc deleted file mode 100644 index 6f8e0776b..000000000 --- a/data/maps/Route104/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104: - .4byte Route104_Layout - .4byte Route104_MapEvents - .4byte Route104_MapScripts - .4byte Route104_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104 - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json new file mode 100644 index 000000000..733ad4989 --- /dev/null +++ b/data/maps/Route104/map.json @@ -0,0 +1,627 @@ +{ + "id": "MAP_ROUTE104", + "name": "Route104", + "layout": "LAYOUT_ROUTE104", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "right", + "offset": 50, + "map": "MAP_PETALBURG_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 15, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED00F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 25, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED006", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 31, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route104_EventScript_1ED38D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 27, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED045", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 30, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED04E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 28, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 12, + "y": 54, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 51, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_104_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 29, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED35F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 8, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 9, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 10, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 11, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 12, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 13, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 37, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECF8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 3, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 4, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 75, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 3, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 76, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 39, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290CFF", + "flag": "FLAG_ITEM_ROUTE_104_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECFCD", + "flag": "FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 27, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route104_EventScript_1ED597", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 28, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route104_EventScript_1ED5B6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route104_EventScript_1ED43B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route104_EventScript_1ED4E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D0C", + "flag": "FLAG_ITEM_ROUTE_104_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 18, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 5, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route104_EventScript_1ED376", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D19", + "flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_290D26", + "flag": "FLAG_ITEM_ROUTE_104_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED057", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 15, + "y": 59, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ED5D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 17, + "y": 50, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_EventScript_1ECC9E", + "flag": "FLAG_HIDE_ROUTE_104_RIVAL" + } + ], + "warp_events": [ + { + "x": 17, + "y": 50, + "elevation": 0, + "dest_map": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 30, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 38, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 4 + }, + { + "x": 33, + "y": 42, + "elevation": 3, + "dest_map": "MAP_PETALBURG_WOODS", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 51, + "elevation": 3, + "var": "VAR_0x4063", + "var_value": 1, + "script": "Route104_EventScript_1ECCB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 20, + "y": 50, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED018" + }, + { + "type": "sign", + "x": 27, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED021" + }, + { + "type": "sign", + "x": 23, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED02A" + }, + { + "type": "sign", + "x": 7, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED033" + }, + { + "type": "sign", + "x": 17, + "y": 23, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route104_EventScript_1ED03C" + }, + { + "type": "hidden_item", + "x": 7, + "y": 6, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 3, + "y": 9, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 14, + "y": 55, + "elevation": 3, + "item": "ITEM_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_POTION" + }, + { + "type": "hidden_item", + "x": 16, + "y": 72, + "elevation": 3, + "item": "ITEM_ANTIDOTE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE" + }, + { + "type": "hidden_item", + "x": 16, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc deleted file mode 100644 index d1924756c..000000000 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route104_MrBrineysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO - -Route104_MrBrineysHouse_MapWarps: - warp_def 5, 8, 0, 0, MAP_ROUTE104 - warp_def 6, 8, 0, 0, MAP_ROUTE104 - -Route104_MrBrineysHouse_MapEvents:: - map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc deleted file mode 100644 index 784db2d2d..000000000 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_MrBrineysHouse: - .4byte Route104_MrBrineysHouse_Layout - .4byte Route104_MrBrineysHouse_MapEvents - .4byte Route104_MrBrineysHouse_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_ROUTE104_MR_BRINEYS_HOUSE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json new file mode 100644 index 000000000..bdd2361e0 --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE104_MR_BRINEYS_HOUSE", + "name": "Route104_MrBrineysHouse", + "layout": "LAYOUT_ROUTE104_MR_BRINEYS_HOUSE", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_MrBrineysHouse_EventScript_229D67", + "flag": "FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_MrBrineysHouse_EventScript_229E5D", + "flag": "FLAG_HIDE_BRINEYS_HOUSE_PEEKO" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc deleted file mode 100644 index c33268ff6..000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route104_PrettyPetalFlowerShop_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 - -Route104_PrettyPetalFlowerShop_MapWarps: - warp_def 2, 8, 0, 1, MAP_ROUTE104 - warp_def 3, 8, 0, 1, MAP_ROUTE104 - -Route104_PrettyPetalFlowerShop_MapEvents:: - map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc deleted file mode 100644 index b201d0a3e..000000000 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrettyPetalFlowerShop: - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte Route104_PrettyPetalFlowerShop_MapEvents - .4byte Route104_PrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S2 - .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json new file mode 100644 index 000000000..cd00d18e1 --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrettyPetalFlowerShop", + "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "music": "MUS_MACHI_S2", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A373", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A40C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 11, + "y": 6, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route104_PrettyPetalFlowerShop_EventScript_22A442", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 1 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE104", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc deleted file mode 100644 index 4f1dfef12..000000000 --- a/data/maps/Route104_Prototype/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_Prototype_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc deleted file mode 100644 index 7bc8d0a87..000000000 --- a/data/maps/Route104_Prototype/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_Prototype: - .4byte Route104_Prototype_Layout - .4byte Route104_Prototype_MapEvents - .4byte Route104_Prototype_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PROTOTYPE - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json new file mode 100644 index 000000000..168cee142 --- /dev/null +++ b/data/maps/Route104_Prototype/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE", + "name": "Route104_Prototype", + "layout": "LAYOUT_ROUTE104_PROTOTYPE", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc deleted file mode 100644 index 76dd77e02..000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc deleted file mode 100644 index 53b543e4e..000000000 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop: - .4byte Route104_PrettyPetalFlowerShop_Layout - .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents - .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts - .4byte 0x0 - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP - .byte MAPSEC_ROUTE_104 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json new file mode 100644 index 000000000..f50dced01 --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP", + "name": "Route104_PrototypePrettyPetalFlowerShop", + "layout": "LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_104", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc deleted file mode 100644 index 89c412cc6..000000000 --- a/data/maps/Route105/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route105_MapConnectionsList: - connection up, 0, MAP_ROUTE104 - connection down, 0, MAP_ROUTE106 - connection dive, 0, MAP_UNDERWATER6 - -Route105_MapConnections: - .4byte 3 - .4byte Route105_MapConnectionsList - diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc deleted file mode 100644 index 851a26fdc..000000000 --- a/data/maps/Route105/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route105_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_1EE2A6, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_290D33, FLAG_ITEM_ROUTE_105_IRON - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 17, 48, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 7, 1, 3, Route105_EventScript_1EE24A, 0 - object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 - object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 - -Route105_MapWarps: - warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE - -Route105_MapBGEvents: - bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE - bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL - -Route105_MapEvents:: - map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents - diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc deleted file mode 100644 index ac3e766dd..000000000 --- a/data/maps/Route105/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route105: - .4byte Route105_Layout - .4byte Route105_MapEvents - .4byte Route105_MapScripts - .4byte Route105_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE105 - .byte MAPSEC_ROUTE_105 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json new file mode 100644 index 000000000..937582aff --- /dev/null +++ b/data/maps/Route105/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_ROUTE105", + "name": "Route105", + "layout": "LAYOUT_ROUTE105", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_105", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE104" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE106" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER6" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 19, + "y": 60, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route105_EventScript_1EE261", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 27, + "y": 36, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE278", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 8, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE28F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 19, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE2A6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 73, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route105_EventScript_290D33", + "flag": "FLAG_ITEM_ROUTE_105_IRON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 17, + "y": 48, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route105_EventScript_1EE24A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 4, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route105_EventScript_1EE2BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 4, + "y": 58, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route105_EventScript_1EE2D4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 20, + "elevation": 0, + "dest_map": "MAP_ISLAND_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 15, + "y": 68, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 5, + "y": 56, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc deleted file mode 100644 index f48a08bd8..000000000 --- a/data/maps/Route106/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route106_MapConnectionsList: - connection up, 0, MAP_ROUTE105 - connection down, 60, MAP_DEWFORD_TOWN - -Route106_MapConnections: - .4byte 2 - .4byte Route106_MapConnectionsList - diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc deleted file mode 100644 index 6454fc188..000000000 --- a/data/maps/Route106/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route106_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN - -Route106_MapWarps: - warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F - -Route106_MapBGEvents: - bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL - bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST - bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE - bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A - -Route106_MapEvents:: - map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents - diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc deleted file mode 100644 index 01c7b9ae6..000000000 --- a/data/maps/Route106/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route106: - .4byte Route106_Layout - .4byte Route106_MapEvents - .4byte Route106_MapScripts - .4byte Route106_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE106 - .byte MAPSEC_ROUTE_106 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json new file mode 100644 index 000000000..fd86567e9 --- /dev/null +++ b/data/maps/Route106/map.json @@ -0,0 +1,138 @@ +{ + "id": "MAP_ROUTE106", + "name": "Route106", + "layout": "LAYOUT_ROUTE106", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_106", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE105" + }, + { + "direction": "down", + "offset": 60, + "map": "MAP_DEWFORD_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 18, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE493", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 29, + "y": 10, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE4AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 51, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route106_EventScript_1EE4C1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 65, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route106_EventScript_1EE523", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route106_EventScript_290D40", + "flag": "FLAG_ITEM_ROUTE_106_PROTEIN" + } + ], + "warp_events": [ + { + "x": 48, + "y": 16, + "elevation": 0, + "dest_map": "MAP_GRANITE_CAVE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 41, + "y": 11, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 53, + "y": 12, + "elevation": 0, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST" + }, + { + "type": "hidden_item", + "x": 68, + "y": 15, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE" + }, + { + "type": "sign", + "x": 59, + "y": 13, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route106_EventScript_1EE48A" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc deleted file mode 100644 index d1bb18b87..000000000 --- a/data/maps/Route107/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route107_MapConnectionsList: - connection left, 0, MAP_DEWFORD_TOWN - connection right, 0, MAP_ROUTE108 - -Route107_MapConnections: - .4byte 2 - .4byte Route107_MapConnectionsList - diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc deleted file mode 100644 index 461d8cd86..000000000 --- a/data/maps/Route107/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route107_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 11, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route107_EventScript_1EE625, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE63C, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 - -Route107_MapEvents:: - map_events Route107_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc deleted file mode 100644 index db53b811d..000000000 --- a/data/maps/Route107/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route107: - .4byte Route107_Layout - .4byte Route107_MapEvents - .4byte Route107_MapScripts - .4byte Route107_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE107 - .byte MAPSEC_ROUTE_107 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json new file mode 100644 index 000000000..dcb17ed8c --- /dev/null +++ b/data/maps/Route107/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_ROUTE107", + "name": "Route107", + "layout": "LAYOUT_ROUTE107", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_107", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_DEWFORD_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE108" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 41, + "y": 10, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route107_EventScript_1EE595", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 23, + "y": 11, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 6, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route107_EventScript_1EE5AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 16, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE60E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 50, + "y": 11, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE625", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 33, + "y": 4, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route107_EventScript_1EE63C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 32, + "y": 4, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route107_EventScript_1EE657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 50, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route107_EventScript_1EE672", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc deleted file mode 100644 index 9b2d0f1f9..000000000 --- a/data/maps/Route108/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route108_MapConnectionsList: - connection left, 0, MAP_ROUTE107 - connection right, -40, MAP_ROUTE109 - -Route108_MapConnections: - .4byte 2 - .4byte Route108_MapConnectionsList - diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc deleted file mode 100644 index 9e1a088c0..000000000 --- a/data/maps/Route108/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route108_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 41, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, Route108_EventScript_1EE6E6, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE - -Route108_MapWarps: - warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK - -Route108_MapBGEvents: - bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY - -Route108_MapEvents:: - map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents - diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc deleted file mode 100644 index 97d4a879d..000000000 --- a/data/maps/Route108/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route108: - .4byte Route108_Layout - .4byte Route108_MapEvents - .4byte Route108_MapScripts - .4byte Route108_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE108 - .byte MAPSEC_ROUTE_108 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json new file mode 100644 index 000000000..daa9dab75 --- /dev/null +++ b/data/maps/Route108/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_ROUTE108", + "name": "Route108", + "layout": "LAYOUT_ROUTE108", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_108", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE107" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE109" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 52, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE68A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 35, + "y": 12, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6B8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 13, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6A1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 8, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route108_EventScript_1EE6CF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 41, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route108_EventScript_1EE6E6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 43, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route108_EventScript_1EE6FD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 42, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route108_EventScript_290D4D", + "flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE" + } + ], + "warp_events": [ + { + "x": 29, + "y": 6, + "elevation": 3, + "dest_map": "MAP_ABANDONED_SHIP_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 14, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc deleted file mode 100644 index d74fc08dd..000000000 --- a/data/maps/Route109/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route109_MapConnectionsList: - connection up, 0, MAP_SLATEPORT_CITY - connection left, 40, MAP_ROUTE108 - -Route109_MapConnections: - .4byte 2 - .4byte Route109_MapConnectionsList - diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc deleted file mode 100644 index efd0e896f..000000000 --- a/data/maps/Route109/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -Route109_EventObjects: - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 39, 1, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 15, 17, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 19, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 22, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_1EE995, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 46, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_290D5A, FLAG_ITEM_ROUTE_109_PP_UP - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 21, 56, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_1EE99E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 18, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_1EE9B5, 0 - object_event 16, EVENT_OBJ_GFX_POKEFAN_F, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_1EEA06, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBBD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route109_EventScript_1EEBA2, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA0F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 - object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 - object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION - object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 - -Route109_MapWarps: - warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE - -Route109_MapBGEvents: - bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B - bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 - bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE - bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1 - bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL - bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_109_ETHER - bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 - bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 - -Route109_MapEvents:: - map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents - diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc deleted file mode 100644 index 9de12f3e6..000000000 --- a/data/maps/Route109/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109: - .4byte Route109_Layout - .4byte Route109_MapEvents - .4byte Route109_MapScripts - .4byte Route109_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE109 - .byte MAPSEC_ROUTE_109 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json new file mode 100644 index 000000000..b3bd9f507 --- /dev/null +++ b/data/maps/Route109/map.json @@ -0,0 +1,417 @@ +{ + "id": "MAP_ROUTE109", + "name": "Route109", + "layout": "LAYOUT_ROUTE109", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_109", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE108" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "x": 21, + "y": 26, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 21, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE910", + "flag": "FLAG_HIDE_ROUTE_108_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 12, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route109_EventScript_1EEA3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 25, + "y": 39, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route109_EventScript_1EEA54", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 15, + "y": 17, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEA6B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 24, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route109_EventScript_1EEA82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 19, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEA99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 22, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route109_EventScript_1EEAFB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE995", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_290D5A", + "flag": "FLAG_ITEM_ROUTE_109_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 29, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 28, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB5D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 21, + "y": 56, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEB8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 24, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE99E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 25, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EE9B5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 30, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 8, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEBBD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 9, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route109_EventScript_1EEBA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 33, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA0F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 32, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_1EEA18", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "x": 17, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route109_EventScript_1EEBEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route109_EventScript_1EEBD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_EventScript_290D67", + "flag": "FLAG_ITEM_ROUTE_109_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 17, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route109_EventScript_1EEC06", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE109_SEASHORE_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route109_EventScript_1EEA2B" + }, + { + "type": "sign", + "x": 29, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route109_EventScript_1EEA34" + }, + { + "type": "hidden_item", + "x": 16, + "y": 23, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE" + }, + { + "type": "hidden_item", + "x": 33, + "y": 5, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 9, + "y": 10, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL" + }, + { + "type": "hidden_item", + "x": 28, + "y": 20, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_ETHER" + }, + { + "type": "hidden_item", + "x": 13, + "y": 16, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 8, + "y": 42, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc deleted file mode 100644 index 7ef23ad7f..000000000 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route109_SeashoreHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 - -Route109_SeashoreHouse_MapWarps: - warp_def 6, 9, 0, 0, MAP_ROUTE109 - warp_def 7, 9, 0, 0, MAP_ROUTE109 - -Route109_SeashoreHouse_MapEvents:: - map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc deleted file mode 100644 index d8109deac..000000000 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route109_SeashoreHouse: - .4byte Route109_SeashoreHouse_Layout - .4byte Route109_SeashoreHouse_MapEvents - .4byte Route109_SeashoreHouse_MapScripts - .4byte 0x0 - .2byte MUS_HIGHTOWN - .2byte LAYOUT_ROUTE109_SEASHORE_HOUSE - .byte MAPSEC_ROUTE_109 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json new file mode 100644 index 000000000..e30fcc078 --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE109_SEASHORE_HOUSE", + "name": "Route109_SeashoreHouse", + "layout": "LAYOUT_ROUTE109_SEASHORE_HOUSE", + "music": "MUS_HIGHTOWN", + "region_map_section": "MAPSEC_ROUTE_109", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route109_SeashoreHouse_EventScript_2693FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_2694E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_269518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route109_SeashoreHouse_EventScript_2694FD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ROUTE109", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_ROUTE109", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc deleted file mode 100644 index d0334b8c5..000000000 --- a/data/maps/Route110/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_MapConnectionsList: - connection up, 0, MAP_MAUVILLE_CITY - connection down, 0, MAP_SLATEPORT_CITY - connection left, 60, MAP_ROUTE103 - -Route110_MapConnections: - .4byte 3 - .4byte Route110_MapConnectionsList - diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc deleted file mode 100644 index 349670c13..000000000 --- a/data/maps/Route110/events.inc +++ /dev/null @@ -1,79 +0,0 @@ -Route110_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF314, 0 - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF31D, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_1EF30B, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_1EF302, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_1EF529, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_1EF4B0, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_1EF540, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_1EF4C7, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 3, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_1EF409, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 34, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 1, 4, Route110_EventScript_1EF420, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_1EF482, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, BerryTreeScript, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D81, FLAG_ITEM_ROUTE_110_DIRE_HIT - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_290D74, FLAG_ITEM_ROUTE_109_RARE_CANDY - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0 - object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2AA, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2C0, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2D6, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_1EF2EC, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 82, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_TEAM_AQUA - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_1EF499, 0 - object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_1 - object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_RIVAL_2 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_1EF604, 0 - object_event 31, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 76, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0 - object_event 32, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 76, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route110_EventScript_1EF61C, 0 - object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 10, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, Route110_EventScript_1EF64A, 0 - object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 36, 40, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 3, Route110_EventScript_1EF633, 0 - object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR - object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH - -Route110_MapWarps: - warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE - warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - -Route110_MapCoordEvents: - coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 - coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 - coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D - coord_event 34, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF758 - coord_event 35, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF763 - coord_event 7, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9CB - coord_event 8, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9D6 - coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 - coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC - -Route110_MapBGEvents: - bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 - bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 - bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A - bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF341 - bg_event 7, 79, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF35C - bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF36E - bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 - bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 33, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF377 - bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF380 - bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF389 - bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF392 - bg_hidden_item_event 35, 39, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE - bg_hidden_item_event 33, 45, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL - bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL - bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL - bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A - -Route110_MapEvents:: - map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents - diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc deleted file mode 100644 index 5edb81ec4..000000000 --- a/data/maps/Route110/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110: - .4byte Route110_Layout - .4byte Route110_MapEvents - .4byte Route110_MapScripts - .4byte Route110_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE110 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json new file mode 100644 index 000000000..1891b89f7 --- /dev/null +++ b/data/maps/Route110/map.json @@ -0,0 +1,765 @@ +{ + "id": "MAP_ROUTE110", + "name": "Route110", + "layout": "LAYOUT_ROUTE110", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "left", + "offset": 60, + "map": "MAP_ROUTE103" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 17, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF338", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 29, + "y": 79, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF32F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 14, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF326", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 9, + "y": 57, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF314", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF31D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 27, + "y": 24, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF30B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF302", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 16, + "y": 73, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", + "movement_range_x": 2, + "movement_range_y": 14, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF529", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 19, + "y": 31, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 10, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF4B0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 30, + "y": 31, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_EventScript_1EF540", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 16, + "y": 55, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF4C7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 3, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_EventScript_1EF3F2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 33, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_EventScript_1EF409", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 34, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_EventScript_1EF420", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 10, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_EventScript_1EF482", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 16, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 6, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 17, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 18, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D81", + "flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D74", + "flag": "FLAG_ITEM_ROUTE_109_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 27, + "y": 92, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF3B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 7, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2AA", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2C0", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 9, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2D6", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 83, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_1EF2EC", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 82, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 21, + "y": 78, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 7, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF499", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 34, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_RIVAL_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 34, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_RIVAL_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 33, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF604", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF5A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_EventScript_1EF61C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "x": 10, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_EventScript_1EF64A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 36, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_EventScript_1EF633", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 6, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_EventScript_290D8E", + "flag": "FLAG_ITEM_ROUTE_110_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "x": 9, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_110_BIRCH" + } + ], + "warp_events": [ + { + "x": 35, + "y": 24, + "elevation": 3, + "dest_map": "MAP_NEW_MAUVILLE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 66, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 18, + "y": 16, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 16, + "y": 88, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 88, + "elevation": 0, + "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 28, + "y": 92, + "elevation": 3, + "var": "VAR_CYCLING_CHALLENGE_STATE", + "var_value": 2, + "script": "Route110_EventScript_1EF661" + }, + { + "type": "trigger", + "x": 29, + "y": 92, + "elevation": 3, + "var": "VAR_CYCLING_CHALLENGE_STATE", + "var_value": 2, + "script": "Route110_EventScript_1EF661" + }, + { + "type": "trigger", + "x": 33, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF74D" + }, + { + "type": "trigger", + "x": 34, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF758" + }, + { + "type": "trigger", + "x": 35, + "y": 56, + "elevation": 3, + "var": "VAR_0x4069", + "var_value": 0, + "script": "Route110_EventScript_1EF763" + }, + { + "type": "trigger", + "x": 7, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9CB" + }, + { + "type": "trigger", + "x": 8, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9D6" + }, + { + "type": "trigger", + "x": 9, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9E1" + }, + { + "type": "trigger", + "x": 10, + "y": 85, + "elevation": 3, + "var": "VAR_0x40DA", + "var_value": 1, + "script": "Route110_EventScript_1EF9EC" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 25, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF353" + }, + { + "type": "sign", + "x": 9, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF365" + }, + { + "type": "sign", + "x": 14, + "y": 88, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF34A" + }, + { + "type": "sign", + "x": 20, + "y": 94, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF341" + }, + { + "type": "sign", + "x": 7, + "y": 79, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF35C" + }, + { + "type": "sign", + "x": 3, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF36E" + }, + { + "type": "secret_base", + "x": 16, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_1" + }, + { + "type": "secret_base", + "x": 17, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_1" + }, + { + "type": "sign", + "x": 33, + "y": 39, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF377" + }, + { + "type": "sign", + "x": 37, + "y": 70, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF380" + }, + { + "type": "sign", + "x": 8, + "y": 67, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF389" + }, + { + "type": "sign", + "x": 32, + "y": 93, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF392" + }, + { + "type": "hidden_item", + "x": 35, + "y": 39, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE" + }, + { + "type": "hidden_item", + "x": 33, + "y": 45, + "elevation": 3, + "item": "ITEM_GREAT_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL" + }, + { + "type": "hidden_item", + "x": 4, + "y": 35, + "elevation": 3, + "item": "ITEM_POKE_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL" + }, + { + "type": "hidden_item", + "x": 37, + "y": 67, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL" + }, + { + "type": "sign", + "x": 13, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_EventScript_1EF34A" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc deleted file mode 100644 index f9050259c..000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 - -Route110_SeasideCyclingRoadNorthEntrance_MapWarps: - warp_def 1, 5, 0, 4, MAP_ROUTE110 - warp_def 2, 5, 0, 4, MAP_ROUTE110 - warp_def 12, 5, 0, 5, MAP_ROUTE110 - warp_def 13, 5, 0, 5, MAP_ROUTE110 - -Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: - coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 - coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 - -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: - map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc deleted file mode 100644 index 008df77af..000000000 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance: - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json new file mode 100644 index 000000000..119d5b55c --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", + "name": "Route110_SeasideCyclingRoadNorthEntrance", + "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 4 + }, + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 4 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 5 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 5 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84" + }, + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc deleted file mode 100644 index f64836526..000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 - -Route110_SeasideCyclingRoadSouthEntrance_MapWarps: - warp_def 1, 5, 0, 2, MAP_ROUTE110 - warp_def 2, 5, 0, 2, MAP_ROUTE110 - warp_def 12, 5, 0, 3, MAP_ROUTE110 - warp_def 13, 5, 0, 3, MAP_ROUTE110 - -Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: - coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 - coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 - -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: - map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 - diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc deleted file mode 100644 index be2646ee2..000000000 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance: - .4byte Route110_SeasideCyclingRoadEntrance_Layout - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents - .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json new file mode 100644 index 000000000..c5c63def1 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", + "name": "Route110_SeasideCyclingRoadSouthEntrance", + "layout": "LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 3 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 7, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0" + }, + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc deleted file mode 100644 index 814e46cbe..000000000 --- a/data/maps/Route110_TrickHouseCorridor/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route110_TrickHouseCorridor_MapWarps: - warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - -Route110_TrickHouseCorridor_MapEvents:: - map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc deleted file mode 100644 index 2a60d20d8..000000000 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseCorridor: - .4byte Route110_TrickHouseCorridor_Layout - .4byte Route110_TrickHouseCorridor_MapEvents - .4byte Route110_TrickHouseCorridor_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json new file mode 100644 index 000000000..a488e9661 --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", + "name": "Route110_TrickHouseCorridor", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 3, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 23, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 23, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc deleted file mode 100644 index 82088646e..000000000 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_TrickHouseEnd_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN - -Route110_TrickHouseEnd_MapWarps: - warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 - warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR - -Route110_TrickHouseEnd_MapCoordEvents: - coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 - -Route110_TrickHouseEnd_MapBGEvents: - bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET - -Route110_TrickHouseEnd_MapEvents:: - map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents - diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc deleted file mode 100644 index 0c2dfac3a..000000000 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd: - .4byte Route110_TrickHouseEnd_Layout - .4byte Route110_TrickHouseEnd_MapEvents - .4byte Route110_TrickHouseEnd_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_END - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json new file mode 100644 index 000000000..dafcec8a6 --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_END", + "name": "Route110_TrickHouseEnd", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_END", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHouseEnd_EventScript_26AD17", + "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN" + } + ], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_CORRIDOR", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHouseEnd_EventScript_26B041" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 4, + "y": 5, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc deleted file mode 100644 index 791ecbbc5..000000000 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route110_TrickHouseEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN - -Route110_TrickHouseEntrance_MapWarps: - warp_def 5, 7, 3, 1, MAP_ROUTE110 - warp_def 6, 7, 3, 1, MAP_ROUTE110 - warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 - -Route110_TrickHouseEntrance_MapCoordEvents: - coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 - -Route110_TrickHouseEntrance_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 - -Route110_TrickHouseEntrance_MapEvents:: - map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents - diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc deleted file mode 100644 index 0f5f0aad5..000000000 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEntrance: - .4byte Route110_TrickHouseEntrance_Layout - .4byte Route110_TrickHouseEntrance_MapEvents - .4byte Route110_TrickHouseEntrance_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json new file mode 100644 index 000000000..2f85d66c5 --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "name": "Route110_TrickHouseEntrance", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHouseEntrance_EventScript_269D3B", + "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 7, + "elevation": 3, + "dest_map": "MAP_ROUTE110", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 5, + "y": 6, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + }, + { + "type": "trigger", + "x": 7, + "y": 7, + "elevation": 3, + "var": "VAR_0x40A5", + "var_value": 0, + "script": "Route110_TrickHouseEntrance_EventScript_26A3F8" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route110_TrickHouseEntrance_EventScript_26A0D3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc deleted file mode 100644 index 3a2bb131c..000000000 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -Route110_TrickHousePuzzle1_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_19 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 13, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_18 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1B - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E - -Route110_TrickHousePuzzle1_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle1_MapBGEvents: - bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B - -Route110_TrickHousePuzzle1_MapEvents:: - map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc deleted file mode 100644 index 5835faa5f..000000000 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle1: - .4byte Route110_TrickHousePuzzle1_Layout - .4byte Route110_TrickHousePuzzle1_MapEvents - .4byte Route110_TrickHousePuzzle1_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json new file mode 100644 index 000000000..283e86793 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE1", + "name": "Route110_TrickHousePuzzle1", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route110_TrickHousePuzzle1_EventScript_26B948", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle1_EventScript_26B95F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 2, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle1_EventScript_26B976", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 13, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 11, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_29140E", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1C" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 2, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle1_EventScript_2906BB", + "flag": "FLAG_TEMP_1E" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 16, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle1_EventScript_26B92B" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc deleted file mode 100644 index c56d53dea..000000000 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route110_TrickHousePuzzle2_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL - -Route110_TrickHousePuzzle2_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle2_MapCoordEvents: - coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD - coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 - coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 - coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 - -Route110_TrickHousePuzzle2_MapBGEvents: - bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 - -Route110_TrickHousePuzzle2_MapEvents:: - map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc deleted file mode 100644 index b957dac78..000000000 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle2: - .4byte Route110_TrickHousePuzzle2_Layout - .4byte Route110_TrickHousePuzzle2_MapEvents - .4byte Route110_TrickHousePuzzle2_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json new file mode 100644 index 000000000..0c49c00f2 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE2", + "name": "Route110_TrickHousePuzzle2", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC75", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 11, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_291428", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_29141B", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 11, + "y": 12, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD" + }, + { + "type": "trigger", + "x": 0, + "y": 4, + "elevation": 0, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0" + }, + { + "type": "trigger", + "x": 14, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC03" + }, + { + "type": "trigger", + "x": 7, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle2_EventScript_26BC16" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc deleted file mode 100644 index 6e3406753..000000000 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ /dev/null @@ -1,26 +0,0 @@ -Route110_TrickHousePuzzle3_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 - -Route110_TrickHousePuzzle3_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle3_MapCoordEvents: - coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD - coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 - coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 - coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 - -Route110_TrickHousePuzzle3_MapBGEvents: - bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 - -Route110_TrickHousePuzzle3_MapEvents:: - map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc deleted file mode 100644 index b367f850e..000000000 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle3: - .4byte Route110_TrickHousePuzzle3_Layout - .4byte Route110_TrickHousePuzzle3_MapEvents - .4byte Route110_TrickHousePuzzle3_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json new file mode 100644 index 000000000..8a60428d2 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -0,0 +1,180 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE3", + "name": "Route110_TrickHousePuzzle3", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 10, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_291442", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_291435", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 1, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 2, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 14, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD" + }, + { + "type": "trigger", + "x": 3, + "y": 11, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9" + }, + { + "type": "trigger", + "x": 12, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5" + }, + { + "type": "trigger", + "x": 8, + "y": 2, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc deleted file mode 100644 index c2de17b66..000000000 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route110_TrickHousePuzzle4_EventObjects: - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_13 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_14 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_16 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_17 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A - -Route110_TrickHousePuzzle4_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle4_MapBGEvents: - bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 - -Route110_TrickHousePuzzle4_MapEvents:: - map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc deleted file mode 100644 index 9f3f637b9..000000000 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle4: - .4byte Route110_TrickHousePuzzle4_Layout - .4byte Route110_TrickHousePuzzle4_MapEvents - .4byte Route110_TrickHousePuzzle4_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json new file mode 100644 index 000000000..03a953310 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -0,0 +1,234 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE4", + "name": "Route110_TrickHousePuzzle4", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle4_EventScript_26C87E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route110_TrickHousePuzzle4_EventScript_26C895", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_29144F", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle4_EventScript_2908BA", + "flag": "FLAG_TEMP_1A" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle4_EventScript_26C861" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc deleted file mode 100644 index 88eebe092..000000000 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ /dev/null @@ -1,42 +0,0 @@ -Route110_TrickHousePuzzle5_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 - -Route110_TrickHousePuzzle5_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle5_MapCoordEvents: - coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 - coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 - coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF - coord_event 2, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBFB - coord_event 1, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC13 - coord_event 2, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC1F - coord_event 13, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC5B - coord_event 12, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC67 - coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC73 - coord_event 13, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CC97 - coord_event 12, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCA3 - coord_event 11, 4, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_26CCDF - coord_event 1, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CC07 - coord_event 3, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC2B - coord_event 4, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC37 - coord_event 5, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC43 - coord_event 6, 7, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_26CC4F - coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC7F - coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_26CC8B - coord_event 11, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCAF - coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB - coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 - -Route110_TrickHousePuzzle5_MapBGEvents: - bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 - -Route110_TrickHousePuzzle5_MapEvents:: - map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc deleted file mode 100644 index e179a016a..000000000 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle5: - .4byte Route110_TrickHousePuzzle5_Layout - .4byte Route110_TrickHousePuzzle5_MapEvents - .4byte Route110_TrickHousePuzzle5_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json new file mode 100644 index 000000000..6f995d5e9 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -0,0 +1,316 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE5", + "name": "Route110_TrickHousePuzzle5", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 6, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB32", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 0, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB53", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 14, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 14, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CB95", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7" + }, + { + "type": "trigger", + "x": 4, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3" + }, + { + "type": "trigger", + "x": 3, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF" + }, + { + "type": "trigger", + "x": 2, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB" + }, + { + "type": "trigger", + "x": 1, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC13" + }, + { + "type": "trigger", + "x": 2, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F" + }, + { + "type": "trigger", + "x": 13, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B" + }, + { + "type": "trigger", + "x": 12, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC67" + }, + { + "type": "trigger", + "x": 11, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC73" + }, + { + "type": "trigger", + "x": 13, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC97" + }, + { + "type": "trigger", + "x": 12, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3" + }, + { + "type": "trigger", + "x": 11, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_5", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF" + }, + { + "type": "trigger", + "x": 1, + "y": 17, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC07" + }, + { + "type": "trigger", + "x": 3, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B" + }, + { + "type": "trigger", + "x": 4, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC37" + }, + { + "type": "trigger", + "x": 5, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC43" + }, + { + "type": "trigger", + "x": 6, + "y": 7, + "elevation": 3, + "var": "VAR_TEMP_2", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F" + }, + { + "type": "trigger", + "x": 10, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F" + }, + { + "type": "trigger", + "x": 9, + "y": 10, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B" + }, + { + "type": "trigger", + "x": 11, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF" + }, + { + "type": "trigger", + "x": 10, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB" + }, + { + "type": "trigger", + "x": 9, + "y": 19, + "elevation": 3, + "var": "VAR_TEMP_4", + "var_value": 0, + "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 21, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle5_EventScript_26CB15" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc deleted file mode 100644 index 512164dba..000000000 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route110_TrickHousePuzzle6_EventObjects: - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL - -Route110_TrickHousePuzzle6_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle6_MapBGEvents: - bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 - -Route110_TrickHousePuzzle6_MapEvents:: - map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc deleted file mode 100644 index ec7a42d20..000000000 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle6: - .4byte Route110_TrickHousePuzzle6_Layout - .4byte Route110_TrickHousePuzzle6_MapEvents - .4byte Route110_TrickHousePuzzle6_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json new file mode 100644 index 000000000..b468e59be --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE6", + "name": "Route110_TrickHousePuzzle6", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 7, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle6_EventScript_29145C", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 0, + "y": 10, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc deleted file mode 100644 index 4dff66e1c..000000000 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route110_TrickHousePuzzle7_EventObjects: - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL - object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 8, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0 - object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0 - object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - -Route110_TrickHousePuzzle7_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END - warp_def 13, 4, 0, 4, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 7, 3, 0, 3, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 13, 11, 0, 6, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 4, 3, 0, 5, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 1, 17, 0, 8, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 0, 11, 0, 7, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 2, 3, 0, 10, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 4, 13, 0, 9, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 - -Route110_TrickHousePuzzle7_MapCoordEvents: - coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B - coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 - coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 - coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D - -Route110_TrickHousePuzzle7_MapBGEvents: - bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 - -Route110_TrickHousePuzzle7_MapEvents:: - map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc deleted file mode 100644 index ca21629e3..000000000 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle7: - .4byte Route110_TrickHousePuzzle7_Layout - .4byte Route110_TrickHousePuzzle7_MapEvents - .4byte Route110_TrickHousePuzzle7_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json new file mode 100644 index 000000000..e21657b67 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -0,0 +1,276 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "name": "Route110_TrickHousePuzzle7", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 9, + "y": 20, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E389", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 8, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_291469", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 17, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TRICK_HOUSE_STATUE", + "x": 4, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 3 + }, + { + "x": 13, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 5 + }, + { + "x": 1, + "y": 17, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 8 + }, + { + "x": 0, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 7 + }, + { + "x": 2, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 9 + }, + { + "x": 1, + "y": 3, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 12 + }, + { + "x": 8, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE7", + "dest_warp_id": 11 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 19, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E31B" + }, + { + "type": "trigger", + "x": 0, + "y": 14, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E331" + }, + { + "type": "trigger", + "x": 6, + "y": 6, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E347" + }, + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 0, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route110_TrickHousePuzzle7_EventScript_26E35D" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 17, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc deleted file mode 100644 index 2ccba5add..000000000 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route110_TrickHousePuzzle8_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL - -Route110_TrickHousePuzzle8_MapWarps: - warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END - -Route110_TrickHousePuzzle8_MapBGEvents: - bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 - -Route110_TrickHousePuzzle8_MapEvents:: - map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents - diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc deleted file mode 100644 index 1bf3fbb1c..000000000 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHousePuzzle8: - .4byte Route110_TrickHousePuzzle8_Layout - .4byte Route110_TrickHousePuzzle8_MapEvents - .4byte Route110_TrickHousePuzzle8_MapScripts - .4byte 0x0 - .2byte MUS_KARAKURI - .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 - .byte MAPSEC_ROUTE_110 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json new file mode 100644 index 000000000..023223740 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -0,0 +1,104 @@ +{ + "id": "MAP_ROUTE110_TRICK_HOUSE_PUZZLE8", + "name": "Route110_TrickHousePuzzle8", + "layout": "LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8", + "music": "MUS_KARAKURI", + "region_map_section": "MAPSEC_ROUTE_110", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 1, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E81F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E84D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route110_TrickHousePuzzle8_EventScript_26E836", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route110_TrickHousePuzzle8_EventScript_291476", + "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL" + } + ], + "warp_events": [ + { + "x": 0, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 21, + "elevation": 3, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE110_TRICK_HOUSE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 21, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route110_TrickHousePuzzle8_EventScript_26E802" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc deleted file mode 100644 index 25e409976..000000000 --- a/data/maps/Route111/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route111_MapConnectionsList: - connection down, 0, MAP_MAUVILLE_CITY - connection left, 0, MAP_ROUTE113 - connection left, 20, MAP_ROUTE112 - -Route111_MapConnections: - .4byte 3 - .4byte Route111_MapConnectionsList - diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc deleted file mode 100644 index 703c9a662..000000000 --- a/data/maps/Route111/events.inc +++ /dev/null @@ -1,114 +0,0 @@ -Route111_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F121B, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_MAN_3, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1189, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 29, 37, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1204, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_1F1260, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1F1232, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 66, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1F1249, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDF6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CDD6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2907A6, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 104, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290D9B, FLAG_ITEM_ROUTE_111_TM_37 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, BerryTreeScript, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, BerryTreeScript, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CE96, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CEB6, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF16, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_28CF36, FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DA8, FLAG_ITEM_ROUTE_111_STARDUST - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_290DB5, FLAG_ITEM_ROUTE_111_HP_UP - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_2906BB, FLAG_TEMP_13 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1F1369, 0 - object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1F1307, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_2765FF, FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN - object_event 34, EVENT_OBJ_GFX_MAN_4, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_1F1192, 0 - object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 26, 132, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route111_EventScript_1F13F9, 0 - object_event 36, EVENT_OBJ_GFX_WOMAN_2, 0, 20, 132, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, Route111_EventScript_1F1410, 0 - object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 19, 121, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route111_EventScript_1F13E2, 0 - object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 16, 119, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route111_EventScript_1F13CB, 0 - object_event 39, EVENT_OBJ_GFX_HIKER, 0, 29, 77, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 7, Route111_EventScript_1F143E, 0 - object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 22, 77, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, Route111_EventScript_1F1427, 0 - object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 37, 77, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, Route111_EventScript_1F1455, 0 - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 118, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_290DC2, FLAG_ITEM_ROUTE_111_ELIXIR - object_event 43, EVENT_OBJ_GFX_HIKER, 0, 14, 56, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 0, 0, Route111_EventScript_1F119B, 0 - object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 20, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_DESERT_FOSSIL - object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT - object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY - -Route111_MapWarps: - warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE - warp_def 29, 87, 0, 0, MAP_DESERT_RUINS - warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP - warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F - warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE - -Route111_MapCoordEvents: - coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 7, 63, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A - coord_event 18, 32, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 31, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 37, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 36, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F16 - coord_event 8, 64, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 9, 65, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 65, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 11, 66, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 12, 67, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 13, 68, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 14, 69, 3, 0, 0, Route111_EventScript_1F0FB0 - coord_event 10, 61, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 62, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 17, 38, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 16, 39, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 15, 40, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 14, 41, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 13, 42, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD - coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD - -Route111_MapBGEvents: - bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C - bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 - bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 - bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F116E - bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 - bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 - bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 - bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1177 - bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 - bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 - bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST - bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1180 - bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 - bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 - bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN - bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY - bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C - -Route111_MapEvents:: - map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents - diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc deleted file mode 100644 index 2ec5fc6ed..000000000 --- a/data/maps/Route111/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111: - .4byte Route111_Layout - .4byte Route111_MapEvents - .4byte Route111_MapScripts - .4byte Route111_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE111 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json new file mode 100644 index 000000000..6e2bdf18a --- /dev/null +++ b/data/maps/Route111/map.json @@ -0,0 +1,1115 @@ +{ + "id": "MAP_ROUTE111", + "name": "Route111", + "layout": "LAYOUT_ROUTE111", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 20, + "map": "MAP_ROUTE112" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 13, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F0FC5", + "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 13, + "y": 113, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_VICKY_WINSTRATE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F121B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 19, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 20, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 8, + "y": 91, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F1189", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1204", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 27, + "y": 69, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F1260", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 21, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route111_EventScript_1F1232", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 32, + "y": 66, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1249", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CDF6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CDD6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 18, + "y": 101, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 19, + "y": 100, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 23, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F0EB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 104, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290D9B", + "flag": "FLAG_ITEM_ROUTE_111_TM_37" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 80, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 19, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 81, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CE96", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CEB6", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 13, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 14, + "y": 86, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 54, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DA8", + "flag": "FLAG_ITEM_ROUTE_111_STARDUST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DB5", + "flag": "FLAG_ITEM_ROUTE_111_HP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 22, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 10, + "y": 82, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F12D9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 11, + "y": 71, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F12C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 32, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F12F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 4, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route111_EventScript_1F1369", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 9, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F1307", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_2765FF", + "flag": "FLAG_HIDE_ROUTE_111_SECRET_POWER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 20, + "y": 114, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F1192", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 26, + "y": 132, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route111_EventScript_1F13F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 20, + "y": 132, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route111_EventScript_1F1410", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 121, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route111_EventScript_1F13E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 16, + "y": 119, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route111_EventScript_1F13CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 29, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route111_EventScript_1F143E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route111_EventScript_1F1427", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 37, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route111_EventScript_1F1455", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 118, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_290DC2", + "flag": "FLAG_ITEM_ROUTE_111_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 14, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F119B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "x": 20, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_DESERT_FOSSIL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 19, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_111_PLAYER_DESCENT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 19, + "y": 101, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_EventScript_1F11E4", + "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY" + } + ], + "warp_events": [ + { + "x": 13, + "y": 113, + "elevation": 0, + "dest_map": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 87, + "elevation": 0, + "dest_map": "MAP_DESERT_RUINS", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 18, + "elevation": 0, + "dest_map": "MAP_ROUTE111_OLD_LADYS_REST_STOP", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 58, + "elevation": 0, + "dest_map": "MAP_MIRAGE_TOWER_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 113, + "elevation": 0, + "dest_map": "MAP_TRAINER_HILL_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 12, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 12, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 13, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 7, + "y": 63, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 12, + "y": 44, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 13, + "y": 43, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 14, + "y": 42, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 16, + "y": 40, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 14, + "y": 61, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F0A" + }, + { + "type": "trigger", + "x": 18, + "y": 32, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 17, + "y": 31, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 9, + "y": 37, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 36, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 17, + "y": 39, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 18, + "y": 38, + "elevation": 3, + "var": "VAR_TEMP_3", + "var_value": 0, + "script": "Route111_EventScript_1F0F16" + }, + { + "type": "trigger", + "x": 8, + "y": 64, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 9, + "y": 65, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 65, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 11, + "y": 66, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 12, + "y": 67, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 13, + "y": 68, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 14, + "y": 69, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FB0" + }, + { + "type": "trigger", + "x": 10, + "y": 61, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 13, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 14, + "y": 62, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 17, + "y": 38, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 16, + "y": 39, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 15, + "y": 40, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 14, + "y": 41, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 13, + "y": 42, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 12, + "y": 43, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + }, + { + "type": "trigger", + "x": 11, + "y": 44, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "Route111_EventScript_1F0FBD" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 114, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F115C" + }, + { + "type": "sign", + "x": 24, + "y": 126, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1153" + }, + { + "type": "sign", + "x": 7, + "y": 66, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1165" + }, + { + "type": "sign", + "x": 13, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F116E" + }, + { + "type": "secret_base", + "x": 24, + "y": 36, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_1" + }, + { + "type": "secret_base", + "x": 34, + "y": 50, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_1" + }, + { + "type": "secret_base", + "x": 33, + "y": 34, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_1" + }, + { + "type": "sign", + "x": 25, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1177" + }, + { + "type": "secret_base", + "x": 35, + "y": 1, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_3" + }, + { + "type": "secret_base", + "x": 35, + "y": 31, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 26, + "y": 70, + "elevation": 0, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST" + }, + { + "type": "secret_base", + "x": 27, + "y": 27, + "elevation": 3, + "secret_base_id": "SECRET_BASE_RED_CAVE4_3" + }, + { + "type": "sign", + "x": 7, + "y": 84, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F1180" + }, + { + "type": "secret_base", + "x": 14, + "y": 19, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_4" + }, + { + "type": "secret_base", + "x": 13, + "y": 19, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_1" + }, + { + "type": "hidden_item", + "x": 19, + "y": 55, + "elevation": 0, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN" + }, + { + "type": "hidden_item", + "x": 35, + "y": 66, + "elevation": 0, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY" + }, + { + "type": "sign", + "x": 24, + "y": 116, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route111_EventScript_1F146C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index c89fcb3dc..75de7dce7 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -97,7 +97,7 @@ Route111_EventScript_1F0E26:: @ 81F0E26 end Route111_EventScript_1F0E3C:: @ 81F0E3C - setmaplayoutindex 392 + setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER return Route111_EventScript_1F0E40:: @ 81F0E40 diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc deleted file mode 100644 index fbdd2e5dd..000000000 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route111_OldLadysRestStop_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 - -Route111_OldLadysRestStop_MapWarps: - warp_def 3, 7, 0, 2, MAP_ROUTE111 - warp_def 4, 7, 0, 2, MAP_ROUTE111 - -Route111_OldLadysRestStop_MapEvents:: - map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc deleted file mode 100644 index 9b2633050..000000000 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_OldLadysRestStop: - .4byte House3_Layout - .4byte Route111_OldLadysRestStop_MapEvents - .4byte Route111_OldLadysRestStop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE3 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json new file mode 100644 index 000000000..d4e77fdda --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE111_OLD_LADYS_REST_STOP", + "name": "Route111_OldLadysRestStop", + "layout": "LAYOUT_HOUSE3", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_OldLadysRestStop_EventScript_22A920", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc deleted file mode 100644 index b433e1198..000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route111_WinstrateFamilysHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 - -Route111_WinstrateFamilysHouse_MapWarps: - warp_def 3, 7, 0, 0, MAP_ROUTE111 - warp_def 4, 7, 0, 0, MAP_ROUTE111 - -Route111_WinstrateFamilysHouse_MapEvents:: - map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc deleted file mode 100644 index d37a62e00..000000000 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route111_WinstrateFamilysHouse: - .4byte House2_Layout - .4byte Route111_WinstrateFamilysHouse_MapEvents - .4byte Route111_WinstrateFamilysHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_ROUTE_111 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json new file mode 100644 index 000000000..d41cc1214 --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE", + "name": "Route111_WinstrateFamilysHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_111", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A48D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4A2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route111_WinstrateFamilysHouse_EventScript_22A4FD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc deleted file mode 100644 index 0fc8da215..000000000 --- a/data/maps/Route112/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route112_MapConnectionsList: - connection up, -60, MAP_ROUTE113 - connection left, 40, MAP_LAVARIDGE_TOWN - connection right, -20, MAP_ROUTE111 - -Route112_MapConnections: - .4byte 3 - .4byte Route112_MapConnectionsList - diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc deleted file mode 100644 index 4d1b338c3..000000000 --- a/data/maps/Route112/events.inc +++ /dev/null @@ -1,32 +0,0 @@ -Route112_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0 - object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_290DCF, FLAG_ITEM_ROUTE_112_NUGGET - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 - -Route112_MapWarps: - warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION - warp_def 6, 46, 3, 0, MAP_JAGGED_PASS - warp_def 7, 46, 3, 1, MAP_JAGGED_PASS - warp_def 11, 36, 0, 0, MAP_FIERY_PATH - warp_def 22, 10, 0, 1, MAP_FIERY_PATH - -Route112_MapBGEvents: - bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F - bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 - bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 - -Route112_MapEvents:: - map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents - diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc deleted file mode 100644 index 1cc8583a5..000000000 --- a/data/maps/Route112/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112: - .4byte Route112_Layout - .4byte Route112_MapEvents - .4byte Route112_MapScripts - .4byte Route112_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE112 - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json new file mode 100644 index 000000000..937719abf --- /dev/null +++ b/data/maps/Route112/map.json @@ -0,0 +1,287 @@ +{ + "id": "MAP_ROUTE112", + "name": "Route112", + "layout": "LAYOUT_ROUTE112", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -60, + "map": "MAP_ROUTE113" + }, + { + "direction": "left", + "offset": 40, + "map": "MAP_LAVARIDGE_TOWN" + }, + { + "direction": "right", + "offset": -20, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 26, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 24, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route112_EventScript_1F1E6A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 29, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 22, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1EFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1E81", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 27, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1DB7", + "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 27, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 24, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 28, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 23, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 6, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 22, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 21, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 8, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_1F1E61", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_EventScript_290DCF", + "flag": "FLAG_ITEM_ROUTE_112_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F11", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 31, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route112_EventScript_1F1F28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 28, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 27, + "elevation": 0, + "dest_map": "MAP_ROUTE112_CABLE_CAR_STATION", + "dest_warp_id": 1 + }, + { + "x": 6, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 46, + "elevation": 3, + "dest_map": "MAP_JAGGED_PASS", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 36, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 0 + }, + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_FIERY_PATH", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 19, + "y": 44, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E4F" + }, + { + "type": "sign", + "x": 22, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E46" + }, + { + "type": "sign", + "x": 4, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route112_EventScript_1F1E58" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc deleted file mode 100644 index 4b51decda..000000000 --- a/data/maps/Route112_CableCarStation/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route112_CableCarStation_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - -Route112_CableCarStation_MapWarps: - warp_def 6, 11, 0, 0, MAP_ROUTE112 - warp_def 7, 11, 0, 1, MAP_ROUTE112 - -Route112_CableCarStation_MapEvents:: - map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc deleted file mode 100644 index f1a00b968..000000000 --- a/data/maps/Route112_CableCarStation/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route112_CableCarStation: - .4byte CableCarStation_Layout - .4byte Route112_CableCarStation_MapEvents - .4byte Route112_CableCarStation_MapScripts - .4byte 0x0 - .2byte MUS_DOORO_X1 - .2byte LAYOUT_CABLE_CAR_STATION - .byte MAPSEC_ROUTE_112 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json new file mode 100644 index 000000000..8552ec139 --- /dev/null +++ b/data/maps/Route112_CableCarStation/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE112_CABLE_CAR_STATION", + "name": "Route112_CableCarStation", + "layout": "LAYOUT_CABLE_CAR_STATION", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_112", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route112_CableCarStation_EventScript_22AB17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 11, + "elevation": 0, + "dest_map": "MAP_ROUTE112", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc deleted file mode 100644 index a4d583ce8..000000000 --- a/data/maps/Route113/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route113_MapConnectionsList: - connection down, 60, MAP_ROUTE112 - connection left, 0, MAP_FALLARBOR_TOWN - connection right, 0, MAP_ROUTE111 - -Route113_MapConnections: - .4byte 3 - .4byte Route113_MapConnectionsList - diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc deleted file mode 100644 index bcf377e74..000000000 --- a/data/maps/Route113/events.inc +++ /dev/null @@ -1,57 +0,0 @@ -Route113_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DDC, FLAG_ITEM_ROUTE_113_MAX_ETHER - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 79, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_290DE9, FLAG_ITEM_ROUTE_113_SUPER_REPEL - object_event 8, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F2250, 0 - object_event 9, EVENT_OBJ_GFX_NINJA_BOY, 0, 71, 2, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0 - object_event 10, EVENT_OBJ_GFX_TWIN, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22C9, 0 - object_event 11, EVENT_OBJ_GFX_TWIN, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route113_EventScript_1F22E4, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route113_EventScript_290DF6, FLAG_ITEM_ROUTE_113_HYPER_POTION - object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 75, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route113_EventScript_1F2344, 0 - object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 71, 4, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route113_EventScript_1F232D, 0 - object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 - object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 - -Route113_MapWarps: - warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP - warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route113_MapCoordEvents: - coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 86, 9, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 85, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 85, 11, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 8, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH - -Route113_MapBGEvents: - bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C - bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 - bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 - bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21AE - bg_secret_base_event 49, 8, 3, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 66, 3, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_ROUTE_113_ETHER - bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 - bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET - -Route113_MapEvents:: - map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents - diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc deleted file mode 100644 index aae60a100..000000000 --- a/data/maps/Route113/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113: - .4byte Route113_Layout - .4byte Route113_MapEvents - .4byte Route113_MapScripts - .4byte Route113_MapConnections - .2byte MUS_KAZANBAI - .2byte LAYOUT_ROUTE113 - .byte MAPSEC_ROUTE_113 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json new file mode 100644 index 000000000..7dc18e572 --- /dev/null +++ b/data/maps/Route113/map.json @@ -0,0 +1,465 @@ +{ + "id": "MAP_ROUTE113", + "name": "Route113", + "layout": "LAYOUT_ROUTE113", + "music": "MUS_KAZANBAI", + "region_map_section": "MAPSEC_ROUTE_113", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 60, + "map": "MAP_ROUTE112" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE111" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 66, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_1F2193", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 36, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_1F218A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 62, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route113_EventScript_1F21C0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route113_EventScript_1F21D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 51, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route113_EventScript_1F21EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 53, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DDC", + "flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 79, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DE9", + "flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_HIDDEN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F2250", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 71, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_HIDDEN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 3, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22B2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 45, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22C9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 46, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F22E4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 15, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_EventScript_290DF6", + "flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 75, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route113_EventScript_1F2344", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 71, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route113_EventScript_1F232D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route113_EventScript_1F22FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route113_EventScript_1F2316", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 33, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE113_GLASS_WORKSHOP", + "dest_warp_id": 0 + }, + { + "x": 41, + "y": 12, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 88, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 19, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 19, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 86, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 85, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 85, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 14, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 11, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 14, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 11, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 19, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 6, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + }, + { + "type": "weather", + "x": 87, + "y": 7, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ASH" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 85, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F219C" + }, + { + "type": "sign", + "x": 12, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21A5" + }, + { + "type": "sign", + "x": 58, + "y": 4, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21B7" + }, + { + "type": "sign", + "x": 31, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route113_EventScript_1F21AE" + }, + { + "type": "secret_base", + "x": 49, + "y": 8, + "elevation": 3, + "secret_base_id": "SECRET_BASE_RED_CAVE1_3" + }, + { + "type": "hidden_item", + "x": 66, + "y": 3, + "elevation": 3, + "item": "ITEM_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_ETHER" + }, + { + "type": "hidden_item", + "x": 22, + "y": 5, + "elevation": 3, + "item": "ITEM_TM32", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_TM_32" + }, + { + "type": "hidden_item", + "x": 73, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc deleted file mode 100644 index 7c8fbe717..000000000 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route113_GlassWorkshop_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 - -Route113_GlassWorkshop_MapWarps: - warp_def 3, 8, 0, 0, MAP_ROUTE113 - warp_def 4, 8, 0, 0, MAP_ROUTE113 - -Route113_GlassWorkshop_MapEvents:: - map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc deleted file mode 100644 index e77f3acc8..000000000 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route113_GlassWorkshop: - .4byte House4_Layout - .4byte Route113_GlassWorkshop_MapEvents - .4byte Route113_GlassWorkshop_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE4 - .byte MAPSEC_ROUTE_113 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json new file mode 100644 index 000000000..185461fdb --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE113_GLASS_WORKSHOP", + "name": "Route113_GlassWorkshop", + "layout": "LAYOUT_HOUSE4", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_113", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_GlassWorkshop_EventScript_26ED1E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route113_GlassWorkshop_EventScript_26F194", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE113", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE113", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc deleted file mode 100644 index 5c7671c7c..000000000 --- a/data/maps/Route114/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route114_MapConnectionsList: - connection left, 40, MAP_ROUTE115 - connection right, 0, MAP_FALLARBOR_TOWN - -Route114_MapConnections: - .4byte 2 - .4byte Route114_MapConnectionsList - diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc deleted file mode 100644 index 9f17b54c0..000000000 --- a/data/maps/Route114/events.inc +++ /dev/null @@ -1,53 +0,0 @@ -Route114_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route114_EventScript_1F2657, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_1F266E, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_1F2685, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_1F269C, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E03, FLAG_ITEM_ROUTE_114_RARE_CANDY - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_290E10, FLAG_ITEM_ROUTE_114_PROTEIN - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1F2612, 0 - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_1F2582, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1F2777, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1F2760, 0 - object_event 17, EVENT_OBJ_GFX_MAN_5, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_2907A6, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F27A9, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route114_EventScript_1F278E, 0 - object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 28, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route114_EventScript_1F27DB, 0 - object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 26, 72, 5, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, Route114_EventScript_1F27C4, 0 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER - object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 - -Route114_MapWarps: - warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R - warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE - warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route114_MapBGEvents: - bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 - bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E - bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 - bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 - bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 - bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 - bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 - bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2637 - bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS - bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE - -Route114_MapEvents:: - map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents - diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc deleted file mode 100644 index 7177662e6..000000000 --- a/data/maps/Route114/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114: - .4byte Route114_Layout - .4byte Route114_MapEvents - .4byte Route114_MapScripts - .4byte Route114_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE114 - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json new file mode 100644 index 000000000..75f975eb6 --- /dev/null +++ b/data/maps/Route114/map.json @@ -0,0 +1,509 @@ +{ + "id": "MAP_ROUTE114", + "name": "Route114", + "layout": "LAYOUT_ROUTE114", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 40, + "map": "MAP_ROUTE115" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FALLARBOR_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 77, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 78, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 15, + "y": 65, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route114_EventScript_1F2640", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 30, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route114_EventScript_1F2657", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 22, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F266E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 19, + "y": 35, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F2685", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 20, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F269C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 68, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E03", + "flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 11, + "y": 37, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E10", + "flag": "FLAG_ITEM_ROUTE_114_PROTEIN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 43, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 19, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F25D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "x": 19, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2612", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 27, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2582", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 25, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2777", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 19, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_1F2760", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 30, + "y": 58, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F26FE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 53, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 30, + "y": 54, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 22, + "y": 69, + "elevation": 7, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 64, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 24, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route114_EventScript_1F27A9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 23, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route114_EventScript_1F278E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 28, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F27DB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 26, + "y": 72, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route114_EventScript_1F27C4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_EventScript_290E1D", + "flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route114_EventScript_1F27F2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 63, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 36, + "elevation": 0, + "dest_map": "MAP_ROUTE114_LANETTES_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 46, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 4, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2625" + }, + { + "type": "sign", + "x": 31, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F262E" + }, + { + "type": "secret_base", + "x": 9, + "y": 47, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 51, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_1" + }, + { + "type": "secret_base", + "x": 19, + "y": 70, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_1" + }, + { + "type": "secret_base", + "x": 11, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_2" + }, + { + "type": "secret_base", + "x": 12, + "y": 27, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_2" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_EventScript_1F2637" + }, + { + "type": "hidden_item", + "x": 20, + "y": 57, + "elevation": 3, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS" + }, + { + "type": "secret_base", + "x": 32, + "y": 57, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 7, + "y": 30, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc deleted file mode 100644 index dd3be1a66..000000000 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route114_FossilManiacsHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 - -Route114_FossilManiacsHouse_MapWarps: - warp_def 4, 7, 0, 1, MAP_ROUTE114 - warp_def 5, 7, 0, 1, MAP_ROUTE114 - warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL - -Route114_FossilManiacsHouse_MapBGEvents: - bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 - bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C - bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C - -Route114_FossilManiacsHouse_MapEvents:: - map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents - diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc deleted file mode 100644 index 648359c8f..000000000 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsHouse: - .4byte Route114_FossilManiacsHouse_Layout - .4byte Route114_FossilManiacsHouse_MapEvents - .4byte Route114_FossilManiacsHouse_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json new file mode 100644 index 000000000..c3c29bdd9 --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -0,0 +1,89 @@ +{ + "id": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "name": "Route114_FossilManiacsHouse", + "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_FossilManiacsHouse_EventScript_22AD3A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + }, + { + "type": "sign", + "x": 6, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD73" + }, + { + "type": "sign", + "x": 7, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + }, + { + "type": "sign", + "x": 8, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "Route114_FossilManiacsHouse_EventScript_22AD7C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc deleted file mode 100644 index ec9551959..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 - -Route114_FossilManiacsTunnel_MapWarps: - warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS - -Route114_FossilManiacsTunnel_MapCoordEvents: - coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 - coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 - -Route114_FossilManiacsTunnel_MapEvents:: - map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc deleted file mode 100644 index 9012e1d40..000000000 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_FossilManiacsTunnel: - .4byte Route114_FossilManiacsTunnel_Layout - .4byte Route114_FossilManiacsTunnel_MapEvents - .4byte Route114_FossilManiacsTunnel_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json new file mode 100644 index 000000000..48b3ca7f4 --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "name": "Route114_FossilManiacsTunnel", + "layout": "LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF87", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 25, + "elevation": 3, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 2 + }, + { + "x": 7, + "y": 25, + "elevation": 3, + "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_HOUSE", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 2, + "elevation": 0, + "dest_map": "MAP_DESERT_UNDERPASS", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 5, + "y": 4, + "elevation": 3, + "var": "VAR_0x40CC", + "var_value": 1, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + }, + { + "type": "trigger", + "x": 6, + "y": 4, + "elevation": 3, + "var": "VAR_0x40CC", + "var_value": 1, + "script": "Route114_FossilManiacsTunnel_EventScript_22AF66" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc deleted file mode 100644 index ccd082851..000000000 --- a/data/maps/Route114_LanettesHouse/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE - -Route114_LanettesHouse_MapWarps: - warp_def 5, 7, 0, 2, MAP_ROUTE114 - warp_def 6, 7, 0, 2, MAP_ROUTE114 - -Route114_LanettesHouse_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 - -Route114_LanettesHouse_MapEvents:: - map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents - diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc deleted file mode 100644 index 7b5b94963..000000000 --- a/data/maps/Route114_LanettesHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route114_LanettesHouse: - .4byte Route114_LanettesHouse_Layout - .4byte Route114_LanettesHouse_MapEvents - .4byte Route114_LanettesHouse_MapScripts - .4byte 0x0 - .2byte MUS_TONEKUSA - .2byte LAYOUT_ROUTE114_LANETTES_HOUSE - .byte MAPSEC_ROUTE_114 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json new file mode 100644 index 000000000..5dbe09a09 --- /dev/null +++ b/data/maps/Route114_LanettesHouse/map.json @@ -0,0 +1,74 @@ +{ + "id": "MAP_ROUTE114_LANETTES_HOUSE", + "name": "Route114_LanettesHouse", + "layout": "LAYOUT_ROUTE114_LANETTES_HOUSE", + "music": "MUS_TONEKUSA", + "region_map_section": "MAPSEC_ROUTE_114", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route114_LanettesHouse_EventScript_22B2D2", + "flag": "FLAG_HIDE_LANETTES_HOUSE_LANETTE" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE114", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B309" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B345" + }, + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route114_LanettesHouse_EventScript_22B345" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc deleted file mode 100644 index a569fd0b5..000000000 --- a/data/maps/Route115/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route115_MapConnectionsList: - connection down, 0, MAP_RUSTBORO_CITY - connection right, -40, MAP_ROUTE114 - -Route115_MapConnections: - .4byte 2 - .4byte Route115_MapConnectionsList - diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc deleted file mode 100644 index 517711bd5..000000000 --- a/data/maps/Route115/events.inc +++ /dev/null @@ -1,49 +0,0 @@ -Route115_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 19, 15, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 24, 62, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E2A, FLAG_ITEM_ROUTE_115_SUPER_POTION - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 18, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E37, FLAG_ITEM_ROUTE_115_TM_01 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_290E44, FLAG_ITEM_ROUTE_115_IRON - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_2907A6, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E51, FLAG_ITEM_ROUTE_115_GREAT_BALL - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 10, 15, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route115_EventScript_1F2AE2, 0 - object_event 18, EVENT_OBJ_GFX_NINJA_BOY, 0, 11, 12, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route115_EventScript_1F2AF9, 0 - object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 15, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B27, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route115_EventScript_1F2B10, 0 - object_event 21, EVENT_OBJ_GFX_LASS, 0, 28, 62, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2B3E, 0 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER - -Route115_MapWarps: - warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R - warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route115_MapBGEvents: - bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 - bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 - bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C - bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F2985 - bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 - bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 - bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 - bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3 - bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3 - bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4 - bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3 - bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3 - bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 - bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE - -Route115_MapEvents:: - map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents - diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc deleted file mode 100644 index fd3f9b2fc..000000000 --- a/data/maps/Route115/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route115: - .4byte Route115_Layout - .4byte Route115_MapEvents - .4byte Route115_MapScripts - .4byte Route115_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE115 - .byte MAPSEC_ROUTE_115 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json new file mode 100644 index 000000000..58e5a602b --- /dev/null +++ b/data/maps/Route115/map.json @@ -0,0 +1,455 @@ +{ + "id": "MAP_ROUTE115", + "name": "Route115", + "layout": "LAYOUT_ROUTE115", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_115", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_ROUTE114" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 18, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_1F2973", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route115_EventScript_1F298E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 27, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2A07", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 69, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 70, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 71, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route115_EventScript_1F2A69", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 19, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route115_EventScript_1F29F0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 24, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2ACB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E2A", + "flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 18, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E37", + "flag": "FLAG_ITEM_ROUTE_115_TM_01" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E44", + "flag": "FLAG_ITEM_ROUTE_115_IRON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 64, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 55, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 31, + "y": 65, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 56, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 29, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E51", + "flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 10, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route115_EventScript_1F2AE2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 11, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route115_EventScript_1F2AF9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 15, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B27", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B10", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 28, + "y": 62, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route115_EventScript_1F2B3E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 67, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E6B", + "flag": "FLAG_ITEM_ROUTE_115_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route115_EventScript_290E5E", + "flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER" + } + ], + "warp_events": [ + { + "x": 27, + "y": 37, + "elevation": 0, + "dest_map": "MAP_METEOR_FALLS_1F_1R", + "dest_warp_id": 1 + }, + { + "x": 21, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 36, + "y": 10, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 32, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE4_2" + }, + { + "type": "secret_base", + "x": 21, + "y": 18, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_2" + }, + { + "type": "sign", + "x": 16, + "y": 64, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route115_EventScript_1F297C" + }, + { + "type": "sign", + "x": 25, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route115_EventScript_1F2985" + }, + { + "type": "secret_base", + "x": 8, + "y": 30, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_3" + }, + { + "type": "secret_base", + "x": 32, + "y": 39, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_2" + }, + { + "type": "secret_base", + "x": 26, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_2" + }, + { + "type": "secret_base", + "x": 23, + "y": 8, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE1_3" + }, + { + "type": "secret_base", + "x": 32, + "y": 46, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE2_3" + }, + { + "type": "secret_base", + "x": 7, + "y": 20, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_4" + }, + { + "type": "secret_base", + "x": 8, + "y": 20, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE3_3" + }, + { + "type": "secret_base", + "x": 25, + "y": 24, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BROWN_CAVE3_3" + }, + { + "type": "secret_base", + "x": 20, + "y": 53, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_1" + }, + { + "type": "hidden_item", + "x": 15, + "y": 49, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc deleted file mode 100644 index bbf03097c..000000000 --- a/data/maps/Route116/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route116_MapConnectionsList: - connection down, 80, MAP_VERDANTURF_TOWN - connection left, 0, MAP_RUSTBORO_CITY - -Route116_MapConnections: - .4byte 2 - .4byte Route116_MapConnectionsList - diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc deleted file mode 100644 index 29566f515..000000000 --- a/data/maps/Route116/events.inc +++ /dev/null @@ -1,56 +0,0 @@ -Route116_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E85, FLAG_ITEM_ROUTE_116_ETHER - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E92, FLAG_ITEM_ROUTE_116_REPEL - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_EXPERT_M, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1F2D84, FLAG_HIDE_ROUTE_116_MR_BRINEY - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 28, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_13 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_14 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_290E9F, FLAG_ITEM_ROUTE_116_HP_UP - object_event 16, EVENT_OBJ_GFX_LASS, 0, 26, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2CA2, FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290E78, FLAG_ITEM_ROUTE_116_X_SPECIAL - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_1F2C70, FLAG_HIDE_ROUTE_116_TUNNELER - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1F2DB6, FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN - object_event 23, EVENT_OBJ_GFX_WOMAN_2, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route116_EventScript_1F3041, 0 - object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 33, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_1F3058, 0 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 34, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_290EAC, FLAG_ITEM_ROUTE_116_POTION - object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_2906BB, FLAG_TEMP_15 - object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 - object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 - -Route116_MapWarps: - warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL - warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE - warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL - warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route116_MapCoordEvents: - coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 - -Route116_MapBGEvents: - bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 - bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 - bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 - bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 - bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 - bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D72 - bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D7B - bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 - bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 - bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION - bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES - -Route116_MapEvents:: - map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents - diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc deleted file mode 100644 index d4688d63a..000000000 --- a/data/maps/Route116/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116: - .4byte Route116_Layout - .4byte Route116_MapEvents - .4byte Route116_MapScripts - .4byte Route116_MapConnections - .2byte MUS_NEXTROAD - .2byte LAYOUT_ROUTE116 - .byte MAPSEC_ROUTE_116 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json new file mode 100644 index 000000000..7e76a9e63 --- /dev/null +++ b/data/maps/Route116/map.json @@ -0,0 +1,527 @@ +{ + "id": "MAP_ROUTE116", + "name": "Route116", + "layout": "LAYOUT_ROUTE116", + "music": "MUS_NEXTROAD", + "region_map_section": "MAPSEC_ROUTE_116", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 80, + "map": "MAP_VERDANTURF_TOWN" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_RUSTBORO_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 25, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 19, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 26, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2E89", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 21, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 32, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 13, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F2EA0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E85", + "flag": "FLAG_ITEM_ROUTE_116_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 10, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E92", + "flag": "FLAG_ITEM_ROUTE_116_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 20, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 66, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 21, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 67, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 46, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2D84", + "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 28, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 36, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2F65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 24, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 80, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E9F", + "flag": "FLAG_ITEM_ROUTE_116_HP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 26, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F2F7C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 22, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route116_EventScript_1F2F93", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route116_EventScript_1F2EB7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 46, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2CA2", + "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 55, + "y": 12, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290E78", + "flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 38, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2C70", + "flag": "FLAG_HIDE_ROUTE_116_TUNNELER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 74, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_1F2DB6", + "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route116_EventScript_1F3041", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 33, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route116_EventScript_1F3058", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 34, + "y": 7, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_290EAC", + "flag": "FLAG_ITEM_ROUTE_116_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 30, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_EventScript_2906BB", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 36, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route116_EventScript_1F3086", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 42, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route116_EventScript_1F306F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 47, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 0 + }, + { + "x": 38, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 65, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 2 + }, + { + "x": 59, + "y": 13, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 79, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 47, + "y": 9, + "elevation": 3, + "var": "VAR_0x406F", + "var_value": 1, + "script": "Route116_EventScript_1F2D95" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D57" + }, + { + "type": "sign", + "x": 48, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D60" + }, + { + "type": "sign", + "x": 40, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D69" + }, + { + "type": "secret_base", + "x": 71, + "y": 4, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_1" + }, + { + "type": "secret_base", + "x": 79, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_1" + }, + { + "type": "sign", + "x": 16, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D72" + }, + { + "type": "sign", + "x": 29, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route116_EventScript_1F2D7B" + }, + { + "type": "secret_base", + "x": 56, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_2" + }, + { + "type": "secret_base", + "x": 55, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_2" + }, + { + "type": "hidden_item", + "x": 22, + "y": 9, + "elevation": 3, + "item": "ITEM_SUPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION" + }, + { + "type": "hidden_item", + "x": 70, + "y": 13, + "elevation": 3, + "item": "ITEM_BLACK_GLASSES", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc deleted file mode 100644 index 5ecd36317..000000000 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route116_TunnelersRestHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 - -Route116_TunnelersRestHouse_MapWarps: - warp_def 4, 8, 0, 1, MAP_ROUTE116 - warp_def 5, 8, 0, 1, MAP_ROUTE116 - -Route116_TunnelersRestHouse_MapEvents:: - map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc deleted file mode 100644 index f50a13c93..000000000 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route116_TunnelersRestHouse: - .4byte Route116_TunnelersRestHouse_Layout - .4byte Route116_TunnelersRestHouse_MapEvents - .4byte Route116_TunnelersRestHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE - .byte MAPSEC_ROUTE_116 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json new file mode 100644 index 000000000..0301a32ee --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_ROUTE116_TUNNELERS_REST_HOUSE", + "name": "Route116_TunnelersRestHouse", + "layout": "LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_116", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B85A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B86C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route116_TunnelersRestHouse_EventScript_22B863", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc deleted file mode 100644 index 101690881..000000000 --- a/data/maps/Route117/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route117_MapConnectionsList: - connection left, 0, MAP_VERDANTURF_TOWN - connection right, 0, MAP_MAUVILLE_CITY - -Route117_MapConnections: - .4byte 2 - .4byte Route117_MapConnectionsList - diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc deleted file mode 100644 index 217068cd3..000000000 --- a/data/maps/Route117/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -Route117_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 33, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EB9, FLAG_ITEM_ROUTE_117_GREAT_BALL - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_2906BB, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_290EC6, FLAG_ITEM_ROUTE_117_REVIVE - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 - object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 - -Route117_MapWarps: - warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE - -Route117_MapBGEvents: - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 - bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE - bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 - bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL - -Route117_MapEvents:: - map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents - diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc deleted file mode 100644 index 4ae1b92e5..000000000 --- a/data/maps/Route117/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117: - .4byte Route117_Layout - .4byte Route117_MapEvents - .4byte Route117_MapScripts - .4byte Route117_MapConnections - .2byte MUS_DOORO_X1 - .2byte LAYOUT_ROUTE117 - .byte MAPSEC_ROUTE_117 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json new file mode 100644 index 000000000..ab9aa7b24 --- /dev/null +++ b/data/maps/Route117/map.json @@ -0,0 +1,385 @@ +{ + "id": "MAP_ROUTE117", + "name": "Route117", + "layout": "LAYOUT_ROUTE117", + "music": "MUS_DOORO_X1", + "region_map_section": "MAPSEC_ROUTE_117", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_VERDANTURF_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 13, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F399A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 25, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F39A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 47, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_291C18", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 33, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 39, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 42, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 49, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "x": 38, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 8, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3A94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route117_EventScript_1F3A32", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 33, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F39D0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 41, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 29, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 42, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 28, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 43, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 27, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 16, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_290EB9", + "flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 9, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_290EC6", + "flag": "FLAG_ITEM_ROUTE_117_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 26, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route117_EventScript_1F3AF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 17, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3B58", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 43, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route117_EventScript_1F3BD3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 42, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route117_EventScript_1F3B6F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 48, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_EventScript_1F39AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 15, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C4E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 21, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C65", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "x": 16, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 4, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route117_EventScript_1F3C37", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 51, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE117_POKEMON_DAY_CARE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39B5" + }, + { + "type": "sign", + "x": 49, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39BE" + }, + { + "type": "sign", + "x": 49, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route117_EventScript_1F39C7" + }, + { + "type": "hidden_item", + "x": 3, + "y": 18, + "elevation": 3, + "item": "ITEM_REPEL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_117_REPEL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc deleted file mode 100644 index 6b5d2cc7a..000000000 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route117_PokemonDayCare_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 - -Route117_PokemonDayCare_MapWarps: - warp_def 2, 8, 0, 0, MAP_ROUTE117 - warp_def 3, 8, 0, 0, MAP_ROUTE117 - -Route117_PokemonDayCare_MapEvents:: - map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc deleted file mode 100644 index 827464a75..000000000 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route117_PokemonDayCare: - .4byte Route117_PokemonDayCare_Layout - .4byte Route117_PokemonDayCare_MapEvents - .4byte Route117_PokemonDayCare_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE117_POKEMON_DAY_CARE - .byte MAPSEC_ROUTE_117 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json new file mode 100644 index 000000000..a62485c74 --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_ROUTE117_POKEMON_DAY_CARE", + "name": "Route117_PokemonDayCare", + "layout": "LAYOUT_ROUTE117_POKEMON_DAY_CARE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_117", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route117_PokemonDayCare_EventScript_291D11", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE117", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE117", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc deleted file mode 100644 index 54ecf1577..000000000 --- a/data/maps/Route118/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route118_MapConnectionsList: - connection up, 40, MAP_ROUTE119 - connection left, 0, MAP_MAUVILLE_CITY - connection right, 0, MAP_ROUTE123 - -Route118_MapConnections: - .4byte 3 - .4byte Route118_MapConnectionsList - diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc deleted file mode 100644 index 3dea1c6f6..000000000 --- a/data/maps/Route118/events.inc +++ /dev/null @@ -1,46 +0,0 @@ -Route118_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_1F4079, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CE36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CED6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CEF6, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF16, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_28CF36, FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route118_EventScript_2906BB, FLAG_TEMP_11 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1F4000, 0 - object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_1F4090, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1F4017, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_118_STEVEN - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION - object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 - -Route118_MapWarps: - warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE - -Route118_MapCoordEvents: - coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E - coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE - coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 - -Route118_MapBGEvents: - bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C - bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 - bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 - bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 - bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 - bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1 - bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE - -Route118_MapEvents:: - map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents - diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc deleted file mode 100644 index d38319d96..000000000 --- a/data/maps/Route118/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route118: - .4byte Route118_Layout - .4byte Route118_MapEvents - .4byte Route118_MapScripts - .4byte Route118_MapConnections - .2byte MUS_ROUTE_118 - .2byte LAYOUT_ROUTE118 - .byte MAPSEC_ROUTE_118 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json new file mode 100644 index 000000000..135e7eb74 --- /dev/null +++ b/data/maps/Route118/map.json @@ -0,0 +1,421 @@ +{ + "id": "MAP_ROUTE118", + "name": "Route118", + "layout": "LAYOUT_ROUTE118", + "music": "MUS_ROUTE_118", + "region_map_section": "MAPSEC_ROUTE_118", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 40, + "map": "MAP_ROUTE119" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_MAUVILLE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE123" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 31, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 32, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 33, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 64, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4079", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CE16", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CE36", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 12, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F3E73", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CED6", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CEF6", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 33, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 34, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 38, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 28, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F3E14", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 7, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route118_EventScript_1F3F87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 14, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_1F4000", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 56, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4090", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 39, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route118_EventScript_1F3FE9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 17, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route118_EventScript_1F4017", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 44, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_118_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 69, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route118_EventScript_290ED3", + "flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route118_EventScript_1F40A7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 42, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 43, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3E8E" + }, + { + "type": "trigger", + "x": 44, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3EAE" + }, + { + "type": "trigger", + "x": 45, + "y": 11, + "elevation": 3, + "var": "VAR_0x4071", + "var_value": 0, + "script": "Route118_EventScript_1F3EC4" + } + ], + "bg_events": [ + { + "type": "secret_base", + "x": 47, + "y": 14, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_1" + }, + { + "type": "sign", + "x": 13, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route118_EventScript_1F3E7C" + }, + { + "type": "sign", + "x": 56, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route118_EventScript_1F3E85" + }, + { + "type": "secret_base", + "x": 67, + "y": 6, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_1" + }, + { + "type": "secret_base", + "x": 29, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_2" + }, + { + "type": "secret_base", + "x": 47, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_3" + }, + { + "type": "secret_base", + "x": 46, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_1" + }, + { + "type": "hidden_item", + "x": 31, + "y": 13, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 14, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc deleted file mode 100644 index 067db34f1..000000000 --- a/data/maps/Route119/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route119_MapConnectionsList: - connection down, -40, MAP_ROUTE118 - connection right, 0, MAP_FORTREE_CITY - -Route119_MapConnections: - .4byte 2 - .4byte Route119_MapConnectionsList - diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc deleted file mode 100644 index 9942a4c4f..000000000 --- a/data/maps/Route119/events.inc +++ /dev/null @@ -1,99 +0,0 @@ -Route119_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F479D, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F4810, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F4786, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1F4872, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0 - object_event 12, EVENT_OBJ_GFX_NINJA_BOY, 0, 28, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 1, Route119_EventScript_1F4902, 0 - object_event 13, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_1F4919, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_5, 0, 8, 63, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0 - object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EE0, FLAG_ITEM_ROUTE_119_SUPER_REPEL - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EED, FLAG_ITEM_ROUTE_119_ZINC - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290EFA, FLAG_ITEM_ROUTE_119_ELIXIR_1 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F07, FLAG_ITEM_ROUTE_119_LEAF_STONE - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F14, FLAG_ITEM_ROUTE_119_RARE_CANDY - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_290F21, FLAG_ITEM_ROUTE_119_HYPER_POTION_1 - object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49A3, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1F49BA, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1F49D1, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, BerryTreeScript, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, BerryTreeScript, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, BerryTreeScript, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, BerryTreeScript, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_1F476B, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F2E, FLAG_ITEM_ROUTE_119_HYPER_POTION_2 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1F49DA, 0 - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_1F4930, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_27231C, FLAG_HIDE_ROUTE_119_KECLEON_1 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 15, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_272329, FLAG_HIDE_ROUTE_119_KECLEON_2 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1F4947, 0 - object_event 38, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 68, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route119_EventScript_1F498C, 0 - object_event 39, EVENT_OBJ_GFX_MAN_5, 0, 16, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route119_EventScript_1F4975, 0 - object_event 40, EVENT_OBJ_GFX_MAN_5, 0, 32, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route119_EventScript_1F495E, 0 - object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_291399, FLAG_ITEM_ROUTE_119_NUGGET - object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 - object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT - -Route119_MapWarps: - warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F - warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE - -Route119_MapCoordEvents: - coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 - coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D - coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE - -Route119_MapBGEvents: - bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D - bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 - bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 - bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 - bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 - bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2 - bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1 - bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1 - bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3 - bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3 - bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM - bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL - bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3 - bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3 - bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3 - bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3 - bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 - bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL - bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER - bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 - -Route119_MapEvents:: - map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents - diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc deleted file mode 100644 index 0e3685b37..000000000 --- a/data/maps/Route119/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119: - .4byte Route119_Layout - .4byte Route119_MapEvents - .4byte Route119_MapScripts - .4byte Route119_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE119 - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json new file mode 100644 index 000000000..fd6c836b7 --- /dev/null +++ b/data/maps/Route119/map.json @@ -0,0 +1,920 @@ +{ + "id": "MAP_ROUTE119", + "name": "Route119", + "layout": "LAYOUT_ROUTE119", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": -40, + "map": "MAP_ROUTE118" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_FORTREE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 34, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 25, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 35, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 26, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 36, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 12, + "y": 123, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47E2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 26, + "y": 123, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47B4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 5, + "y": 125, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F479D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 74, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4810", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 28, + "y": 116, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F4786", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 35, + "y": 83, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_EventScript_1F4872", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 34, + "y": 122, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47CB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 17, + "y": 128, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F47F9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route119_EventScript_1F4902", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 19, + "y": 49, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4919", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 10, + "y": 50, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F48D4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 8, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route119_EventScript_1F48EB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 25, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 121, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EE0", + "flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 4, + "y": 96, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EED", + "flag": "FLAG_ITEM_ROUTE_119_ZINC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 29, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290EFA", + "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 25, + "y": 76, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F07", + "flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F14", + "flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 117, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F21", + "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 33, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49A3", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 34, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49BA", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 17, + "y": 33, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_RIVAL_ON_BIKE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 31, + "y": 109, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 8, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 83, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 9, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 84, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 29, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 85, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 30, + "y": 90, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 86, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "x": 19, + "y": 133, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F476B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 56, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F2E", + "flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 35, + "y": 93, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F49DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 29, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4930", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 31, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_27231C", + "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 25, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_272329", + "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 13, + "y": 104, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_1F4947", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 8, + "y": 68, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route119_EventScript_1F498C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 16, + "y": 52, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_EventScript_1F4975", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 32, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route119_EventScript_1F495E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 19, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_291399", + "flag": "FLAG_ITEM_ROUTE_119_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 24, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_EventScript_290F3B", + "flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 28, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_119_SCOTT" + } + ], + "warp_events": [ + { + "x": 6, + "y": 32, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "dest_warp_id": 0 + }, + { + "x": 33, + "y": 109, + "elevation": 0, + "dest_map": "MAP_ROUTE119_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 31, + "elevation": 0, + "var": "VAR_0x4072", + "var_value": 0, + "script": "Route119_EventScript_1F4472" + }, + { + "type": "trigger", + "x": 26, + "y": 31, + "elevation": 0, + "var": "VAR_0x4072", + "var_value": 0, + "script": "Route119_EventScript_1F447D" + }, + { + "type": "weather", + "x": 29, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 30, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 31, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 32, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 15, + "y": 133, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 16, + "y": 132, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 17, + "y": 131, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 18, + "y": 130, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 131, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 20, + "y": 132, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 21, + "y": 133, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + }, + { + "type": "weather", + "x": 36, + "y": 6, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 36, + "y": 7, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 35, + "y": 8, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 35, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 16, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 17, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 18, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 19, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 20, + "y": 137, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 34, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE119_CYCLE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 9, + "y": 33, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F477D" + }, + { + "type": "sign", + "x": 27, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F4774" + }, + { + "type": "secret_base", + "x": 5, + "y": 2, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_1" + }, + { + "type": "secret_base", + "x": 4, + "y": 89, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_2" + }, + { + "type": "secret_base", + "x": 5, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_1" + }, + { + "type": "secret_base", + "x": 7, + "y": 101, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB2_2" + }, + { + "type": "secret_base", + "x": 34, + "y": 24, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB3_1" + }, + { + "type": "secret_base", + "x": 31, + "y": 73, + "elevation": 3, + "secret_base_id": "SECRET_BASE_SHRUB4_1" + }, + { + "type": "secret_base", + "x": 16, + "y": 81, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_3" + }, + { + "type": "secret_base", + "x": 16, + "y": 28, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_3" + }, + { + "type": "hidden_item", + "x": 17, + "y": 82, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM" + }, + { + "type": "hidden_item", + "x": 38, + "y": 63, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL" + }, + { + "type": "secret_base", + "x": 26, + "y": 81, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_3" + }, + { + "type": "secret_base", + "x": 19, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_3" + }, + { + "type": "secret_base", + "x": 18, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE4_3" + }, + { + "type": "secret_base", + "x": 4, + "y": 15, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB3_3" + }, + { + "type": "secret_base", + "x": 6, + "y": 2, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB4_3" + }, + { + "type": "hidden_item", + "x": 26, + "y": 120, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 20, + "y": 29, + "elevation": 3, + "item": "ITEM_MAX_ETHER", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER" + }, + { + "type": "sign", + "x": 28, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_EventScript_1F49E3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc deleted file mode 100644 index 152deabee..000000000 --- a/data/maps/Route119_House/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route119_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 - -Route119_House_MapWarps: - warp_def 3, 8, 0, 1, MAP_ROUTE119 - warp_def 4, 8, 0, 1, MAP_ROUTE119 - -Route119_House_MapEvents:: - map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc deleted file mode 100644 index d7bbbd5ff..000000000 --- a/data/maps/Route119_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_House: - .4byte House1_Layout - .4byte Route119_House_MapEvents - .4byte Route119_House_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json new file mode 100644 index 000000000..fdfd19f78 --- /dev/null +++ b/data/maps/Route119_House/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_ROUTE119_HOUSE", + "name": "Route119_House", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_270966", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 3, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 6, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_House_EventScript_27096F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc deleted file mode 100644 index e8f3b93f8..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -Route119_WeatherInstitute_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS - object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 - -Route119_WeatherInstitute_1F_MapWarps: - warp_def 9, 12, 0, 0, MAP_ROUTE119 - warp_def 10, 12, 0, 0, MAP_ROUTE119 - warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F - -Route119_WeatherInstitute_1F_MapBGEvents: - bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 - -Route119_WeatherInstitute_1F_MapEvents:: - map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents - diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc deleted file mode 100644 index be2fe1617..000000000 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_1F: - .4byte Route119_WeatherInstitute_1F_Layout - .4byte Route119_WeatherInstitute_1F_MapEvents - .4byte Route119_WeatherInstitute_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json new file mode 100644 index 000000000..9101e2495 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -0,0 +1,141 @@ +{ + "id": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "name": "Route119_WeatherInstitute_1F", + "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB29", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB40", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FB0F", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 2, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FAC8", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 14, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_1F_EventScript_26FAA4", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_ROUTE119", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 1, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 0, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + }, + { + "type": "sign", + "x": 0, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route119_WeatherInstitute_1F_EventScript_26FB18" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc deleted file mode 100644 index 746384820..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route119_WeatherInstitute_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS - object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA - -Route119_WeatherInstitute_2F_MapWarps: - warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F - -Route119_WeatherInstitute_2F_MapEvents:: - map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc deleted file mode 100644 index 8543b0ed8..000000000 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_WeatherInstitute_2F: - .4byte Route119_WeatherInstitute_2F_Layout - .4byte Route119_WeatherInstitute_2F_MapEvents - .4byte Route119_WeatherInstitute_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F - .byte MAPSEC_ROUTE_119 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json new file mode 100644 index 000000000..a8a1ebf62 --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -0,0 +1,133 @@ +{ + "id": "MAP_ROUTE119_WEATHER_INSTITUTE_2F", + "name": "Route119_WeatherInstitute_2F", + "layout": "LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_119", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF7F", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF96", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_2F_EventScript_26FFAD", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 18, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route119_WeatherInstitute_2F_EventScript_27018B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 16, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 19, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route119_WeatherInstitute_2F_EventScript_26FF68", + "flag": "FLAG_HIDE_ROUTE_119_TEAM_AQUA" + } + ], + "warp_events": [ + { + "x": 17, + "y": 1, + "elevation": 0, + "dest_map": "MAP_ROUTE119_WEATHER_INSTITUTE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc deleted file mode 100644 index 9dda2ecad..000000000 --- a/data/maps/Route120/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route120_MapConnectionsList: - connection left, 0, MAP_FORTREE_CITY - connection right, 80, MAP_ROUTE121 - -Route120_MapConnections: - .4byte 2 - .4byte Route120_MapConnectionsList - diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc deleted file mode 100644 index d198dff3c..000000000 --- a/data/maps/Route120/events.inc +++ /dev/null @@ -1,90 +0,0 @@ -Route120_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_MAN_5, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0 - object_event 12, EVENT_OBJ_GFX_MAN_5, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_1F5850, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_1F5867, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_1F587E, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F48, FLAG_ITEM_ROUTE_120_NUGGET - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE76, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CE56, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF16, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_28CF36, FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_11 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_290F55, FLAG_ITEM_ROUTE_120_FULL_HEAL - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_1F5527, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_5, 0, 31, 37, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_1F590E, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route120_EventScript_1F5925, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_HIDE_ROUTE_120_STEVEN - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12 - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 - object_event 35, EVENT_OBJ_GFX_NINJA_BOY, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F5953, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722DB, FLAG_HIDE_ROUTE_120_KECLEON_2 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722E8, FLAG_HIDE_ROUTE_120_KECLEON_3 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_2722F5, FLAG_HIDE_ROUTE_120_KECLEON_4 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_27230F, FLAG_HIDE_ROUTE_120_KECLEON_6 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_272302, FLAG_HIDE_ROUTE_120_KECLEON_5 - object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 19, 32, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route120_EventScript_1F5981, 0 - object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 - object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE - -Route120_MapWarps: - warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB - warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB - -Route120_MapCoordEvents: - coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT - coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS - coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS - -Route120_MapBGEvents: - bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 - bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE - bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 - bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 - bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 - bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2 - bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3 - bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3 - bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3 - bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1 - bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE - bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2 - bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC - bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 - -Route120_MapEvents:: - map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents - diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc deleted file mode 100644 index 4d48d8b33..000000000 --- a/data/maps/Route120/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route120: - .4byte Route120_Layout - .4byte Route120_MapEvents - .4byte Route120_MapScripts - .4byte Route120_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE120 - .byte MAPSEC_ROUTE_120 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json new file mode 100644 index 000000000..db93042de --- /dev/null +++ b/data/maps/Route120/map.json @@ -0,0 +1,858 @@ +{ + "id": "MAP_ROUTE120", + "name": "Route120", + "layout": "LAYOUT_ROUTE120", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_120", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_FORTREE_CITY" + }, + { + "direction": "right", + "offset": 80, + "map": "MAP_ROUTE121" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 4, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 46, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 5, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 45, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 6, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 44, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 7, + "y": 79, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 43, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 34, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 37, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 35, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 38, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 36, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 39, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 9, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 40, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 10, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 41, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 42, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 5, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F57D7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 32, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F57EE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 27, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route120_EventScript_1F5850", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 36, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route120_EventScript_1F5867", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 19, + "y": 80, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F587E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 55, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F48", + "flag": "FLAG_ITEM_ROUTE_120_NUGGET" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CE76", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CE56", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 36, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CF16", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 37, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_28CF36", + "flag": "FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 35, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 89, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F55", + "flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 14, + "y": 92, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F5527", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 31, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F58E0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 9, + "y": 60, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F58F7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 16, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route120_EventScript_1F590E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 18, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5925", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 22, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F6F", + "flag": "FLAG_ITEM_ROUTE_120_NEST_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 23, + "y": 82, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F62", + "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 12, + "y": 16, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F57BC", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 13, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_1F5641", + "flag": "FLAG_HIDE_ROUTE_120_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 20, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 15, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 10, + "y": 72, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_MOUNTAIN_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F593C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 19, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5953", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 20, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722DB", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 27, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722E8", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 4, + "y": 77, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_2722F5", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 7, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_27230F", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 19, + "y": 48, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_272302", + "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 19, + "y": 32, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F5981", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route120_EventScript_1F596A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 24, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route120_EventScript_290F7C", + "flag": "FLAG_ITEM_ROUTE_120_REVIVE" + } + ], + "warp_events": [ + { + "x": 7, + "y": 55, + "elevation": 0, + "dest_map": "MAP_ANCIENT_TOMB", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 23, + "elevation": 1, + "dest_map": "MAP_SCORCHED_SLAB", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 7, + "y": 15, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 7, + "y": 16, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 22, + "y": 61, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 12, + "y": 64, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_RAIN_LIGHT" + }, + { + "type": "weather", + "x": 35, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 36, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 37, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 38, + "y": 63, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 88, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 28, + "y": 15, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 28, + "y": 16, + "elevation": 0, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 28, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 32, + "y": 89, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 90, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 32, + "y": 91, + "elevation": 5, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 10, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 11, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 12, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + }, + { + "type": "weather", + "x": 13, + "y": 75, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_CLOUDS" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 27, + "y": 3, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route120_EventScript_1F57C5" + }, + { + "type": "sign", + "x": 38, + "y": 88, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route120_EventScript_1F57CE" + }, + { + "type": "secret_base", + "x": 28, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE3_1" + }, + { + "type": "secret_base", + "x": 30, + "y": 62, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE4_1" + }, + { + "type": "secret_base", + "x": 26, + "y": 10, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB3_2" + }, + { + "type": "secret_base", + "x": 29, + "y": 85, + "elevation": 5, + "secret_base_id": "SECRET_BASE_SHRUB4_2" + }, + { + "type": "secret_base", + "x": 18, + "y": 12, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_3" + }, + { + "type": "secret_base", + "x": 38, + "y": 54, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_3" + }, + { + "type": "secret_base", + "x": 31, + "y": 23, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB2_3" + }, + { + "type": "hidden_item", + "x": 9, + "y": 1, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1" + }, + { + "type": "hidden_item", + "x": 31, + "y": 11, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE" + }, + { + "type": "hidden_item", + "x": 0, + "y": 86, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2" + }, + { + "type": "hidden_item", + "x": 24, + "y": 42, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_120_ZINC" + }, + { + "type": "secret_base", + "x": 5, + "y": 76, + "elevation": 0, + "secret_base_id": "SECRET_BASE_SHRUB1_4" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc deleted file mode 100644 index 6d9bd9ae4..000000000 --- a/data/maps/Route121/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route121_MapConnectionsList: - connection down, 20, MAP_ROUTE122 - connection left, -80, MAP_ROUTE120 - connection right, -10, MAP_LILYCOVE_CITY - -Route121_MapConnections: - .4byte 3 - .4byte Route121_MapConnectionsList - diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc deleted file mode 100644 index 5e637bb7e..000000000 --- a/data/maps/Route121/events.inc +++ /dev/null @@ -1,55 +0,0 @@ -Route121_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, BerryTreeScript, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F89, FLAG_ITEM_ROUTE_121_CARBOS - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_13 - object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 11, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 3, Route121_EventScript_1F5F9C, 0 - object_event 24, EVENT_OBJ_GFX_MAN_4, 0, 59, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route121_EventScript_1F5FB3, 0 - object_event 25, EVENT_OBJ_GFX_WOMAN_2, 0, 59, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route121_EventScript_1F5FCA, 0 - object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 65, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, Route121_EventScript_1F5FE1, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_5, 0, 72, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 6, Route121_EventScript_1F5FF8, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC - -Route121_MapWarps: - warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -Route121_MapCoordEvents: - coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 - -Route121_MapBGEvents: - bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 - bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 - bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 - bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 - bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 - bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E0F - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL - bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE - -Route121_MapEvents:: - map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents - diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc deleted file mode 100644 index 04cee6942..000000000 --- a/data/maps/Route121/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121: - .4byte Route121_Layout - .4byte Route121_MapEvents - .4byte Route121_MapScripts - .4byte Route121_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE121 - .byte MAPSEC_ROUTE_121 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json new file mode 100644 index 000000000..82b7139a3 --- /dev/null +++ b/data/maps/Route121/map.json @@ -0,0 +1,536 @@ +{ + "id": "MAP_ROUTE121", + "name": "Route121", + "layout": "LAYOUT_ROUTE121", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_121", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 20, + "map": "MAP_ROUTE122" + }, + { + "direction": "left", + "offset": -80, + "map": "MAP_ROUTE120" + }, + { + "direction": "right", + "offset": -10, + "map": "MAP_LILYCOVE_CITY" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 29, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_1F5DFD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 47, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 48, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 16, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 49, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 50, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 64, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 51, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 65, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 52, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 66, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 53, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 67, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 54, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 39, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route121_EventScript_1F5F04", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 40, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route121_EventScript_1F5F1F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 31, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 32, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 65, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 63, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5E74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 55, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route121_EventScript_1F5E8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5EED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 22, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5F3A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 55, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290F89", + "flag": "FLAG_ITEM_ROUTE_121_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 26, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route121_EventScript_1F5F9C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 59, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5FB3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 59, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route121_EventScript_1F5FCA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 65, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route121_EventScript_1F5FE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 72, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route121_EventScript_1F5FF8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 60, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290F96", + "flag": "FLAG_ITEM_ROUTE_121_REVIVE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_EventScript_290FA3", + "flag": "FLAG_ITEM_ROUTE_121_ZINC" + } + ], + "warp_events": [ + { + "x": 37, + "y": 5, + "elevation": 0, + "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 25, + "y": 5, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 6, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 7, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + }, + { + "type": "trigger", + "x": 25, + "y": 8, + "elevation": 3, + "var": "VAR_0x4074", + "var_value": 0, + "script": "Route121_EventScript_1F5E18" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_EventScript_1F5E06" + }, + { + "type": "secret_base", + "x": 40, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE2_2" + }, + { + "type": "secret_base", + "x": 18, + "y": 13, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE3_2" + }, + { + "type": "secret_base", + "x": 43, + "y": 7, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE1_2" + }, + { + "type": "secret_base", + "x": 42, + "y": 7, + "elevation": 0, + "secret_base_id": "SECRET_BASE_TREE2_2" + }, + { + "type": "sign", + "x": 39, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_EventScript_1F5E0F" + }, + { + "type": "hidden_item", + "x": 23, + "y": 10, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP" + }, + { + "type": "hidden_item", + "x": 58, + "y": 3, + "elevation": 3, + "item": "ITEM_NUGGET", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET" + }, + { + "type": "hidden_item", + "x": 72, + "y": 5, + "elevation": 3, + "item": "ITEM_FULL_HEAL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL" + }, + { + "type": "hidden_item", + "x": 68, + "y": 8, + "elevation": 3, + "item": "ITEM_MAX_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc deleted file mode 100644 index 73c836cff..000000000 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route121_SafariZoneEntrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 - -Route121_SafariZoneEntrance_MapWarps: - warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH - warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH - warp_def 14, 13, 0, 0, MAP_ROUTE121 - warp_def 15, 13, 0, 0, MAP_ROUTE121 - -Route121_SafariZoneEntrance_MapCoordEvents: - coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 - -Route121_SafariZoneEntrance_MapBGEvents: - bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 - -Route121_SafariZoneEntrance_MapEvents:: - map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents - diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc deleted file mode 100644 index b23cdeccc..000000000 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route121_SafariZoneEntrance: - .4byte Route121_SafariZoneEntrance_Layout - .4byte Route121_SafariZoneEntrance_MapEvents - .4byte Route121_SafariZoneEntrance_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE - .byte MAPSEC_ROUTE_121 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json new file mode 100644 index 000000000..878798477 --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "name": "Route121_SafariZoneEntrance", + "layout": "LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_ROUTE_121", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "x": 17, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BBE6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BBEF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTH", + "dest_warp_id": 0 + }, + { + "x": 3, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTH", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE121", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 13, + "elevation": 0, + "dest_map": "MAP_ROUTE121", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 0, + "script": "Route121_SafariZoneEntrance_EventScript_22BC18" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route121_SafariZoneEntrance_EventScript_22BD21" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc deleted file mode 100644 index a5a9f4fd6..000000000 --- a/data/maps/Route122/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route122_MapConnectionsList: - connection up, -20, MAP_ROUTE121 - connection down, -100, MAP_ROUTE123 - -Route122_MapConnections: - .4byte 2 - .4byte Route122_MapConnectionsList - diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc deleted file mode 100644 index 8eb4dbb2c..000000000 --- a/data/maps/Route122/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Route122_MapWarps: - warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F - -Route122_MapEvents:: - map_events 0x0, Route122_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc deleted file mode 100644 index 941fff7a3..000000000 --- a/data/maps/Route122/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route122: - .4byte Route122_Layout - .4byte Route122_MapEvents - .4byte Route122_MapScripts - .4byte Route122_MapConnections - .2byte MUS_DOORO_X4 - .2byte LAYOUT_ROUTE122 - .byte MAPSEC_ROUTE_122 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json new file mode 100644 index 000000000..9dee984d9 --- /dev/null +++ b/data/maps/Route122/map.json @@ -0,0 +1,39 @@ +{ + "id": "MAP_ROUTE122", + "name": "Route122", + "layout": "LAYOUT_ROUTE122", + "music": "MUS_DOORO_X4", + "region_map_section": "MAPSEC_ROUTE_122", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -20, + "map": "MAP_ROUTE121" + }, + { + "direction": "down", + "offset": -100, + "map": "MAP_ROUTE123" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 29, + "elevation": 0, + "dest_map": "MAP_MT_PYRE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc deleted file mode 100644 index e2125c911..000000000 --- a/data/maps/Route123/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route123_MapConnectionsList: - connection up, 100, MAP_ROUTE122 - connection left, 0, MAP_ROUTE118 - -Route123_MapConnections: - .4byte 2 - .4byte Route123_MapConnectionsList - diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc deleted file mode 100644 index 2584ebbd3..000000000 --- a/data/maps/Route123/events.inc +++ /dev/null @@ -1,88 +0,0 @@ -Route123_EventObjects: - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, BerryTreeScript, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, BerryTreeScript, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, BerryTreeScript, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, BerryTreeScript, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, BerryTreeScript, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, BerryTreeScript, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, BerryTreeScript, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, BerryTreeScript, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, BerryTreeScript, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, BerryTreeScript, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, BerryTreeScript, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, BerryTreeScript, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_11 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_12 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_2906BB, FLAG_TEMP_13 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_290FB0, FLAG_ITEM_ROUTE_123_CALCIUM - object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_1F6151, 0 - object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, BerryTreeScript, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, BerryTreeScript, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, BerryTreeScript, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0 - object_event 27, EVENT_OBJ_GFX_TWIN, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0 - object_event 28, EVENT_OBJ_GFX_TWIN, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0 - object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route123_EventScript_1F620A, 0 - object_event 30, EVENT_OBJ_GFX_LASS, 0, 49, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_1F626C, 0 - object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route123_EventScript_1F6304, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FBD, FLAG_ITEM_ROUTE_123_ULTRA_BALL - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FCA, FLAG_ITEM_ROUTE_123_ELIXIR - object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 138, 14, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 1, Route123_EventScript_1F6377, 0 - object_event 35, EVENT_OBJ_GFX_WOMAN_2, 0, 138, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, Route123_EventScript_1F6360, 0 - object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 87, 17, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route123_EventScript_1F6349, 0 - object_event 37, EVENT_OBJ_GFX_MAN_5, 0, 66, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, Route123_EventScript_1F63BC, 0 - object_event 38, EVENT_OBJ_GFX_MAN_5, 0, 66, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F6332, 0 - object_event 39, EVENT_OBJ_GFX_EXPERT_M, 0, 49, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, Route123_EventScript_1F631B, 0 - object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 43, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FD7, FLAG_ITEM_ROUTE_123_PP_UP - object_event 41, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, Route123_EventScript_1F638E, 0 - object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 - object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB - -Route123_MapWarps: - warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE - -Route123_MapCoordEvents: - coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY - coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE - -Route123_MapBGEvents: - bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 - bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 - bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 - bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61AA - bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL - bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61BC - bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 - bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE - bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION - bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP - bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY - -Route123_MapEvents:: - map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents - diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc deleted file mode 100644 index 2a0120cfd..000000000 --- a/data/maps/Route123/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123: - .4byte Route123_Layout - .4byte Route123_MapEvents - .4byte Route123_MapScripts - .4byte Route123_MapConnections - .2byte MUS_DOORO_X4 - .2byte LAYOUT_ROUTE123 - .byte MAPSEC_ROUTE_123 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json new file mode 100644 index 000000000..d5a99b75c --- /dev/null +++ b/data/maps/Route123/map.json @@ -0,0 +1,840 @@ +{ + "id": "MAP_ROUTE123", + "name": "Route123", + "layout": "LAYOUT_ROUTE123", + "music": "MUS_DOORO_X4", + "region_map_section": "MAPSEC_ROUTE_123", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 100, + "map": "MAP_ROUTE122" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE118" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 58, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 59, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 60, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 61, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 81, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 62, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 82, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 63, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 83, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 64, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 70, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F61C5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 58, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F61DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 65, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 72, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 73, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 74, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 17, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 79, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 18, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 14, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 11, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 15, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 12, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 30, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 101, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 129, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "x": 92, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_2906BB", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FB0", + "flag": "FLAG_ITEM_ROUTE_123_CALCIUM" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 108, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_1F6151", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 109, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 87, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 110, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 88, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 111, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 89, + "script": "BerryTreeScript", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 18, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F61F3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 38, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F62E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 37, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F62CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 138, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route123_EventScript_1F620A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 49, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F626C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "x": 87, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route123_EventScript_1F6304", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 27, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FBD", + "flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 75, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FCA", + "flag": "FLAG_ITEM_ROUTE_123_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 138, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_TREE_DISGUISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F6377", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 138, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route123_EventScript_1F6360", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 87, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route123_EventScript_1F6349", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 66, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F63BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 66, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F6332", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 49, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route123_EventScript_1F631B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 43, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FD7", + "flag": "FLAG_ITEM_ROUTE_123_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route123_EventScript_1F638E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 14, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route123_EventScript_1F63A5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 57, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_EventScript_290FE4", + "flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB" + } + ], + "warp_events": [ + { + "x": 22, + "y": 6, + "elevation": 0, + "dest_map": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "weather", + "x": 90, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 92, + "y": 9, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 93, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 92, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 91, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 34, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 19, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + }, + { + "type": "weather", + "x": 108, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 109, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 110, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 111, + "y": 17, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 112, + "y": 18, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 12, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 13, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 14, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 15, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 9, + "y": 16, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_SUNNY" + }, + { + "type": "weather", + "x": 94, + "y": 10, + "elevation": 3, + "weather": "COORD_EVENT_WEATHER_ROUTE123_CYCLE" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 117, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61B3" + }, + { + "type": "secret_base", + "x": 47, + "y": 3, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_2" + }, + { + "type": "secret_base", + "x": 49, + "y": 3, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE2_2" + }, + { + "type": "sign", + "x": 10, + "y": 12, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61AA" + }, + { + "type": "hidden_item", + "x": 75, + "y": 1, + "elevation": 3, + "item": "ITEM_SUPER_REPEL", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL" + }, + { + "type": "sign", + "x": 20, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route123_EventScript_1F61BC" + }, + { + "type": "secret_base", + "x": 57, + "y": 5, + "elevation": 0, + "secret_base_id": "SECRET_BASE_BLUE_CAVE1_3" + }, + { + "type": "hidden_item", + "x": 12, + "y": 1, + "elevation": 3, + "item": "ITEM_REVIVE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE" + }, + { + "type": "hidden_item", + "x": 91, + "y": 15, + "elevation": 3, + "item": "ITEM_HYPER_POTION", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION" + }, + { + "type": "hidden_item", + "x": 139, + "y": 15, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP" + }, + { + "type": "hidden_item", + "x": 138, + "y": 18, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc deleted file mode 100644 index 4ad6c2b63..000000000 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route123_BerryMastersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 - -Route123_BerryMastersHouse_MapWarps: - warp_def 3, 7, 0, 0, MAP_ROUTE123 - warp_def 4, 7, 0, 0, MAP_ROUTE123 - -Route123_BerryMastersHouse_MapEvents:: - map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc deleted file mode 100644 index 158471eaa..000000000 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route123_BerryMastersHouse: - .4byte House2_Layout - .4byte Route123_BerryMastersHouse_MapEvents - .4byte Route123_BerryMastersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_ROUTE_123 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json new file mode 100644 index 000000000..47ad26314 --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_ROUTE123_BERRY_MASTERS_HOUSE", + "name": "Route123_BerryMastersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_ROUTE_123", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_BerryMastersHouse_EventScript_26F845", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route123_BerryMastersHouse_EventScript_26F8C0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE123", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_ROUTE123", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc deleted file mode 100644 index 959719385..000000000 --- a/data/maps/Route124/connections.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route124_MapConnectionsList: - connection down, 0, MAP_ROUTE126 - connection left, 10, MAP_LILYCOVE_CITY - connection right, 0, MAP_ROUTE125 - connection right, 40, MAP_MOSSDEEP_CITY - connection dive, 0, MAP_UNDERWATER1 - -Route124_MapConnections: - .4byte 5 - .4byte Route124_MapConnectionsList - diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc deleted file mode 100644 index 4096396e8..000000000 --- a/data/maps/Route124/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route124_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 23, 1, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 6, 8, 1, 5, Route124_EventScript_1F6615, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 58, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_1F662C, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FF1, FLAG_ITEM_ROUTE_124_RED_SHARD - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_290FFE, FLAG_ITEM_ROUTE_124_BLUE_SHARD - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_29100B, FLAG_ITEM_ROUTE_124_YELLOW_SHARD - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F6643, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route124_EventScript_1F66A7, 0 - object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 - object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 - -Route124_MapWarps: - warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - -Route124_MapBGEvents: - bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C - -Route124_MapEvents:: - map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents - diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc deleted file mode 100644 index 189d0dc51..000000000 --- a/data/maps/Route124/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124: - .4byte Route124_Layout - .4byte Route124_MapEvents - .4byte Route124_MapScripts - .4byte Route124_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE124 - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json new file mode 100644 index 000000000..1f3ef4f6c --- /dev/null +++ b/data/maps/Route124/map.json @@ -0,0 +1,220 @@ +{ + "id": "MAP_ROUTE124", + "name": "Route124", + "layout": "LAYOUT_ROUTE124", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "left", + "offset": 10, + "map": "MAP_LILYCOVE_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE125" + }, + { + "direction": "right", + "offset": 40, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER1" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 34, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F6585", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 61, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 5, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F659C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 49, + "y": 45, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route124_EventScript_1F65B3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 8, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F6615", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 58, + "y": 58, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 7, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route124_EventScript_1F662C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 28, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FF1", + "flag": "FLAG_ITEM_ROUTE_124_RED_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 53, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_290FFE", + "flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 58, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_EventScript_29100B", + "flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F6643", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 17, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route124_EventScript_1F66A7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route124_EventScript_1F670B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 69, + "y": 74, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route124_EventScript_1F6722", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 70, + "y": 48, + "elevation": 3, + "dest_map": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 73, + "y": 48, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_EventScript_1F657C" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc deleted file mode 100644 index 4cff6a1f3..000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route124_DivingTreasureHuntersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps: - warp_def 3, 8, 0, 0, MAP_ROUTE124 - warp_def 4, 8, 0, 0, MAP_ROUTE124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents: - bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 - -Route124_DivingTreasureHuntersHouse_MapEvents:: - map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc deleted file mode 100644 index 46358f337..000000000 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route124_DivingTreasureHuntersHouse: - .4byte Route124_DivingTreasureHuntersHouse_Layout - .4byte Route124_DivingTreasureHuntersHouse_MapEvents - .4byte Route124_DivingTreasureHuntersHouse_MapScripts - .4byte 0x0 - .2byte MUS_MINAMO - .2byte LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - .byte MAPSEC_ROUTE_124 - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json new file mode 100644 index 000000000..ed159e565 --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "name": "Route124_DivingTreasureHuntersHouse", + "layout": "LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE", + "music": "MUS_MINAMO", + "region_map_section": "MAPSEC_ROUTE_124", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 5, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route124_DivingTreasureHuntersHouse_EventScript_270A32", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE124", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_ROUTE124", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 7, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Route124_DivingTreasureHuntersHouse_EventScript_270F63" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc deleted file mode 100644 index 61ea9f029..000000000 --- a/data/maps/Route125/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route125_MapConnectionsList: - connection down, 0, MAP_MOSSDEEP_CITY - connection left, 0, MAP_ROUTE124 - connection dive, 0, MAP_UNDERWATER7 - -Route125_MapConnections: - .4byte 3 - .4byte Route125_MapConnectionsList - diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc deleted file mode 100644 index e278d6e24..000000000 --- a/data/maps/Route125/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route125_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route125_EventScript_1F6800, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F6862, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route125_EventScript_1F687D, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 43, 19, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 2, 1, 1, 3, Route125_EventScript_1F6898, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL - -Route125_MapWarps: - warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -Route125_MapBGEvents: - bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 - bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 - bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 - bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 - -Route125_MapEvents:: - map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents - diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc deleted file mode 100644 index b3a7308f3..000000000 --- a/data/maps/Route125/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route125: - .4byte Route125_Layout - .4byte Route125_MapEvents - .4byte Route125_MapScripts - .4byte Route125_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE125 - .byte MAPSEC_ROUTE_125 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json new file mode 100644 index 000000000..55f9b692d --- /dev/null +++ b/data/maps/Route125/map.json @@ -0,0 +1,204 @@ +{ + "id": "MAP_ROUTE125", + "name": "Route125", + "layout": "LAYOUT_ROUTE125", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_125", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE124" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER7" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 31, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F67A4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 45, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 2, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F67BB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 38, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F67D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 30, + "y": 28, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 9, + "movement_range_y": 9, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F67E9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 21, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route125_EventScript_1F6800", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 17, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route125_EventScript_1F6862", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 18, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route125_EventScript_1F687D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 43, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F6898", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 48, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route125_EventScript_1F68AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 46, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route125_EventScript_291018", + "flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL" + } + ], + "warp_events": [ + { + "x": 22, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 53, + "y": 10, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE1_2" + }, + { + "type": "secret_base", + "x": 55, + "y": 11, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE4_2" + }, + { + "type": "secret_base", + "x": 7, + "y": 25, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE2_2" + }, + { + "type": "secret_base", + "x": 24, + "y": 32, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc deleted file mode 100644 index 5784faa25..000000000 --- a/data/maps/Route126/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route126_MapConnectionsList: - connection up, 0, MAP_ROUTE124 - connection right, 0, MAP_ROUTE127 - connection dive, 0, MAP_UNDERWATER2 - -Route126_MapConnections: - .4byte 3 - .4byte Route126_MapConnectionsList - diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc deleted file mode 100644 index 04355d668..000000000 --- a/data/maps/Route126/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route126_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 48, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_1F691B, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_291025, FLAG_ITEM_ROUTE_126_GREEN_SHARD - object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 15, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6960, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 66, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6977, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 - -Route126_MapEvents:: - map_events Route126_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc deleted file mode 100644 index f0eabeeba..000000000 --- a/data/maps/Route126/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route126: - .4byte Route126_Layout - .4byte Route126_MapEvents - .4byte Route126_MapScripts - .4byte Route126_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE126 - .byte MAPSEC_ROUTE_126 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json new file mode 100644 index 000000000..8ccd3c365 --- /dev/null +++ b/data/maps/Route126/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_ROUTE126", + "name": "Route126", + "layout": "LAYOUT_ROUTE126", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_126", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE124" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER2" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 51, + "y": 65, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 10, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F68D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 56, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 9, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F68ED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 63, + "y": 43, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F6904", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 9, + "y": 48, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route126_EventScript_1F691B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route126_EventScript_291025", + "flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 15, + "y": 66, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6960", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 66, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6977", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 64, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6949", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 56, + "y": 5, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route126_EventScript_1F6932", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc deleted file mode 100644 index 8dcdf7978..000000000 --- a/data/maps/Route127/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route127_MapConnectionsList: - connection up, 0, MAP_MOSSDEEP_CITY - connection down, 0, MAP_ROUTE128 - connection left, 0, MAP_ROUTE126 - connection dive, 0, MAP_UNDERWATER3 - -Route127_MapConnections: - .4byte 4 - .4byte Route127_MapConnectionsList - diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc deleted file mode 100644 index 7b9e040d3..000000000 --- a/data/maps/Route127/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route127_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29103F, FLAG_ITEM_ROUTE_127_CARBOS - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0 - object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 15, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY - -Route127_MapBGEvents: - bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 - bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 - bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 - bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 - bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 - -Route127_MapEvents:: - map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents - diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc deleted file mode 100644 index 0a7055f1c..000000000 --- a/data/maps/Route127/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route127: - .4byte Route127_Layout - .4byte Route127_MapEvents - .4byte Route127_MapScripts - .4byte Route127_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE127 - .byte MAPSEC_ROUTE_127 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json new file mode 100644 index 000000000..06fd540d2 --- /dev/null +++ b/data/maps/Route127/map.json @@ -0,0 +1,221 @@ +{ + "id": "MAP_ROUTE127", + "name": "Route127", + "layout": "LAYOUT_ROUTE127", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_127", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_MOSSDEEP_CITY" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE128" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE126" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER3" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 45, + "y": 42, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6A35", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 18, + "y": 68, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route127_EventScript_1F6A4C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_291032", + "flag": "FLAG_ITEM_ROUTE_127_ZINC" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 64, + "y": 39, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_29103F", + "flag": "FLAG_ITEM_ROUTE_127_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 42, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A63", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 64, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A91", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 54, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_1F6A7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 15, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6AA8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 63, + "y": 63, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route127_EventScript_1F6AD6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 12, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route127_EventScript_1F6ABF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route127_EventScript_29104C", + "flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "secret_base", + "x": 59, + "y": 67, + "elevation": 0, + "secret_base_id": "SECRET_BASE_RED_CAVE4_1" + }, + { + "type": "secret_base", + "x": 59, + "y": 72, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_2" + }, + { + "type": "secret_base", + "x": 67, + "y": 63, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_1" + }, + { + "type": "secret_base", + "x": 61, + "y": 21, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE3_3" + }, + { + "type": "secret_base", + "x": 45, + "y": 24, + "elevation": 0, + "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc deleted file mode 100644 index b958dbd3b..000000000 --- a/data/maps/Route128/connections.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route128_MapConnectionsList: - connection up, 0, MAP_ROUTE127 - connection down, 0, MAP_ROUTE129 - connection right, -40, MAP_EVER_GRANDE_CITY - connection dive, 0, MAP_UNDERWATER4 - -Route128_MapConnections: - .4byte 4 - .4byte Route128_MapConnectionsList - diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc deleted file mode 100644 index 6a449b761..000000000 --- a/data/maps/Route128/events.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route128_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN - object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_ARCHIE - object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_MAXIE - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_1F6DB0, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_1F6D99, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route128_EventScript_1F6D82, 0 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 - object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 - -Route128_MapBGEvents: - bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 - bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 - bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 - -Route128_MapEvents:: - map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents - diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc deleted file mode 100644 index 33894ba7c..000000000 --- a/data/maps/Route128/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route128: - .4byte Route128_Layout - .4byte Route128_MapEvents - .4byte Route128_MapScripts - .4byte Route128_MapConnections - .2byte MUS_DOORO_X3 - .2byte LAYOUT_ROUTE128 - .byte MAPSEC_ROUTE_128 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json new file mode 100644 index 000000000..b1d63ef63 --- /dev/null +++ b/data/maps/Route128/map.json @@ -0,0 +1,197 @@ +{ + "id": "MAP_ROUTE128", + "name": "Route128", + "layout": "LAYOUT_ROUTE128", + "music": "MUS_DOORO_X3", + "region_map_section": "MAPSEC_ROUTE_128", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE129" + }, + { + "direction": "right", + "offset": -40, + "map": "MAP_EVER_GRANDE_CITY" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 33, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6CBE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 78, + "y": 24, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 5, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 7, + "script": "Route128_EventScript_1F6D20", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 40, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 37, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 38, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_ROUTE_128_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 63, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route128_EventScript_1F6DB0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 47, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6D99", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 24, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route128_EventScript_1F6D82", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 101, + "y": 29, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route128_EventScript_1F6DDE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 101, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route128_EventScript_1F6DC7", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 49, + "y": 9, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 57, + "y": 21, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2" + }, + { + "type": "hidden_item", + "x": 31, + "y": 33, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3" + } + ] +} \ No newline at end of file diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc deleted file mode 100644 index c486c13cb..000000000 --- a/data/maps/Route129/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route129_MapConnectionsList: - connection up, 0, MAP_ROUTE128 - connection left, 0, MAP_ROUTE130 - connection dive, 0, MAP_UNDERWATER5 - -Route129_MapConnections: - .4byte 3 - .4byte Route129_MapConnectionsList - diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc deleted file mode 100644 index 3919274cd..000000000 --- a/data/maps/Route129/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route129_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 - -Route129_MapEvents:: - map_events Route129_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc deleted file mode 100644 index fd3cae801..000000000 --- a/data/maps/Route129/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route129: - .4byte Route129_Layout - .4byte Route129_MapEvents - .4byte Route129_MapScripts - .4byte Route129_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE129 - .byte MAPSEC_ROUTE_129 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json new file mode 100644 index 000000000..310a3e06a --- /dev/null +++ b/data/maps/Route129/map.json @@ -0,0 +1,102 @@ +{ + "id": "MAP_ROUTE129", + "name": "Route129", + "layout": "LAYOUT_ROUTE129", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_129", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE128" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE130" + }, + { + "direction": "dive", + "offset": 0, + "map": "MAP_UNDERWATER5" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 28, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 3, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route129_EventScript_1F72EC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 14, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP", + "movement_range_x": 5, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route129_EventScript_1F7303", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 13, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route129_EventScript_1F7331", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 35, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_ROTATE_CLOCKWISE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route129_EventScript_1F731A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 13, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_IN_PLACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route129_EventScript_1F7348", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc deleted file mode 100644 index 4300eaae4..000000000 --- a/data/maps/Route130/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route130_MapConnectionsList: - connection left, 0, MAP_ROUTE131 - connection right, 0, MAP_ROUTE129 - -Route130_MapConnections: - .4byte 2 - .4byte Route130_MapConnectionsList - diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc deleted file mode 100644 index b07cc1001..000000000 --- a/data/maps/Route130/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route130_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 - -Route130_MapEvents:: - map_events Route130_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc deleted file mode 100644 index 5afd25eda..000000000 --- a/data/maps/Route130/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route130: - .4byte Route130_Layout - .4byte Route130_MapEvents - .4byte Route130_MapScripts - .4byte Route130_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE130 - .byte MAPSEC_ROUTE_130 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json new file mode 100644 index 000000000..d9797e5cc --- /dev/null +++ b/data/maps/Route130/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_ROUTE130", + "name": "Route130", + "layout": "LAYOUT_ROUTE130", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_130", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE131" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 70, + "y": 21, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN", + "movement_range_x": 3, + "movement_range_y": 6, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route130_EventScript_1F73BF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 7, + "y": 21, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route130_EventScript_1F73D6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "x": 52, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_BERRY_TREE_GROWTH", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 82, + "script": "BerryTreeScript", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 7, + "y": 30, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route130_EventScript_1F73ED", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 5c7696eb7..819d9e4f3 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -23,11 +23,11 @@ Route130_MapScript1_1F7365: @ 81F7365 setflag FLAG_TEMP_1D setflag FLAG_TEMP_1E setflag FLAG_TEMP_1F - setmaplayoutindex 263 + setmaplayoutindex LAYOUT_ROUTE130 end Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex 46 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4 end Route130_EventScript_1F73B5:: @ 81F73B5 diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc deleted file mode 100644 index 9697ba1e0..000000000 --- a/data/maps/Route131/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route131_MapConnectionsList: - connection left, 0, MAP_PACIFIDLOG_TOWN - connection right, 0, MAP_ROUTE130 - -Route131_MapConnections: - .4byte 2 - .4byte Route131_MapConnectionsList - diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc deleted file mode 100644 index 4f57f7b1c..000000000 --- a/data/maps/Route131/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route131_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 3, 5, 1, 3, Route131_EventScript_1F746E, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F7485, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route131_EventScript_1F74A0, 0 - object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 - object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 - -Route131_MapWarps: - warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE - -Route131_MapEvents:: - map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc deleted file mode 100644 index 177dba5ab..000000000 --- a/data/maps/Route131/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route131: - .4byte Route131_Layout - .4byte Route131_MapEvents - .4byte Route131_MapScripts - .4byte Route131_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE131 - .byte MAPSEC_ROUTE_131 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json new file mode 100644 index 000000000..f8d56cc35 --- /dev/null +++ b/data/maps/Route131/map.json @@ -0,0 +1,144 @@ +{ + "id": "MAP_ROUTE131", + "name": "Route131", + "layout": "LAYOUT_ROUTE131", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_131", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_PACIFIDLOG_TOWN" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE130" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 41, + "y": 32, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN", + "movement_range_x": 5, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route131_EventScript_1F7429", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 18, + "y": 19, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 7, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route131_EventScript_1F7440", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route131_EventScript_1F7457", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 31, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP", + "movement_range_x": 3, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route131_EventScript_1F746E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 9, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route131_EventScript_1F7485", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "x": 8, + "y": 16, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route131_EventScript_1F74A0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 52, + "y": 20, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route131_EventScript_1F74D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 52, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route131_EventScript_1F74BB", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 36, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index da36f4001..700ac25f6 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A end Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex 319 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470 return Route131_EventScript_1F741F:: @ 81F741F diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc deleted file mode 100644 index 48999eb5c..000000000 --- a/data/maps/Route132/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route132_MapConnectionsList: - connection left, 0, MAP_ROUTE133 - connection right, 0, MAP_PACIFIDLOG_TOWN - -Route132_MapConnections: - .4byte 2 - .4byte Route132_MapConnectionsList - diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc deleted file mode 100644 index 8ced11205..000000000 --- a/data/maps/Route132/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 - object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 33, 26, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_5, 0, 33, 31, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 21, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN - -Route132_MapEvents:: - map_events Route132_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc deleted file mode 100644 index 06e0ac05d..000000000 --- a/data/maps/Route132/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route132: - .4byte Route132_Layout - .4byte Route132_MapEvents - .4byte Route132_MapScripts - .4byte Route132_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE132 - .byte MAPSEC_ROUTE_132 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json new file mode 100644 index 000000000..719863d2b --- /dev/null +++ b/data/maps/Route132/map.json @@ -0,0 +1,162 @@ +{ + "id": "MAP_ROUTE132", + "name": "Route132", + "layout": "LAYOUT_ROUTE132", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_132", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE133" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_PACIFIDLOG_TOWN" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 40, + "y": 13, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route132_EventScript_1F74EA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 10, + "y": 6, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT", + "movement_range_x": 3, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route132_EventScript_1F7501", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 10, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route132_EventScript_291059", + "flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 9, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F752F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 49, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "Route132_EventScript_1F7518", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 33, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F7546", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 33, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F755D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 21, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F758B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 1, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route132_EventScript_1F7574", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 20, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route132_EventScript_291066", + "flag": "FLAG_ITEM_ROUTE_132_PROTEIN" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc deleted file mode 100644 index 6a7777c4b..000000000 --- a/data/maps/Route133/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route133_MapConnectionsList: - connection left, 0, MAP_ROUTE134 - connection right, 0, MAP_ROUTE132 - -Route133_MapConnections: - .4byte 2 - .4byte Route133_MapConnectionsList - diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc deleted file mode 100644 index 641489016..000000000 --- a/data/maps/Route133/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291073, FLAG_ITEM_ROUTE_133_BIG_PEARL - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_291080, FLAG_ITEM_ROUTE_133_STAR_PIECE - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 37, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 - object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 56, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 - object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE - -Route133_MapEvents:: - map_events Route133_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc deleted file mode 100644 index 2d4cc8a66..000000000 --- a/data/maps/Route133/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route133: - .4byte Route133_Layout - .4byte Route133_MapEvents - .4byte Route133_MapScripts - .4byte Route133_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE133 - .byte MAPSEC_ROUTE_133 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json new file mode 100644 index 000000000..36e7380f7 --- /dev/null +++ b/data/maps/Route133/map.json @@ -0,0 +1,162 @@ +{ + "id": "MAP_ROUTE133", + "name": "Route133", + "layout": "LAYOUT_ROUTE133", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_133", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_ROUTE134" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE132" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 68, + "y": 27, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 13, + "y": 3, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 68, + "y": 28, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F75BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 53, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_291073", + "flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_291080", + "flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 7, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route133_EventScript_1F75FF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 37, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "Route133_EventScript_1F75E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 56, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F7616", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 56, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route133_EventScript_1F762D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 48, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route133_EventScript_29108D", + "flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc deleted file mode 100644 index 30989b374..000000000 --- a/data/maps/Route134/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route134_MapConnectionsList: - connection left, 0, MAP_SLATEPORT_CITY - connection right, 0, MAP_ROUTE133 - -Route134_MapConnections: - .4byte 2 - .4byte Route134_MapConnectionsList - diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc deleted file mode 100644 index 83e693c26..000000000 --- a/data/maps/Route134/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route134_EventObjects: - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 24, 23, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 1, 6, Route134_EventScript_1F7681, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 49, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 43, 23, 1, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, Route134_EventScript_1F76F4, 0 - object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 24, 30, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 3, 1, 6, Route134_EventScript_1F770B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 50, 16, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0 - object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 63, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route134_EventScript_1F76C6, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE - -Route134_MapEvents:: - map_events Route134_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc deleted file mode 100644 index 87bddf5c7..000000000 --- a/data/maps/Route134/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route134: - .4byte Route134_Layout - .4byte Route134_MapEvents - .4byte Route134_MapScripts - .4byte Route134_MapConnections - .2byte MUS_GRANROAD - .2byte LAYOUT_ROUTE134 - .byte MAPSEC_ROUTE_134 - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_6 - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json new file mode 100644 index 000000000..350db1e05 --- /dev/null +++ b/data/maps/Route134/map.json @@ -0,0 +1,175 @@ +{ + "id": "MAP_ROUTE134", + "name": "Route134", + "layout": "LAYOUT_ROUTE134", + "music": "MUS_GRANROAD", + "region_map_section": "MAPSEC_ROUTE_134", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_6", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SLATEPORT_CITY" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE133" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "x": 49, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT", + "movement_range_x": 3, + "movement_range_y": 5, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F7653", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "x": 58, + "y": 7, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route134_EventScript_1F766A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 41, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F7698", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 24, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_DOWN_AND_UP", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route134_EventScript_1F7681", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 49, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route134_EventScript_1F76AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 43, + "y": 23, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "Route134_EventScript_1F76F4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 24, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 3, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "Route134_EventScript_1F770B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 50, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT", + "movement_range_x": 6, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "Route134_EventScript_1F76DD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 63, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "Route134_EventScript_1F76C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 50, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route134_EventScript_29109A", + "flag": "FLAG_ITEM_ROUTE_134_CARBOS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 22, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Route134_EventScript_2910A7", + "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc deleted file mode 100644 index c2921111f..000000000 --- a/data/maps/RustboroCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -RustboroCity_MapConnectionsList: - connection up, 0, MAP_ROUTE115 - connection down, 0, MAP_ROUTE104 - connection right, 0, MAP_ROUTE116 - -RustboroCity_MapConnections: - .4byte 3 - .4byte RustboroCity_MapConnectionsList - diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc deleted file mode 100644 index ecf816f7d..000000000 --- a/data/maps/RustboroCity/events.inc +++ /dev/null @@ -1,70 +0,0 @@ -RustboroCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 - object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 - object_event 4, EVENT_OBJ_GFX_TWIN, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E08D1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0893, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_1E0ADD, FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT - object_event 11, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E087E, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, FLAG_ITEM_RUSTBORO_CITY_X_DEFEND - object_event 13, EVENT_OBJ_GFX_MAN_4, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E094E, 0 - object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E0DB8, FLAG_HIDE_RUSBORO_CITY_RIVAL - object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST - object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 - -RustboroCity_MapWarps: - warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM - warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F - warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART - warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL - warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1 - warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE - warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2 - warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F - warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 - -RustboroCity_MapCoordEvents: - coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A - coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 - coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 - coord_event 23, 23, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E099F - coord_event 23, 24, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E09B6 - coord_event 30, 9, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0AFE - coord_event 29, 10, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B0A - coord_event 30, 11, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B16 - coord_event 30, 12, 3, VAR_0x405A, 2, RustboroCity_EventScript_1E0B22 - coord_event 30, 9, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C2B - coord_event 31, 10, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C37 - coord_event 30, 11, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C43 - coord_event 30, 12, 3, VAR_0x405A, 4, RustboroCity_EventScript_1E0C4F - coord_event 12, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0DF3 - coord_event 13, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E33 - coord_event 14, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0E73 - coord_event 15, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EB3 - coord_event 16, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0EF3 - coord_event 17, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F33 - coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 - coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 - -RustboroCity_MapBGEvents: - bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 - bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 - bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A - bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 - bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0907 - bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A - bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E73 - bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08EC - bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 - bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 - -RustboroCity_MapEvents:: - map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents - diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc deleted file mode 100644 index f1f4a3d8c..000000000 --- a/data/maps/RustboroCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity: - .4byte RustboroCity_Layout - .4byte RustboroCity_MapEvents - .4byte RustboroCity_MapScripts - .4byte RustboroCity_MapConnections - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json new file mode 100644 index 000000000..7d09f0cdc --- /dev/null +++ b/data/maps/RustboroCity/map.json @@ -0,0 +1,601 @@ +{ + "id": "MAP_RUSTBORO_CITY", + "name": "RustboroCity", + "layout": "LAYOUT_RUSTBORO_CITY", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE115" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE104" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE116" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 22, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E088A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 19, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E085F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 25, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 21, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08D1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 12, + "y": 45, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E08B2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 26, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0893", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 24, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0922", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 25, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0938", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 30, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0ADD", + "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 13, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTBORO_CITY_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 13, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E087E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 36, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_2910DB", + "flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 19, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E094E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 16, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E0DB8", + "flag": "FLAG_HIDE_RUSBORO_CITY_RIVAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 11, + "y": 15, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTBORO_CITY_SCIENTIST" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 31, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_EventScript_1E1236", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 27, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_GYM", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 30, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 45, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 38, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 27, + "y": 34, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 15, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 15, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 1 + }, + { + "x": 33, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 38, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 30, + "y": 28, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 51, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 46, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_HOUSE3", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 23, + "y": 20, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E095A" + }, + { + "type": "trigger", + "x": 23, + "y": 21, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E0971" + }, + { + "type": "trigger", + "x": 23, + "y": 22, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E0988" + }, + { + "type": "trigger", + "x": 23, + "y": 23, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E099F" + }, + { + "type": "trigger", + "x": 23, + "y": 24, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 1, + "script": "RustboroCity_EventScript_1E09B6" + }, + { + "type": "trigger", + "x": 30, + "y": 9, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0AFE" + }, + { + "type": "trigger", + "x": 29, + "y": 10, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B0A" + }, + { + "type": "trigger", + "x": 30, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B16" + }, + { + "type": "trigger", + "x": 30, + "y": 12, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 2, + "script": "RustboroCity_EventScript_1E0B22" + }, + { + "type": "trigger", + "x": 30, + "y": 9, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C2B" + }, + { + "type": "trigger", + "x": 31, + "y": 10, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C37" + }, + { + "type": "trigger", + "x": 30, + "y": 11, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C43" + }, + { + "type": "trigger", + "x": 30, + "y": 12, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 4, + "script": "RustboroCity_EventScript_1E0C4F" + }, + { + "type": "trigger", + "x": 12, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0DF3" + }, + { + "type": "trigger", + "x": 13, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0E33" + }, + { + "type": "trigger", + "x": 14, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0E73" + }, + { + "type": "trigger", + "x": 15, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0EB3" + }, + { + "type": "trigger", + "x": 16, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0EF3" + }, + { + "type": "trigger", + "x": 17, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0F33" + }, + { + "type": "trigger", + "x": 18, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0F73" + }, + { + "type": "trigger", + "x": 19, + "y": 53, + "elevation": 3, + "var": "VAR_0x405A", + "var_value": 7, + "script": "RustboroCity_EventScript_1E0FB3" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 23, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08F5" + }, + { + "type": "sign", + "x": 25, + "y": 35, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0910" + }, + { + "type": "sign", + "x": 17, + "y": 45, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 18, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 19, + "y": 49, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0907" + }, + { + "type": "sign", + "x": 18, + "y": 45, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 17, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 17, + "y": 20, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08EC" + }, + { + "type": "sign", + "x": 30, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E08E3" + }, + { + "type": "sign", + "x": 12, + "y": 38, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_EventScript_1E0919" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc deleted file mode 100644 index 4980d5b95..000000000 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_CuttersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 - -RustboroCity_CuttersHouse_MapWarps: - warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY - -RustboroCity_CuttersHouse_MapEvents:: - map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc deleted file mode 100644 index 434b27c3e..000000000 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_CuttersHouse: - .4byte RustboroCity_CuttersHouse_Layout - .4byte RustboroCity_CuttersHouse_MapEvents - .4byte RustboroCity_CuttersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json new file mode 100644 index 000000000..f2490588a --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_CUTTERS_HOUSE", + "name": "RustboroCity_CuttersHouse", + "layout": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_CuttersHouse_EventScript_215BD4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_CuttersHouse_EventScript_215C0A", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 8 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc deleted file mode 100644 index a3ed4affb..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -RustboroCity_DevonCorp_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 - object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 - -RustboroCity_DevonCorp_1F_MapWarps: - warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY - warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_1F_MapBGEvents: - bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 - bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 - -RustboroCity_DevonCorp_1F_MapEvents:: - map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents - diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc deleted file mode 100644 index 3515eacb5..000000000 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_1F: - .4byte RustboroCity_DevonCorp_1F_Layout - .4byte RustboroCity_DevonCorp_1F_MapEvents - .4byte RustboroCity_DevonCorp_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json new file mode 100644 index 000000000..8bb9a2e2f --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -0,0 +1,99 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "name": "RustboroCity_DevonCorp_1F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_211261", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 2, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_211293", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_1F_EventScript_2112CE", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 5 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 6 + }, + { + "x": 14, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 3, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_1F_EventScript_211312" + }, + { + "type": "sign", + "x": 8, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_1F_EventScript_211309" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc deleted file mode 100644 index fdf2e319e..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 - object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 - -RustboroCity_DevonCorp_2F_MapWarps: - warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F - warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F - -RustboroCity_DevonCorp_2F_MapEvents:: - map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc deleted file mode 100644 index dea4bb1b4..000000000 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_2F: - .4byte RustboroCity_DevonCorp_2F_Layout - .4byte RustboroCity_DevonCorp_2F_MapEvents - .4byte RustboroCity_DevonCorp_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json new file mode 100644 index 000000000..01da7a938 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "name": "RustboroCity_DevonCorp_2F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_21186F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_211886", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118B0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 10, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118DA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_2118F1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_2F_EventScript_211BCF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_1F", + "dest_warp_id": 2 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc deleted file mode 100644 index e9bae9746..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 - -RustboroCity_DevonCorp_3F_MapWarps: - warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_3F_MapBGEvents: - bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 - bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 - -RustboroCity_DevonCorp_3F_MapEvents:: - map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents - diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc deleted file mode 100644 index f64fe6253..000000000 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_DevonCorp_3F: - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte RustboroCity_DevonCorp_3F_MapEvents - .4byte RustboroCity_DevonCorp_3F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json new file mode 100644 index 000000000..91e8e53fc --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_RUSTBORO_CITY_DEVON_CORP_3F", + "name": "RustboroCity_DevonCorp_3F", + "layout": "LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 17, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_2125E1", + "flag": "FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 15, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_DevonCorp_3F_EventScript_21256C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_DEVON_CORP_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 1, + "y": 5, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + }, + { + "type": "sign", + "x": 1, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_DevonCorp_3F_EventScript_212600" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc deleted file mode 100644 index 7f745cbfd..000000000 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Flat1_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 - -RustboroCity_Flat1_1F_MapWarps: - warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY - warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY - warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F - -RustboroCity_Flat1_1F_MapEvents:: - map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc deleted file mode 100644 index ea268aed4..000000000 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_1F: - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_1F_MapEvents - .4byte RustboroCity_Flat1_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT1_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json new file mode 100644 index 000000000..d0a4e5615 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT1_1F", + "name": "RustboroCity_Flat1_1F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_1F_EventScript_2150CE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_1F_EventScript_2150D7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc deleted file mode 100644 index 02c650f87..000000000 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -RustboroCity_Flat1_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 10, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 10, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0 - object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 - -RustboroCity_Flat1_2F_MapWarps: - warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F - -RustboroCity_Flat1_2F_MapEvents:: - map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc deleted file mode 100644 index 9f6d03649..000000000 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat1_2F: - .4byte RustboroCity_Flat1_2F_Layout - .4byte RustboroCity_Flat1_2F_MapEvents - .4byte RustboroCity_Flat1_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT1_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json new file mode 100644 index 000000000..0f2de8d53 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -0,0 +1,133 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT1_2F", + "name": "RustboroCity_Flat1_2F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT1_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 3, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_21523D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY_DOLL", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TREECKO_DOLL", + "x": 10, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TORCHIC_DOLL", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_21513A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MUDKIP_DOLL", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU_DOLL", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat1_2F_EventScript_215246", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT1_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc deleted file mode 100644 index 82105a66a..000000000 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Flat2_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 - -RustboroCity_Flat2_1F_MapWarps: - warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY - warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY - warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_1F_MapEvents:: - map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc deleted file mode 100644 index 73ae19885..000000000 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_1F: - .4byte RustboroCity_Flat2_1F_Layout - .4byte RustboroCity_Flat2_1F_MapEvents - .4byte RustboroCity_Flat2_1F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json new file mode 100644 index 000000000..9fab521c7 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -0,0 +1,69 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_1F", + "name": "RustboroCity_Flat2_1F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_1F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_1F_EventScript_215F80", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_1F_EventScript_215F77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 10 + }, + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 10 + }, + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc deleted file mode 100644 index fd8fad1a4..000000000 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_Flat2_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 - object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 - -RustboroCity_Flat2_2F_MapWarps: - warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F - warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F - -RustboroCity_Flat2_2F_MapEvents:: - map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc deleted file mode 100644 index d002b54ae..000000000 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_2F: - .4byte RustboroCity_Flat2_2F_Layout - .4byte RustboroCity_Flat2_2F_MapEvents - .4byte RustboroCity_Flat2_2F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json new file mode 100644 index 000000000..20ed3c9d4 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_2F", + "name": "RustboroCity_Flat2_2F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_2F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_2F_EventScript_215FD8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_2F_EventScript_215FE1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_1F", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc deleted file mode 100644 index a33992eb2..000000000 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_Flat2_3F_EventObjects: - object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 - -RustboroCity_Flat2_3F_MapWarps: - warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_3F_MapEvents:: - map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc deleted file mode 100644 index 1b7f52fca..000000000 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Flat2_3F: - .4byte RustboroCity_Flat2_3F_Layout - .4byte RustboroCity_Flat2_3F_MapEvents - .4byte RustboroCity_Flat2_3F_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_FLAT2_3F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json new file mode 100644 index 000000000..8ad260511 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_RUSTBORO_CITY_FLAT2_3F", + "name": "RustboroCity_Flat2_3F", + "layout": "LAYOUT_RUSTBORO_CITY_FLAT2_3F", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_DEVON_EMPLOYEE", + "x": 7, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 2, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_3F_EventScript_216117", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Flat2_3F_EventScript_216120", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY_FLAT2_2F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc deleted file mode 100644 index 3fb151799..000000000 --- a/data/maps/RustboroCity_Gym/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -RustboroCity_Gym_EventObjects: - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 - -RustboroCity_Gym_MapWarps: - warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY - warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY - -RustboroCity_Gym_MapBGEvents: - bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 - bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 - -RustboroCity_Gym_MapEvents:: - map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents - diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc deleted file mode 100644 index 4f043ed98..000000000 --- a/data/maps/RustboroCity_Gym/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Gym: - .4byte RustboroCity_Gym_Layout - .4byte RustboroCity_Gym_MapEvents - .4byte RustboroCity_Gym_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_RUSTBORO_CITY_GYM - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json new file mode 100644 index 000000000..ace68d057 --- /dev/null +++ b/data/maps/RustboroCity_Gym/map.json @@ -0,0 +1,118 @@ +{ + "id": "MAP_RUSTBORO_CITY_GYM", + "name": "RustboroCity_Gym", + "layout": "LAYOUT_RUSTBORO_CITY_GYM", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Gym_EventScript_212F31", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "RustboroCity_Gym_EventScript_212FE3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RustboroCity_Gym_EventScript_212FFA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 3, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Gym_EventScript_213028", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RustboroCity_Gym_EventScript_213011", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 19, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_Gym_EventScript_213047" + }, + { + "type": "sign", + "x": 8, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "RustboroCity_Gym_EventScript_213057" + } + ] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc deleted file mode 100644 index 4278568e6..000000000 --- a/data/maps/RustboroCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 - -RustboroCity_House1_MapWarps: - warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY - warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY - -RustboroCity_House1_MapEvents:: - map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc deleted file mode 100644 index 22c08344a..000000000 --- a/data/maps/RustboroCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House1: - .4byte RustboroCity_House1_Layout - .4byte RustboroCity_House1_MapEvents - .4byte RustboroCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE1 - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json new file mode 100644 index 000000000..598429b22 --- /dev/null +++ b/data/maps/RustboroCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE1", + "name": "RustboroCity_House1", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE1", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House1_EventScript_21593F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House1_EventScript_2159DF", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc deleted file mode 100644 index 87f324126..000000000 --- a/data/maps/RustboroCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 - -RustboroCity_House2_MapWarps: - warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY - -RustboroCity_House2_MapEvents:: - map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc deleted file mode 100644 index 564b2aecc..000000000 --- a/data/maps/RustboroCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House2: - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House2_MapEvents - .4byte RustboroCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json new file mode 100644 index 000000000..7533e995b --- /dev/null +++ b/data/maps/RustboroCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE2", + "name": "RustboroCity_House2", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House2_EventScript_215EB4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House2_EventScript_215EBD", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 9 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc deleted file mode 100644 index 3d32a9c73..000000000 --- a/data/maps/RustboroCity_House3/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 - -RustboroCity_House3_MapWarps: - warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY - -RustboroCity_House3_MapEvents:: - map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc deleted file mode 100644 index eea35721c..000000000 --- a/data/maps/RustboroCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_House3: - .4byte RustboroCity_House_Layout - .4byte RustboroCity_House3_MapEvents - .4byte RustboroCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_GOTOWN - .2byte LAYOUT_RUSTBORO_CITY_HOUSE - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json new file mode 100644 index 000000000..c11aa89e3 --- /dev/null +++ b/data/maps/RustboroCity_House3/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_RUSTBORO_CITY_HOUSE3", + "name": "RustboroCity_House3", + "layout": "LAYOUT_RUSTBORO_CITY_HOUSE", + "music": "MUS_GOTOWN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_216191", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_21619A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_House3_EventScript_2161A3", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 11 + }, + { + "x": 6, + "y": 8, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc deleted file mode 100644 index 131ffe24b..000000000 --- a/data/maps/RustboroCity_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -RustboroCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 - object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 - -RustboroCity_Mart_MapWarps: - warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY - warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY - -RustboroCity_Mart_MapEvents:: - map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc deleted file mode 100644 index f6dbd60a5..000000000 --- a/data/maps/RustboroCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_Mart: - .4byte Mart_Layout - .4byte RustboroCity_Mart_MapEvents - .4byte RustboroCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json new file mode 100644 index 000000000..714edcd58 --- /dev/null +++ b/data/maps/RustboroCity_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_RUSTBORO_CITY_MART", + "name": "RustboroCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F06", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F7D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F74", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "x": 8, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_Mart_EventScript_214F86", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 50b18e882..000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 - -RustboroCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY - warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY - warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F - -RustboroCity_PokemonCenter_1F_MapEvents:: - map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 71f0d8b25..000000000 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte RustboroCity_PokemonCenter_1F_MapEvents - .4byte RustboroCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..aabe2785f --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "name": "RustboroCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D76", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_1F_EventScript_214D96", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 3 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 3 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc deleted file mode 100644 index a565f259b..000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -RustboroCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -RustboroCity_PokemonCenter_2F_MapEvents:: - map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 2ee6bdfd1..000000000 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte RustboroCity_PokemonCenter_2F_MapEvents - .4byte RustboroCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..9c63421e3 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_CENTER_2F", + "name": "RustboroCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_RUSTBORO_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc deleted file mode 100644 index 0d230b178..000000000 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -RustboroCity_PokemonSchool_EventObjects: - object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 - object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 - object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT - -RustboroCity_PokemonSchool_MapWarps: - warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY - warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY - -RustboroCity_PokemonSchool_MapBGEvents: - bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 - bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C - -RustboroCity_PokemonSchool_MapEvents:: - map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents - diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc deleted file mode 100644 index e02d9c711..000000000 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RustboroCity_PokemonSchool: - .4byte RustboroCity_PokemonSchool_Layout - .4byte RustboroCity_PokemonSchool_MapEvents - .4byte RustboroCity_PokemonSchool_MapScripts - .4byte 0x0 - .2byte MUS_P_SCHOOL - .2byte LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL - .byte MAPSEC_RUSTBORO_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json new file mode 100644 index 000000000..fb6944f40 --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -0,0 +1,168 @@ +{ + "id": "MAP_RUSTBORO_CITY_POKEMON_SCHOOL", + "name": "RustboroCity_PokemonSchool", + "layout": "LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL", + "music": "MUS_P_SCHOOL", + "region_map_section": "MAPSEC_RUSTBORO_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F5F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GAMEBOY_KID", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F68", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 3, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F71", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F7A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F83", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_213F95", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 0, + "y": 10, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RustboroCity_PokemonSchool_EventScript_214040", + "flag": "FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT" + } + ], + "warp_events": [ + { + "x": 5, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 4 + }, + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_RUSTBORO_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 4, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 6, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 7, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213EA9" + }, + { + "type": "sign", + "x": 3, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "RustboroCity_PokemonSchool_EventScript_213F8C" + } + ] +} \ No newline at end of file diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc deleted file mode 100644 index ea48a4828..000000000 --- a/data/maps/RusturfTunnel/events.inc +++ /dev/null @@ -1,27 +0,0 @@ -RusturfTunnel_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER - object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, FLAG_HIDE_RUSTURF_TUNNEL_PEEKO - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN - -RusturfTunnel_MapWarps: - warp_def 4, 10, 3, 0, MAP_ROUTE116 - warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN - warp_def 18, 20, 3, 2, MAP_ROUTE116 - -RusturfTunnel_MapCoordEvents: - coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 - coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 - coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 - coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 - coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D - -RusturfTunnel_MapEvents:: - map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 - diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc deleted file mode 100644 index 8bb9fa94f..000000000 --- a/data/maps/RusturfTunnel/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -RusturfTunnel: - .4byte RusturfTunnel_Layout - .4byte RusturfTunnel_MapEvents - .4byte RusturfTunnel_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_RUSTURF_TUNNEL - .byte MAPSEC_RUSTURF_TUNNEL - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json new file mode 100644 index 000000000..424dd4789 --- /dev/null +++ b/data/maps/RusturfTunnel/map.json @@ -0,0 +1,219 @@ +{ + "id": "MAP_RUSTURF_TUNNEL", + "name": "RusturfTunnel", + "layout": "LAYOUT_RUSTURF_TUNNEL", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_RUSTURF_TUNNEL", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 23, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22CE76", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 24, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_2907A6", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_291136", + "flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_291143", + "flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22D0C2", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22D0AF", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 24, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_2907A6", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 32, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "RusturfTunnel_EventScript_22D1B1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 25, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "RusturfTunnel_EventScript_22CE5F", + "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN" + } + ], + "warp_events": [ + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 0 + }, + { + "x": 29, + "y": 16, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 4 + }, + { + "x": 18, + "y": 20, + "elevation": 3, + "dest_map": "MAP_ROUTE116", + "dest_warp_id": 2 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 23, + "y": 4, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D071" + }, + { + "type": "trigger", + "x": 9, + "y": 4, + "elevation": 3, + "var": "VAR_RUSTURF_TUNNEL_STATE", + "var_value": 2, + "script": "RusturfTunnel_EventScript_22D083" + }, + { + "type": "trigger", + "x": 9, + "y": 5, + "elevation": 3, + "var": "VAR_RUSTURF_TUNNEL_STATE", + "var_value": 2, + "script": "RusturfTunnel_EventScript_22D083" + }, + { + "type": "trigger", + "x": 25, + "y": 4, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D077" + }, + { + "type": "trigger", + "x": 25, + "y": 5, + "elevation": 3, + "var": "0", + "var_value": 0, + "script": "RusturfTunnel_EventScript_22D07D" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc deleted file mode 100644 index 56a07b43e..000000000 --- a/data/maps/SSTidalCorridor/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -SSTidalCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT - -SSTidalCorridor_MapWarps: - warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS - warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS - warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS - warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS - warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS - warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS - warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS - warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS - warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK - -SSTidalCorridor_MapBGEvents: - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0F5 - bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C0FE - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 - bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 - -SSTidalCorridor_MapEvents:: - map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents - diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc deleted file mode 100644 index 972fae215..000000000 --- a/data/maps/SSTidalCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalCorridor: - .4byte SSTidalCorridor_Layout - .4byte SSTidalCorridor_MapEvents - .4byte SSTidalCorridor_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_CORRIDOR - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json new file mode 100644 index 000000000..c8192aaa8 --- /dev/null +++ b/data/maps/SSTidalCorridor/map.json @@ -0,0 +1,247 @@ +{ + "id": "MAP_SS_TIDAL_CORRIDOR", + "name": "SSTidalCorridor", + "layout": "LAYOUT_SS_TIDAL_CORRIDOR", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 1, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C119", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 16, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C1A3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C0D9", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalCorridor_EventScript_23C0E2", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT" + } + ], + "warp_events": [ + { + "x": 4, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 9, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 8 + }, + { + "x": 7, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 9 + }, + { + "x": 10, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 10 + }, + { + "x": 13, + "y": 3, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_ROOMS", + "dest_warp_id": 11 + }, + { + "x": 16, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_LOWER_DECK", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 4, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 6, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 14, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalCorridor_EventScript_23C17D" + }, + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C0F5" + }, + { + "type": "sign", + "x": 8, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C0FE" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C107" + }, + { + "type": "sign", + "x": 14, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SSTidalCorridor_EventScript_23C110" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc deleted file mode 100644 index 73385dfc3..000000000 --- a/data/maps/SSTidalLowerDeck/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SSTidalLowerDeck_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 - -SSTidalLowerDeck_MapWarps: - warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR - -SSTidalLowerDeck_MapBGEvents: - bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS - -SSTidalLowerDeck_MapEvents:: - map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents - diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc deleted file mode 100644 index c14cf5513..000000000 --- a/data/maps/SSTidalLowerDeck/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalLowerDeck: - .4byte SSTidalLowerDeck_Layout - .4byte SSTidalLowerDeck_MapEvents - .4byte SSTidalLowerDeck_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_LOWER_DECK - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json new file mode 100644 index 000000000..1a7b1fde0 --- /dev/null +++ b/data/maps/SSTidalLowerDeck/map.json @@ -0,0 +1,64 @@ +{ + "id": "MAP_SS_TIDAL_LOWER_DECK", + "name": "SSTidalLowerDeck", + "layout": "LAYOUT_SS_TIDAL_LOWER_DECK", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 10, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT", + "movement_range_x": 4, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalLowerDeck_EventScript_23C819", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT", + "movement_range_x": 7, + "movement_range_y": 4, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalLowerDeck_EventScript_23C830", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 0, + "y": 2, + "elevation": 0, + "item": "ITEM_LEFTOVERS", + "flag": "FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS" + } + ] +} \ No newline at end of file diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc deleted file mode 100644 index dc8a57164..000000000 --- a/data/maps/SSTidalRooms/events.inc +++ /dev/null @@ -1,31 +0,0 @@ -SSTidalRooms_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0 - object_event 6, EVENT_OBJ_GFX_RICH_BOY, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_23CAC4, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER - -SSTidalRooms_MapWarps: - warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR - warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR - warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR - warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR - warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR - warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR - warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR - warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR - warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR - warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR - warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR - warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR - -SSTidalRooms_MapBGEvents: - bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 - bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 - -SSTidalRooms_MapEvents:: - map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents - diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc deleted file mode 100644 index 951cd6ce1..000000000 --- a/data/maps/SSTidalRooms/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SSTidalRooms: - .4byte SSTidalRooms_Layout - .4byte SSTidalRooms_MapEvents - .4byte SSTidalRooms_MapScripts - .4byte 0x0 - .2byte MUS_M_BOAT - .2byte LAYOUT_SS_TIDAL_ROOMS - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json new file mode 100644 index 000000000..935c5c33d --- /dev/null +++ b/data/maps/SSTidalRooms/map.json @@ -0,0 +1,227 @@ +{ + "id": "MAP_SS_TIDAL_ROOMS", + "name": "SSTidalRooms", + "layout": "LAYOUT_SS_TIDAL_ROOMS", + "music": "MUS_M_BOAT", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CA49", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 34, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalRooms_EventScript_23CA60", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 21, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CA77", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSTidalRooms_EventScript_23CA8E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 4, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SSTidalRooms_EventScript_23CAA9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 22, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SSTidalRooms_EventScript_23CAC4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23CADB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 28, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SSTidalRooms_EventScript_23C9F2", + "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER" + } + ], + "warp_events": [ + { + "x": 4, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 1 + }, + { + "x": 22, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 23, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 2 + }, + { + "x": 31, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 32, + "y": 16, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 3 + }, + { + "x": 4, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 4 + }, + { + "x": 13, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 5 + }, + { + "x": 22, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 6 + }, + { + "x": 31, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SS_TIDAL_CORRIDOR", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 15, + "y": 11, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalRooms_EventScript_23CA33" + }, + { + "type": "sign", + "x": 15, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SSTidalRooms_EventScript_23CA33" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc deleted file mode 100644 index 131338df9..000000000 --- a/data/maps/SafariZone_North/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SafariZone_North_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_NORTHWEST - connection down, 0, MAP_SAFARI_ZONE_SOUTH - connection right, 0, MAP_SAFARI_ZONE_NORTHEAST - -SafariZone_North_MapConnections: - .4byte 3 - .4byte SafariZone_North_MapConnectionsList - diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc deleted file mode 100644 index 1131cd714..000000000 --- a/data/maps/SafariZone_North/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_North_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM - -SafariZone_North_MapEvents:: - map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc deleted file mode 100644 index 935a2c5a6..000000000 --- a/data/maps/SafariZone_North/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_North: - .4byte SafariZone_North_Layout - .4byte SafariZone_North_MapEvents - .4byte SafariZone_North_MapScripts - .4byte SafariZone_North_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTH - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_North/map.json b/data/maps/SafariZone_North/map.json new file mode 100644 index 000000000..e0202beb9 --- /dev/null +++ b/data/maps/SafariZone_North/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTH", + "name": "SafariZone_North", + "layout": "LAYOUT_SAFARI_ZONE_NORTH", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHWEST" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_23D254", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 6, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_23D25D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 25, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 25, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 23, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 27, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_North_EventScript_2912C9", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc deleted file mode 100644 index 20595bd7a..000000000 --- a/data/maps/SafariZone_Northeast/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Northeast_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_NORTH - connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST - -SafariZone_Northeast_MapConnections: - .4byte 2 - .4byte SafariZone_Northeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc deleted file mode 100644 index 02bb2fc19..000000000 --- a/data/maps/SafariZone_Northeast/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SafariZone_Northeast_EventObjects: - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 35, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_11 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET - -SafariZone_Northeast_MapBGEvents: - bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY - bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC - -SafariZone_Northeast_MapEvents:: - map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents - diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc deleted file mode 100644 index 8c68cd8c2..000000000 --- a/data/maps/SafariZone_Northeast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northeast: - .4byte SafariZone_Northeast_Layout - .4byte SafariZone_Northeast_MapEvents - .4byte SafariZone_Northeast_MapScripts - .4byte SafariZone_Northeast_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTHEAST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json new file mode 100644 index 000000000..6ce7c4d01 --- /dev/null +++ b/data/maps/SafariZone_Northeast/map.json @@ -0,0 +1,166 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTHEAST", + "name": "SafariZone_Northeast", + "layout": "LAYOUT_SAFARI_ZONE_NORTHEAST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 8, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3C6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 30, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3D8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 11, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 13, + "y": 35, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_23D3CF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2907A6", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 8, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northeast_EventScript_2912E3", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 31, + "y": 35, + "elevation": 3, + "item": "ITEM_RARE_CANDY", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY" + }, + { + "type": "hidden_item", + "x": 21, + "y": 5, + "elevation": 3, + "item": "ITEM_ZINC", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc deleted file mode 100644 index 24ac78021..000000000 --- a/data/maps/SafariZone_Northwest/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Northwest_MapConnectionsList: - connection right, 0, MAP_SAFARI_ZONE_NORTH - connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_Northwest_MapConnections: - .4byte 2 - .4byte SafariZone_Northwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc deleted file mode 100644 index 729e51734..000000000 --- a/data/maps/SafariZone_Northwest/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SafariZone_Northwest_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 - -SafariZone_Northwest_MapEvents:: - map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc deleted file mode 100644 index 1218a6513..000000000 --- a/data/maps/SafariZone_Northwest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Northwest: - .4byte SafariZone_Northwest_Layout - .4byte SafariZone_Northwest_MapEvents - .4byte SafariZone_Northwest_MapScripts - .4byte SafariZone_Northwest_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_NORTHWEST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json new file mode 100644 index 000000000..910c7cf3c --- /dev/null +++ b/data/maps/SafariZone_Northwest/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_SAFARI_ZONE_NORTHWEST", + "name": "SafariZone_Northwest", + "layout": "LAYOUT_SAFARI_ZONE_NORTHWEST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHWEST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 8, + "y": 8, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northwest_EventScript_23D24A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 33, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Northwest_EventScript_2912BC", + "flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc deleted file mode 100644 index 2d601b883..000000000 --- a/data/maps/SafariZone_RestHouse/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_RestHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 - -SafariZone_RestHouse_MapWarps: - warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_RestHouse_MapEvents:: - map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc deleted file mode 100644 index 79d807c7f..000000000 --- a/data/maps/SafariZone_RestHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_RestHouse: - .4byte SafariZone_RestHouse_Layout - .4byte SafariZone_RestHouse_MapEvents - .4byte SafariZone_RestHouse_MapScripts - .4byte 0x0 - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_REST_HOUSE - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json new file mode 100644 index 000000000..16acff6dd --- /dev/null +++ b/data/maps/SafariZone_RestHouse/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SAFARI_ZONE_REST_HOUSE", + "name": "SafariZone_RestHouse", + "layout": "LAYOUT_SAFARI_ZONE_REST_HOUSE", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 7, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "x": 8, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BF0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 2, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_RestHouse_EventScript_242BF9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SAFARI_ZONE_SOUTHWEST", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc deleted file mode 100644 index 4c2e912ca..000000000 --- a/data/maps/SafariZone_South/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SafariZone_South_MapConnectionsList: - connection up, 0, MAP_SAFARI_ZONE_NORTH - connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST - connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST - -SafariZone_South_MapConnections: - .4byte 3 - .4byte SafariZone_South_MapConnectionsList - diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc deleted file mode 100644 index 8bc56885f..000000000 --- a/data/maps/SafariZone_South/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_South_EventObjects: - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2DC, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS - -SafariZone_South_MapWarps: - warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -SafariZone_South_MapEvents:: - map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc deleted file mode 100644 index 01fcac57f..000000000 --- a/data/maps/SafariZone_South/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_South: - .4byte SafariZone_South_Layout - .4byte SafariZone_South_MapEvents - .4byte SafariZone_South_MapScripts - .4byte SafariZone_South_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTH - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_South/map.json b/data/maps/SafariZone_South/map.json new file mode 100644 index 000000000..c958a1a94 --- /dev/null +++ b/data/maps/SafariZone_South/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTH", + "name": "SafariZone_South", + "layout": "LAYOUT_SAFARI_ZONE_SOUTH", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTH" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHWEST" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 32, + "y": 34, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 26, + "y": 28, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2CA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 16, + "y": 6, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2D3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D2DC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 36, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D390", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 36, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_South_EventScript_23D3A2", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS" + } + ], + "warp_events": [ + { + "x": 32, + "y": 33, + "elevation": 0, + "dest_map": "MAP_ROUTE121_SAFARI_ZONE_ENTRANCE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc deleted file mode 100644 index 5a7b4140a..000000000 --- a/data/maps/SafariZone_Southeast/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Southeast_MapConnectionsList: - connection left, 0, MAP_SAFARI_ZONE_SOUTH - connection up, 0, MAP_SAFARI_ZONE_NORTHEAST - -SafariZone_Southeast_MapConnections: - .4byte 2 - .4byte SafariZone_Southeast_MapConnectionsList - diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc deleted file mode 100644 index a35a8564d..000000000 --- a/data/maps/SafariZone_Southeast/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SafariZone_Southeast_EventObjects: - object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION - -SafariZone_Southeast_MapBGEvents: - bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP - bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE - -SafariZone_Southeast_MapEvents:: - map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents - diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc deleted file mode 100644 index b07747fd5..000000000 --- a/data/maps/SafariZone_Southeast/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southeast: - .4byte SafariZone_Southeast_Layout - .4byte SafariZone_Southeast_MapEvents - .4byte SafariZone_Southeast_MapScripts - .4byte SafariZone_Southeast_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTHEAST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json new file mode 100644 index 000000000..d2e3d7140 --- /dev/null +++ b/data/maps/SafariZone_Southeast/map.json @@ -0,0 +1,114 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTHEAST", + "name": "SafariZone_Southeast", + "layout": "LAYOUT_SAFARI_ZONE_SOUTHEAST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "left", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + }, + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHEAST" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3BD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 20, + "y": 30, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3B4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 8, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D3AB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 31, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_2912F0", + "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 12, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southeast_EventScript_23D399", + "flag": "FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 19, + "y": 36, + "elevation": 3, + "item": "ITEM_PP_UP", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP" + }, + { + "type": "hidden_item", + "x": 32, + "y": 33, + "elevation": 0, + "item": "ITEM_FULL_RESTORE", + "flag": "FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE" + } + ] +} \ No newline at end of file diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc deleted file mode 100644 index 34702a3c2..000000000 --- a/data/maps/SafariZone_Southwest/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -SafariZone_Southwest_MapConnectionsList: - connection up, 0, MAP_SAFARI_ZONE_NORTHWEST - connection right, 0, MAP_SAFARI_ZONE_SOUTH - -SafariZone_Southwest_MapConnections: - .4byte 2 - .4byte SafariZone_Southwest_MapConnectionsList - diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc deleted file mode 100644 index 6a6a48887..000000000 --- a/data/maps/SafariZone_Southwest/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SafariZone_Southwest_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE - -SafariZone_Southwest_MapWarps: - warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE - -SafariZone_Southwest_MapBGEvents: - bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 - -SafariZone_Southwest_MapEvents:: - map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents - diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc deleted file mode 100644 index f3cafdebb..000000000 --- a/data/maps/SafariZone_Southwest/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SafariZone_Southwest: - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_Southwest_MapEvents - .4byte SafariZone_Southwest_MapScripts - .4byte SafariZone_Southwest_MapConnections - .2byte MUS_SAFARI - .2byte LAYOUT_SAFARI_ZONE_SOUTHWEST - .byte MAPSEC_SAFARI_ZONE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json new file mode 100644 index 000000000..41cce9e80 --- /dev/null +++ b/data/maps/SafariZone_Southwest/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SAFARI_ZONE_SOUTHWEST", + "name": "SafariZone_Southwest", + "layout": "LAYOUT_SAFARI_ZONE_SOUTHWEST", + "music": "MUS_SAFARI", + "region_map_section": "MAPSEC_SAFARI_ZONE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_SAFARI_ZONE_NORTHWEST" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_SAFARI_ZONE_SOUTH" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 22, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southwest_EventScript_23D267", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 0, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SafariZone_Southwest_EventScript_2912D6", + "flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE" + } + ], + "warp_events": [ + { + "x": 29, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SAFARI_ZONE_REST_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 32, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SafariZone_Southwest_EventScript_23D270" + } + ] +} \ No newline at end of file diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc deleted file mode 100644 index f43240a78..000000000 --- a/data/maps/ScorchedSlab/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -ScorchedSlab_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 - -ScorchedSlab_MapWarps: - warp_def 7, 16, 1, 1, MAP_ROUTE120 - -ScorchedSlab_MapEvents:: - map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc deleted file mode 100644 index ec09efb0f..000000000 --- a/data/maps/ScorchedSlab/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ScorchedSlab: - .4byte ScorchedSlab_Layout - .4byte ScorchedSlab_MapEvents - .4byte ScorchedSlab_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_SCORCHED_SLAB - .byte MAPSEC_SCORCHED_SLAB - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json new file mode 100644 index 000000000..f24aa0eba --- /dev/null +++ b/data/maps/ScorchedSlab/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SCORCHED_SLAB", + "name": "ScorchedSlab", + "layout": "LAYOUT_SCORCHED_SLAB", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_SCORCHED_SLAB", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ScorchedSlab_EventScript_2912AF", + "flag": "FLAG_ITEM_SCORCHED_SLAB_TM_11" + } + ], + "warp_events": [ + { + "x": 7, + "y": 16, + "elevation": 1, + "dest_map": "MAP_ROUTE120", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc deleted file mode 100644 index ea2057417..000000000 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SeafloorCavern_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT - -SeafloorCavern_Entrance_MapWarps: - warp_def 10, 18, 3, 0, MAP_UNDERWATER4 - warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 - -SeafloorCavern_Entrance_MapEvents:: - map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc deleted file mode 100644 index b1b8ec30c..000000000 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Entrance: - .4byte SeafloorCavern_Entrance_Layout - .4byte SeafloorCavern_Entrance_MapEvents - .4byte SeafloorCavern_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ENTRANCE - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json new file mode 100644 index 000000000..c1f45f1bf --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "name": "SeafloorCavern_Entrance", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ENTRANCE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Entrance_EventScript_234485", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT" + } + ], + "warp_events": [ + { + "x": 10, + "y": 18, + "elevation": 3, + "dest_map": "MAP_UNDERWATER4", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc deleted file mode 100644 index a5cb5ed3b..000000000 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room1_MapWarps: - warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 - -SeafloorCavern_Room1_MapEvents:: - map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc deleted file mode 100644 index 14ab5fbde..000000000 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room1: - .4byte SeafloorCavern_Room1_Layout - .4byte SeafloorCavern_Room1_MapEvents - .4byte SeafloorCavern_Room1_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM1 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json new file mode 100644 index 000000000..3976ff46a --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -0,0 +1,108 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM1", + "name": "SeafloorCavern_Room1", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM1", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 5, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room1_EventScript_2907A6", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SeafloorCavern_Room1_EventScript_2347EC", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 15, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room1_EventScript_234803", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 5, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 17, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc deleted file mode 100644 index 5e1af8027..000000000 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room2_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 8, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_18 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 - -SeafloorCavern_Room2_MapWarps: - warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 - warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 - -SeafloorCavern_Room2_MapEvents:: - map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc deleted file mode 100644 index 822c7f2b1..000000000 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room2: - .4byte SeafloorCavern_Room2_Layout - .4byte SeafloorCavern_Room2_MapEvents - .4byte SeafloorCavern_Room2_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM2 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json new file mode 100644 index 000000000..19b8b0573 --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -0,0 +1,154 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM2", + "name": "SeafloorCavern_Room2", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM2", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 10, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 8, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2907A6", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2907A6", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room2_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + } + ], + "warp_events": [ + { + "x": 10, + "y": 7, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6", + "dest_warp_id": 0 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc deleted file mode 100644 index 168e9e96d..000000000 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room3_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_16 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_18 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_19 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room3_MapWarps: - warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 - warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 - warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 - -SeafloorCavern_Room3_MapEvents:: - map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc deleted file mode 100644 index f1cfa2568..000000000 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room3: - .4byte SeafloorCavern_Room3_Layout - .4byte SeafloorCavern_Room3_MapEvents - .4byte SeafloorCavern_Room3_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM3 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json new file mode 100644 index 000000000..b7e46a87f --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -0,0 +1,160 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM3", + "name": "SeafloorCavern_Room3", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM3", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room3_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 6, + "script": "SeafloorCavern_Room3_EventScript_234938", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SeafloorCavern_Room3_EventScript_23494F", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 8, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM7", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM6", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc deleted file mode 100644 index 37f0c7b04..000000000 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SeafloorCavern_Room4_EventObjects: - object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS - -SeafloorCavern_Room4_MapWarps: - warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 - warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - -SeafloorCavern_Room4_MapEvents:: - map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc deleted file mode 100644 index 22e6d27c7..000000000 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room4: - .4byte SeafloorCavern_Room4_Layout - .4byte SeafloorCavern_Room4_MapEvents - .4byte SeafloorCavern_Room4_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM4 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json new file mode 100644 index 000000000..02662f017 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM4", + "name": "SeafloorCavern_Room4", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM4", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room4_EventScript_234C9C", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 5, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SeafloorCavern_Room4_EventScript_234CB3", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" + } + ], + "warp_events": [ + { + "x": 13, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 1 + }, + { + "x": 9, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM5", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc deleted file mode 100644 index 4f7573270..000000000 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SeafloorCavern_Room5_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 - -SeafloorCavern_Room5_MapWarps: - warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 - -SeafloorCavern_Room5_MapEvents:: - map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc deleted file mode 100644 index 42489c1de..000000000 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5: - .4byte SeafloorCavern_Room5_Layout - .4byte SeafloorCavern_Room5_MapEvents - .4byte SeafloorCavern_Room5_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM5 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json new file mode 100644 index 000000000..cfdbd64ef --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -0,0 +1,121 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM5", + "name": "SeafloorCavern_Room5", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM5", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 11, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 3, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2907A6", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room5_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM1", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 17, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM4", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc deleted file mode 100644 index 596daefe2..000000000 --- a/data/maps/SeafloorCavern_Room6/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SeafloorCavern_Room6_MapWarps: - warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 - warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE - -SeafloorCavern_Room6_MapEvents:: - map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc deleted file mode 100644 index f70a2d07e..000000000 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room6: - .4byte SeafloorCavern_Room6_Layout - .4byte SeafloorCavern_Room6_MapEvents - .4byte SeafloorCavern_Room6_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM6 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json new file mode 100644 index 000000000..69c5330ea --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM6", + "name": "SeafloorCavern_Room6", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM6", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 21, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 2 + }, + { + "x": 4, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 8, + "elevation": 1, + "dest_map": "MAP_SEAFLOOR_CAVERN_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc deleted file mode 100644 index fb3fcc1b6..000000000 --- a/data/maps/SeafloorCavern_Room7/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SeafloorCavern_Room7_MapWarps: - warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room7_MapEvents:: - map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc deleted file mode 100644 index 28433a051..000000000 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room7: - .4byte SeafloorCavern_Room7_Layout - .4byte SeafloorCavern_Room7_MapEvents - .4byte SeafloorCavern_Room7_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM7 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json new file mode 100644 index 000000000..65c103aaf --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM7", + "name": "SeafloorCavern_Room7", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM7", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 23, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM2", + "dest_warp_id": 3 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc deleted file mode 100644 index 673f303fe..000000000 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -SeafloorCavern_Room8_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1A - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C - -SeafloorCavern_Room8_MapWarps: - warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 - warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room8_MapEvents:: - map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc deleted file mode 100644 index bc6f7de4b..000000000 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room8: - .4byte SeafloorCavern_Room8_Layout - .4byte SeafloorCavern_Room8_MapEvents - .4byte SeafloorCavern_Room8_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM8 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json new file mode 100644 index 000000000..f556c2333 --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -0,0 +1,192 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM8", + "name": "SeafloorCavern_Room8", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM8", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_18" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1A" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room8_EventScript_2908BA", + "flag": "FLAG_TEMP_1C" + } + ], + "warp_events": [ + { + "x": 5, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM9", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM3", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc deleted file mode 100644 index 771f58b15..000000000 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SeafloorCavern_Room9_EventObjects: - object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE - object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE - object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 - object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 - -SeafloorCavern_Room9_MapWarps: - warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 - -SeafloorCavern_Room9_MapCoordEvents: - coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 - -SeafloorCavern_Room9_MapEvents:: - map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 - diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc deleted file mode 100644 index 5748571be..000000000 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room9: - .4byte SeafloorCavern_Room9_Layout - .4byte SeafloorCavern_Room9_MapEvents - .4byte SeafloorCavern_Room9_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM9 - .byte MAPSEC_SEAFLOOR_CAVERN - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json new file mode 100644 index 000000000..c2d8b8870 --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -0,0 +1,130 @@ +{ + "id": "MAP_SEAFLOOR_CAVERN_ROOM9", + "name": "SeafloorCavern_Room9", + "layout": "LAYOUT_SEAFLOOR_CAVERN_ROOM9", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SEAFLOOR_CAVERN", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_1", + "x": 17, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 9, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 9, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_M", + "x": 8, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAGMA_MEMBER_F", + "x": 8, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SeafloorCavern_Room9_EventScript_291401", + "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_2", + "x": 17, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2" + } + ], + "warp_events": [ + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SEAFLOOR_CAVERN_ROOM8", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 42, + "elevation": 3, + "var": "VAR_0x40A2", + "var_value": 0, + "script": "SeafloorCavern_Room9_EventScript_234DC9" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc deleted file mode 100644 index 96891324d..000000000 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SealedChamber_InnerRoom_MapWarps: - warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM - -SealedChamber_InnerRoom_MapBGEvents: - bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 - bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F - bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239269 - bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239273 - bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23927D - bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239287 - bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 - -SealedChamber_InnerRoom_MapEvents:: - map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents - diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc deleted file mode 100644 index 6e2a2ff8b..000000000 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_InnerRoom: - .4byte SealedChamber_InnerRoom_Layout - .4byte SealedChamber_InnerRoom_MapEvents - .4byte SealedChamber_InnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_SEALED_CHAMBER_INNER_ROOM - .byte MAPSEC_SEALED_CHAMBER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json new file mode 100644 index 000000000..e0e6097ec --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_SEALED_CHAMBER_INNER_ROOM", + "name": "SealedChamber_InnerRoom", + "layout": "LAYOUT_SEALED_CHAMBER_INNER_ROOM", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SEALED_CHAMBER_OUTER_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 10, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + }, + { + "type": "sign", + "x": 6, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239255" + }, + { + "type": "sign", + "x": 14, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_23925F" + }, + { + "type": "sign", + "x": 4, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239269" + }, + { + "type": "sign", + "x": 16, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239273" + }, + { + "type": "sign", + "x": 6, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_23927D" + }, + { + "type": "sign", + "x": 14, + "y": 18, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_239287" + }, + { + "type": "sign", + "x": 9, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + }, + { + "type": "sign", + "x": 11, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_InnerRoom_EventScript_2391F8" + } + ] +} \ No newline at end of file diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc deleted file mode 100644 index 530ff738c..000000000 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ /dev/null @@ -1,37 +0,0 @@ -SealedChamber_OuterRoom_MapWarps: - warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM - -SealedChamber_OuterRoom_MapBGEvents: - bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391B2 - bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391C6 - bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391D0 - bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C - bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 - bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 - bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23918A - bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239194 - bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23919E - bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391A8 - bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391BC - bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED - bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED - -SealedChamber_OuterRoom_MapEvents:: - map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents - diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc deleted file mode 100644 index bdb40d153..000000000 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SealedChamber_OuterRoom: - .4byte SealedChamber_OuterRoom_Layout - .4byte SealedChamber_OuterRoom_MapEvents - .4byte SealedChamber_OuterRoom_MapScripts - .4byte 0x0 - .2byte MUS_MABOROSI - .2byte LAYOUT_SEALED_CHAMBER_OUTER_ROOM - .byte MAPSEC_SEALED_CHAMBER - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json new file mode 100644 index 000000000..cc9c32272 --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -0,0 +1,261 @@ +{ + "id": "MAP_SEALED_CHAMBER_OUTER_ROOM", + "name": "SealedChamber_OuterRoom", + "layout": "LAYOUT_SEALED_CHAMBER_OUTER_ROOM", + "music": "MUS_MABOROSI", + "region_map_section": "MAPSEC_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SEALED_CHAMBER_INNER_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 5, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 5, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 5, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 11, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 11, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 11, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 11, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 16, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391B2" + }, + { + "type": "sign", + "x": 16, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391C6" + }, + { + "type": "sign", + "x": 10, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391D0" + }, + { + "type": "sign", + "x": 6, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 4, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23916C" + }, + { + "type": "sign", + "x": 4, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239176" + }, + { + "type": "sign", + "x": 4, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 6, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239180" + }, + { + "type": "sign", + "x": 4, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 6, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23918A" + }, + { + "type": "sign", + "x": 10, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 12, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_239194" + }, + { + "type": "sign", + "x": 10, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 12, + "y": 9, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_23919E" + }, + { + "type": "sign", + "x": 10, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 12, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391A8" + }, + { + "type": "sign", + "x": 10, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 12, + "y": 15, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391BC" + }, + { + "type": "sign", + "x": 9, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391ED" + }, + { + "type": "sign", + "x": 11, + "y": 2, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SealedChamber_OuterRoom_EventScript_2391ED" + } + ] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc deleted file mode 100644 index f0cfb017f..000000000 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BlueCave1_MapEvents:: - map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc deleted file mode 100644 index 5159eec53..000000000 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave1: - .4byte SecretBase_BlueCave1_Layout - .4byte SecretBase_BlueCave1_MapEvents - .4byte SecretBase_BlueCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json new file mode 100644 index 000000000..ee7806e57 --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE1", + "name": "SecretBase_BlueCave1", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc deleted file mode 100644 index 9a2a82db6..000000000 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave2_MapWarps: - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_BlueCave2_MapEvents:: - map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc deleted file mode 100644 index 4d893835b..000000000 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave2: - .4byte SecretBase_BlueCave2_Layout - .4byte SecretBase_BlueCave2_MapEvents - .4byte SecretBase_BlueCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json new file mode 100644 index 000000000..cdba6e817 --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE2", + "name": "SecretBase_BlueCave2", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 2, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc deleted file mode 100644 index 463c513e5..000000000 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave3_MapWarps: - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave3_MapEvents:: - map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc deleted file mode 100644 index 1e730552e..000000000 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave3: - .4byte SecretBase_BlueCave3_Layout - .4byte SecretBase_BlueCave3_MapEvents - .4byte SecretBase_BlueCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json new file mode 100644 index 000000000..5dc78c891 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE3", + "name": "SecretBase_BlueCave3", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 15, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc deleted file mode 100644 index fd121b594..000000000 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BlueCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BlueCave4_MapWarps: - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave4_MapEvents:: - map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc deleted file mode 100644 index ff6cb64dc..000000000 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BlueCave4: - .4byte SecretBase_BlueCave4_Layout - .4byte SecretBase_BlueCave4_MapEvents - .4byte SecretBase_BlueCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BLUE_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json new file mode 100644 index 000000000..dfc9c67a8 --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BLUE_CAVE4", + "name": "SecretBase_BlueCave4", + "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BlueCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 4, + "y": 15, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc deleted file mode 100644 index 82e523298..000000000 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave1_MapEvents:: - map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc deleted file mode 100644 index e20bdbce1..000000000 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave1: - .4byte SecretBase_BrownCave1_Layout - .4byte SecretBase_BrownCave1_MapEvents - .4byte SecretBase_BrownCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json new file mode 100644 index 000000000..20411331f --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE1", + "name": "SecretBase_BrownCave1", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc deleted file mode 100644 index 86d18b5d9..000000000 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave2_MapWarps: - warp_def 1, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave2_MapEvents:: - map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc deleted file mode 100644 index 93f2b5923..000000000 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave2: - .4byte SecretBase_BrownCave2_Layout - .4byte SecretBase_BrownCave2_MapEvents - .4byte SecretBase_BrownCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json new file mode 100644 index 000000000..800149223 --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE2", + "name": "SecretBase_BrownCave2", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 11, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 1, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc deleted file mode 100644 index 2ec6ed1b2..000000000 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave3_MapWarps: - warp_def 11, 9, 0, 126, MAP_NONE - -SecretBase_BrownCave3_MapEvents:: - map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc deleted file mode 100644 index 5c4fac1c0..000000000 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave3: - .4byte SecretBase_BrownCave3_Layout - .4byte SecretBase_BrownCave3_MapEvents - .4byte SecretBase_BrownCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json new file mode 100644 index 000000000..08ccc8c32 --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE3", + "name": "SecretBase_BrownCave3", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 11, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc deleted file mode 100644 index 58e71dc18..000000000 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_BrownCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_BrownCave4_MapWarps: - warp_def 2, 8, 0, 126, MAP_NONE - -SecretBase_BrownCave4_MapEvents:: - map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc deleted file mode 100644 index b3123ee22..000000000 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_BrownCave4: - .4byte SecretBase_BrownCave4_Layout - .4byte SecretBase_BrownCave4_MapEvents - .4byte SecretBase_BrownCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_BROWN_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json new file mode 100644 index 000000000..f6184cee2 --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_BROWN_CAVE4", + "name": "SecretBase_BrownCave4", + "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 2, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_BrownCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 2, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc deleted file mode 100644 index 015e2bde5..000000000 --- a/data/maps/SecretBase_RedCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_RedCave1_MapEvents:: - map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc deleted file mode 100644 index 4ac30b1cb..000000000 --- a/data/maps/SecretBase_RedCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave1: - .4byte SecretBase_RedCave1_Layout - .4byte SecretBase_RedCave1_MapEvents - .4byte SecretBase_RedCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json new file mode 100644 index 000000000..309dd3de0 --- /dev/null +++ b/data/maps/SecretBase_RedCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE1", + "name": "SecretBase_RedCave1", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc deleted file mode 100644 index 70997288d..000000000 --- a/data/maps/SecretBase_RedCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave2_MapWarps: - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_RedCave2_MapEvents:: - map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc deleted file mode 100644 index 64ef71196..000000000 --- a/data/maps/SecretBase_RedCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave2: - .4byte SecretBase_RedCave2_Layout - .4byte SecretBase_RedCave2_MapEvents - .4byte SecretBase_RedCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json new file mode 100644 index 000000000..0c2162856 --- /dev/null +++ b/data/maps/SecretBase_RedCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE2", + "name": "SecretBase_RedCave2", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc deleted file mode 100644 index 191aed927..000000000 --- a/data/maps/SecretBase_RedCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave3_MapWarps: - warp_def 3, 6, 0, 126, MAP_NONE - -SecretBase_RedCave3_MapEvents:: - map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc deleted file mode 100644 index 880fa84e6..000000000 --- a/data/maps/SecretBase_RedCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave3: - .4byte SecretBase_RedCave3_Layout - .4byte SecretBase_RedCave3_MapEvents - .4byte SecretBase_RedCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json new file mode 100644 index 000000000..ca5f00d6a --- /dev/null +++ b/data/maps/SecretBase_RedCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE3", + "name": "SecretBase_RedCave3", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 12, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc deleted file mode 100644 index 9e29c6bcc..000000000 --- a/data/maps/SecretBase_RedCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_RedCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_RedCave4_MapWarps: - warp_def 2, 12, 0, 126, MAP_NONE - -SecretBase_RedCave4_MapEvents:: - map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc deleted file mode 100644 index 7454f0251..000000000 --- a/data/maps/SecretBase_RedCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_RedCave4: - .4byte SecretBase_RedCave4_Layout - .4byte SecretBase_RedCave4_MapEvents - .4byte SecretBase_RedCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_RED_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json new file mode 100644 index 000000000..6fe94e6bb --- /dev/null +++ b/data/maps/SecretBase_RedCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_RED_CAVE4", + "name": "SecretBase_RedCave4", + "layout": "LAYOUT_SECRET_BASE_RED_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_RedCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 2, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc deleted file mode 100644 index 89c832969..000000000 --- a/data/maps/SecretBase_Shrub1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Shrub1_MapEvents:: - map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc deleted file mode 100644 index 76bfd4506..000000000 --- a/data/maps/SecretBase_Shrub1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub1: - .4byte SecretBase_Shrub1_Layout - .4byte SecretBase_Shrub1_MapEvents - .4byte SecretBase_Shrub1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json new file mode 100644 index 000000000..7f7dedc1c --- /dev/null +++ b/data/maps/SecretBase_Shrub1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB1", + "name": "SecretBase_Shrub1", + "layout": "LAYOUT_SECRET_BASE_SHRUB1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc deleted file mode 100644 index 6e1f4ee8c..000000000 --- a/data/maps/SecretBase_Shrub2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub2_MapWarps: - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_Shrub2_MapEvents:: - map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc deleted file mode 100644 index 53faf2d72..000000000 --- a/data/maps/SecretBase_Shrub2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub2: - .4byte SecretBase_Shrub2_Layout - .4byte SecretBase_Shrub2_MapEvents - .4byte SecretBase_Shrub2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json new file mode 100644 index 000000000..0be1b06f1 --- /dev/null +++ b/data/maps/SecretBase_Shrub2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB2", + "name": "SecretBase_Shrub2", + "layout": "LAYOUT_SECRET_BASE_SHRUB2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 13, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 5, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc deleted file mode 100644 index 38408df63..000000000 --- a/data/maps/SecretBase_Shrub3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub3_MapWarps: - warp_def 6, 9, 0, 126, MAP_NONE - -SecretBase_Shrub3_MapEvents:: - map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc deleted file mode 100644 index 4692a0060..000000000 --- a/data/maps/SecretBase_Shrub3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub3: - .4byte SecretBase_Shrub3_Layout - .4byte SecretBase_Shrub3_MapEvents - .4byte SecretBase_Shrub3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json new file mode 100644 index 000000000..7104bf5a2 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB3", + "name": "SecretBase_Shrub3", + "layout": "LAYOUT_SECRET_BASE_SHRUB3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc deleted file mode 100644 index 1ebe8a0e8..000000000 --- a/data/maps/SecretBase_Shrub4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Shrub4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Shrub4_MapWarps: - warp_def 11, 8, 0, 126, MAP_NONE - -SecretBase_Shrub4_MapEvents:: - map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc deleted file mode 100644 index 2b0186878..000000000 --- a/data/maps/SecretBase_Shrub4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Shrub4: - .4byte SecretBase_Shrub4_Layout - .4byte SecretBase_Shrub4_MapEvents - .4byte SecretBase_Shrub4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_SHRUB4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json new file mode 100644 index 000000000..15b39293d --- /dev/null +++ b/data/maps/SecretBase_Shrub4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_SHRUB4", + "name": "SecretBase_Shrub4", + "layout": "LAYOUT_SECRET_BASE_SHRUB4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Shrub4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 11, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc deleted file mode 100644 index 6ed26cb27..000000000 --- a/data/maps/SecretBase_Tree1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Tree1_MapEvents:: - map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc deleted file mode 100644 index 8cace4cef..000000000 --- a/data/maps/SecretBase_Tree1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree1: - .4byte SecretBase_Tree1_Layout - .4byte SecretBase_Tree1_MapEvents - .4byte SecretBase_Tree1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json new file mode 100644 index 000000000..a03a38cde --- /dev/null +++ b/data/maps/SecretBase_Tree1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE1", + "name": "SecretBase_Tree1", + "layout": "LAYOUT_SECRET_BASE_TREE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc deleted file mode 100644 index 46b268c37..000000000 --- a/data/maps/SecretBase_Tree2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree2_MapWarps: - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_Tree2_MapEvents:: - map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc deleted file mode 100644 index 7f286a94f..000000000 --- a/data/maps/SecretBase_Tree2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree2: - .4byte SecretBase_Tree2_Layout - .4byte SecretBase_Tree2_MapEvents - .4byte SecretBase_Tree2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json new file mode 100644 index 000000000..484096be1 --- /dev/null +++ b/data/maps/SecretBase_Tree2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE2", + "name": "SecretBase_Tree2", + "layout": "LAYOUT_SECRET_BASE_TREE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc deleted file mode 100644 index 8512b4e31..000000000 --- a/data/maps/SecretBase_Tree3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree3_MapWarps: - warp_def 8, 6, 0, 126, MAP_NONE - -SecretBase_Tree3_MapEvents:: - map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc deleted file mode 100644 index 679490875..000000000 --- a/data/maps/SecretBase_Tree3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree3: - .4byte SecretBase_Tree3_Layout - .4byte SecretBase_Tree3_MapEvents - .4byte SecretBase_Tree3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json new file mode 100644 index 000000000..c1015dd9c --- /dev/null +++ b/data/maps/SecretBase_Tree3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE3", + "name": "SecretBase_Tree3", + "layout": "LAYOUT_SECRET_BASE_TREE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 8, + "y": 6, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc deleted file mode 100644 index ed0f8b236..000000000 --- a/data/maps/SecretBase_Tree4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_Tree4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_Tree4_MapWarps: - warp_def 7, 12, 0, 126, MAP_NONE - -SecretBase_Tree4_MapEvents:: - map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc deleted file mode 100644 index ff2605f40..000000000 --- a/data/maps/SecretBase_Tree4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_Tree4: - .4byte SecretBase_Tree4_Layout - .4byte SecretBase_Tree4_MapEvents - .4byte SecretBase_Tree4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_TREE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json new file mode 100644 index 000000000..297834653 --- /dev/null +++ b/data/maps/SecretBase_Tree4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_TREE4", + "name": "SecretBase_Tree4", + "layout": "LAYOUT_SECRET_BASE_TREE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 10, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_Tree4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 7, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc deleted file mode 100644 index 6464c4854..000000000 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave1_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave1_MapWarps: - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave1_MapEvents:: - map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc deleted file mode 100644 index 642db55f5..000000000 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave1: - .4byte SecretBase_YellowCave1_Layout - .4byte SecretBase_YellowCave1_MapEvents - .4byte SecretBase_YellowCave1_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE1 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json new file mode 100644 index 000000000..0cc46d97e --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE1", + "name": "SecretBase_YellowCave1", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 3, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave1_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc deleted file mode 100644 index 99bcee17d..000000000 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave2_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave2_MapWarps: - warp_def 12, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave2_MapEvents:: - map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc deleted file mode 100644 index ae0cd73bc..000000000 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave2: - .4byte SecretBase_YellowCave2_Layout - .4byte SecretBase_YellowCave2_MapEvents - .4byte SecretBase_YellowCave2_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE2 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json new file mode 100644 index 000000000..9660114af --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE2", + "name": "SecretBase_YellowCave2", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave2_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 12, + "y": 7, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc deleted file mode 100644 index 10bbfac8d..000000000 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave3_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave3_MapWarps: - warp_def 5, 9, 0, 126, MAP_NONE - -SecretBase_YellowCave3_MapEvents:: - map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc deleted file mode 100644 index 39008b2b3..000000000 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave3: - .4byte SecretBase_YellowCave3_Layout - .4byte SecretBase_YellowCave3_MapEvents - .4byte SecretBase_YellowCave3_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE3 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json new file mode 100644 index 000000000..fbc6d6217 --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE3", + "name": "SecretBase_YellowCave3", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave3_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 5, + "y": 9, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc deleted file mode 100644 index 9afc93297..000000000 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ /dev/null @@ -1,23 +0,0 @@ -SecretBase_YellowCave4_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - -SecretBase_YellowCave4_MapWarps: - warp_def 6, 12, 0, 126, MAP_NONE - -SecretBase_YellowCave4_MapEvents:: - map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc deleted file mode 100644 index 24e10379b..000000000 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SecretBase_YellowCave4: - .4byte SecretBase_YellowCave4_Layout - .4byte SecretBase_YellowCave4_MapEvents - .4byte SecretBase_YellowCave4_MapScripts - .4byte 0x0 - .2byte MUS_MACHI_S3 - .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE4 - .byte MAPSEC_SECRET_BASE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_SECRET_BASE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json new file mode 100644 index 000000000..d91c2f9a3 --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -0,0 +1,224 @@ +{ + "id": "MAP_SECRET_BASE_YELLOW_CAVE4", + "name": "SecretBase_YellowCave4", + "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4", + "music": "MUS_MACHI_S3", + "region_map_section": "MAPSEC_SECRET_BASE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_SECRET_BASE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "x": 9, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SecretBase_YellowCave4_EventScript_275D64", + "flag": "FLAG_DECORATION_0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 0, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 0, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 0, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 0, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 0, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 1, + "y": 0, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "x": 1, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_9" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "x": 1, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_10" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "x": 1, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_DECORATION_14" + } + ], + "warp_events": [ + { + "x": 6, + "y": 12, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 126 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc deleted file mode 100644 index 8fa935974..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc deleted file mode 100644 index 12d853e7a..000000000 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideEntranceRoom: - .4byte ShoalCave_HighTideEntranceRoom_Layout - .4byte ShoalCave_HighTideEntranceRoom_MapEvents - .4byte ShoalCave_HighTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json new file mode 100644 index 000000000..046fe4966 --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_HighTideEntranceRoom", + "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc deleted file mode 100644 index 96d1e9d5e..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc +++ /dev/null @@ -1,3 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: - map_events 0x0, 0x0, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc deleted file mode 100644 index cdee5935a..000000000 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_HighTideInnerRoom: - .4byte ShoalCave_HighTideInnerRoom_Layout - .4byte ShoalCave_HighTideInnerRoom_MapEvents - .4byte ShoalCave_HighTideInnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json new file mode 100644 index 000000000..ff2231d67 --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -0,0 +1,20 @@ +{ + "id": "MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "name": "ShoalCave_HighTideInnerRoom", + "layout": "LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc deleted file mode 100644 index 39b462ba8..000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ShoalCave_LowTideEntranceRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL - object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 - -ShoalCave_LowTideEntranceRoom_MapWarps: - warp_def 20, 30, 3, 0, MAP_ROUTE125 - warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - -ShoalCave_LowTideEntranceRoom_MapEvents:: - map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc deleted file mode 100644 index cf1600b53..000000000 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideEntranceRoom: - .4byte ShoalCave_LowTideEntranceRoom_Layout - .4byte ShoalCave_LowTideEntranceRoom_MapEvents - .4byte ShoalCave_LowTideEntranceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json new file mode 100644 index 000000000..477c1c500 --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -0,0 +1,76 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "name": "ShoalCave_LowTideEntranceRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 30, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideEntranceRoom_EventScript_2913C0", + "flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 18, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 20, + "y": 30, + "elevation": 3, + "dest_map": "MAP_ROUTE125", + "dest_warp_id": 0 + }, + { + "x": 19, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 6 + }, + { + "x": 27, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index c596ba687..6e0f4eddb 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -8,11 +8,11 @@ ShoalCave_LowTideEntranceRoom_MapScript1_236DC0: @ 8236DC0 goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5 ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1 - setmaplayoutindex 168 + setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM end ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5 - setmaplayoutindex 164 + setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM end ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc deleted file mode 100644 index 57c4f580b..000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -ShoalCave_LowTideIceRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE - -ShoalCave_LowTideIceRoom_MapWarps: - warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - -ShoalCave_LowTideIceRoom_MapEvents:: - map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc deleted file mode 100644 index a05edf096..000000000 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideIceRoom: - .4byte ShoalCave_LowTideIceRoom_Layout - .4byte ShoalCave_LowTideIceRoom_MapEvents - .4byte ShoalCave_LowTideIceRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json new file mode 100644 index 000000000..fd2e72680 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -0,0 +1,55 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "name": "ShoalCave_LowTideIceRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideIceRoom_EventScript_2913E7", + "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 12, + "y": 21, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideIceRoom_EventScript_2913F4", + "flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE" + } + ], + "warp_events": [ + { + "x": 17, + "y": 10, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc deleted file mode 100644 index 8a4d0b7a9..000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ /dev/null @@ -1,24 +0,0 @@ -ShoalCave_LowTideInnerRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY - -ShoalCave_LowTideInnerRoom_MapWarps: - warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -ShoalCave_LowTideInnerRoom_MapBGEvents: - bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C - bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 - bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA - bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FF6 - bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 - bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A - -ShoalCave_LowTideInnerRoom_MapEvents:: - map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc deleted file mode 100644 index 431d59985..000000000 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideInnerRoom: - .4byte ShoalCave_LowTideInnerRoom_Layout - .4byte ShoalCave_LowTideInnerRoom_MapEvents - .4byte ShoalCave_LowTideInnerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json new file mode 100644 index 000000000..a7c276aa4 --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -0,0 +1,140 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "name": "ShoalCave_LowTideInnerRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 26, + "y": 14, + "elevation": 5, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideInnerRoom_EventScript_2913CD", + "flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY" + } + ], + "warp_events": [ + { + "x": 34, + "y": 29, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 1 + }, + { + "x": 38, + "y": 15, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "dest_warp_id": 0 + }, + { + "x": 42, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "dest_warp_id": 1 + }, + { + "x": 19, + "y": 14, + "elevation": 4, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 19, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 1 + }, + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "dest_warp_id": 2 + }, + { + "x": 14, + "y": 33, + "elevation": 5, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 2 + }, + { + "x": 40, + "y": 33, + "elevation": 5, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 31, + "y": 8, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C" + }, + { + "type": "sign", + "x": 14, + "y": 26, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8" + }, + { + "type": "sign", + "x": 41, + "y": 20, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA" + }, + { + "type": "sign", + "x": 41, + "y": 10, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6" + }, + { + "type": "sign", + "x": 6, + "y": 9, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_237028" + }, + { + "type": "sign", + "x": 16, + "y": 13, + "elevation": 5, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A" + } + ] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 65bdd73b8..c54aa1d4f 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -8,11 +8,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F00: @ 8236F00 goto ShoalCave_LowTideInnerRoom_EventScript_236F12 ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E - setmaplayoutindex 169 + setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM end ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12 - setmaplayoutindex 165 + setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM end ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc deleted file mode 100644 index 226f351e4..000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -ShoalCave_LowTideLowerRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 - -ShoalCave_LowTideLowerRoom_MapWarps: - warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM - -ShoalCave_LowTideLowerRoom_MapBGEvents: - bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 - -ShoalCave_LowTideLowerRoom_MapEvents:: - map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc deleted file mode 100644 index 490825d06..000000000 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom: - .4byte ShoalCave_LowTideLowerRoom_Layout - .4byte ShoalCave_LowTideLowerRoom_MapEvents - .4byte ShoalCave_LowTideLowerRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json new file mode 100644 index 000000000..5c399ed53 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -0,0 +1,85 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "name": "ShoalCave_LowTideLowerRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 25, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideLowerRoom_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 11, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 2, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 3 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 4 + }, + { + "x": 19, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 5 + }, + { + "x": 28, + "y": 11, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 18, + "y": 2, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideLowerRoom_EventScript_237176" + } + ] +} \ No newline at end of file diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc deleted file mode 100644 index 640d153f7..000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -ShoalCave_LowTideStairsRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL - -ShoalCave_LowTideStairsRoom_MapWarps: - warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM - -ShoalCave_LowTideStairsRoom_MapBGEvents: - bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A - -ShoalCave_LowTideStairsRoom_MapEvents:: - map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc deleted file mode 100644 index 3454cf1f6..000000000 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideStairsRoom: - .4byte ShoalCave_LowTideStairsRoom_Layout - .4byte ShoalCave_LowTideStairsRoom_MapEvents - .4byte ShoalCave_LowTideStairsRoom_MapScripts - .4byte 0x0 - .2byte MUS_M_DUNGON - .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM - .byte MAPSEC_SHOAL_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json new file mode 100644 index 000000000..e4ad65f52 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -0,0 +1,58 @@ +{ + "id": "MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "name": "ShoalCave_LowTideStairsRoom", + "layout": "LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM", + "music": "MUS_M_DUNGON", + "region_map_section": "MAPSEC_SHOAL_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "ShoalCave_LowTideStairsRoom_EventScript_2913DA", + "flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL" + } + ], + "warp_events": [ + { + "x": 3, + "y": 12, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 11, + "y": 11, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A" + } + ] +} \ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc deleted file mode 100644 index cc422090e..000000000 --- a/data/maps/SingleBattleColosseum/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SingleBattleColosseum_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 - -SingleBattleColosseum_MapWarps: - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - -SingleBattleColosseum_MapCoordEvents: - coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 - coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E - -SingleBattleColosseum_MapEvents:: - map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 - diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc deleted file mode 100644 index 9bf35edca..000000000 --- a/data/maps/SingleBattleColosseum/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SingleBattleColosseum: - .4byte SingleBattleColosseum_Layout - .4byte SingleBattleColosseum_MapEvents - .4byte SingleBattleColosseum_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_SINGLE_BATTLE_COLOSSEUM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json new file mode 100644 index 000000000..a2cc78b2f --- /dev/null +++ b/data/maps/SingleBattleColosseum/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SINGLE_BATTLE_COLOSSEUM", + "name": "SingleBattleColosseum", + "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SingleBattleColosseum_EventScript_2774A6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_08277374" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_0827737E" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc deleted file mode 100644 index eb6f98b7d..000000000 --- a/data/maps/SkyPillar_1F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_1F_MapWarps: - warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE - warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F - -SkyPillar_1F_MapEvents:: - map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc deleted file mode 100644 index 83082ecc0..000000000 --- a/data/maps/SkyPillar_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_1F: - .4byte SkyPillar_1F_Layout - .4byte SkyPillar_1F_MapEvents - .4byte SkyPillar_1F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_1F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json new file mode 100644 index 000000000..3d1fbf51a --- /dev/null +++ b/data/maps/SkyPillar_1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_1F", + "name": "SkyPillar_1F", + "layout": "LAYOUT_SKY_PILLAR_1F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 1 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 3d76a9fe2..2230dad8d 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B end SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex 433 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54 return diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc deleted file mode 100644 index 3b4b27915..000000000 --- a/data/maps/SkyPillar_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_2F_MapWarps: - warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F - -SkyPillar_2F_MapEvents:: - map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc deleted file mode 100644 index 46141edca..000000000 --- a/data/maps/SkyPillar_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_2F: - .4byte SkyPillar_2F_Layout - .4byte SkyPillar_2F_MapEvents - .4byte SkyPillar_2F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_2F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json new file mode 100644 index 000000000..1e543db40 --- /dev/null +++ b/data/maps/SkyPillar_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_2F", + "name": "SkyPillar_2F", + "layout": "LAYOUT_SKY_PILLAR_2F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_1F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index 0474a829c..fa89f3893 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B end SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex 434 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC return SkyPillar_2F_MapScript1_239650: @ 8239650 diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc deleted file mode 100644 index 8e3f498dc..000000000 --- a/data/maps/SkyPillar_3F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_3F_MapWarps: - warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F - warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F - warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F - -SkyPillar_3F_MapEvents:: - map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc deleted file mode 100644 index 9b4ab53f0..000000000 --- a/data/maps/SkyPillar_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_3F: - .4byte SkyPillar_3F_Layout - .4byte SkyPillar_3F_MapEvents - .4byte SkyPillar_3F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_3F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json new file mode 100644 index 000000000..56a85256f --- /dev/null +++ b/data/maps/SkyPillar_3F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_3F", + "name": "SkyPillar_3F", + "layout": "LAYOUT_SKY_PILLAR_3F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_2F", + "dest_warp_id": 1 + }, + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 777d53b62..015d754eb 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661 end SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex 435 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4 return diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc deleted file mode 100644 index ce0cdd2e3..000000000 --- a/data/maps/SkyPillar_4F/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_4F_MapWarps: - warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F - warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F - -SkyPillar_4F_MapEvents:: - map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc deleted file mode 100644 index be6e9e66a..000000000 --- a/data/maps/SkyPillar_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_4F: - .4byte SkyPillar_4F_Layout - .4byte SkyPillar_4F_MapEvents - .4byte SkyPillar_4F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_4F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json new file mode 100644 index 000000000..babc00f6c --- /dev/null +++ b/data/maps/SkyPillar_4F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SKY_PILLAR_4F", + "name": "SkyPillar_4F", + "layout": "LAYOUT_SKY_PILLAR_4F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 11, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 1 + }, + { + "x": 7, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_3F", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_5F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index 262492169..ccab2453c 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681 end SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex 436 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C return SkyPillar_4F_MapScript1_239696: @ 8239696 diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc deleted file mode 100644 index b3ad7b0f7..000000000 --- a/data/maps/SkyPillar_5F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_5F_MapWarps: - warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP - -SkyPillar_5F_MapEvents:: - map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc deleted file mode 100644 index 8fa59173b..000000000 --- a/data/maps/SkyPillar_5F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_5F: - .4byte SkyPillar_5F_Layout - .4byte SkyPillar_5F_MapEvents - .4byte SkyPillar_5F_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_5F - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json new file mode 100644 index 000000000..233e86dfe --- /dev/null +++ b/data/maps/SkyPillar_5F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_5F", + "name": "SkyPillar_5F", + "layout": "LAYOUT_SKY_PILLAR_5F", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_4F", + "dest_warp_id": 2 + }, + { + "x": 10, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_TOP", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index 41546899f..b3e3f6605 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex 437 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4 return diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc deleted file mode 100644 index ca0647e3f..000000000 --- a/data/maps/SkyPillar_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_Entrance_MapWarps: - warp_def 6, 16, 3, 0, MAP_ROUTE131 - warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE - -SkyPillar_Entrance_MapEvents:: - map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc deleted file mode 100644 index 5326495a6..000000000 --- a/data/maps/SkyPillar_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Entrance: - .4byte SkyPillar_Entrance_Layout - .4byte SkyPillar_Entrance_MapEvents - .4byte SkyPillar_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_ENTRANCE - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json new file mode 100644 index 000000000..379d6fcfb --- /dev/null +++ b/data/maps/SkyPillar_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_SKY_PILLAR_ENTRANCE", + "name": "SkyPillar_Entrance", + "layout": "LAYOUT_SKY_PILLAR_ENTRANCE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 6, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE131", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 4, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_OUTSIDE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc deleted file mode 100644 index 90de89d64..000000000 --- a/data/maps/SkyPillar_Outside/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SkyPillar_Outside_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE - -SkyPillar_Outside_MapWarps: - warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE - warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F - -SkyPillar_Outside_MapEvents:: - map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc deleted file mode 100644 index 3b60eaef2..000000000 --- a/data/maps/SkyPillar_Outside/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Outside: - .4byte SkyPillar_Outside_Layout - .4byte SkyPillar_Outside_MapEvents - .4byte SkyPillar_Outside_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_OUTSIDE - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json new file mode 100644 index 000000000..dd76c1d32 --- /dev/null +++ b/data/maps/SkyPillar_Outside/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SKY_PILLAR_OUTSIDE", + "name": "SkyPillar_Outside", + "layout": "LAYOUT_SKY_PILLAR_OUTSIDE", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 13, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SkyPillar_Outside_EventScript_2393F8", + "flag": "FLAG_HIDE_SKY_PILLAR_WALLACE" + } + ], + "warp_events": [ + { + "x": 17, + "y": 13, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_ENTRANCE", + "dest_warp_id": 1 + }, + { + "x": 14, + "y": 5, + "elevation": 0, + "dest_map": "MAP_SKY_PILLAR_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc deleted file mode 100644 index 23edf5bb2..000000000 --- a/data/maps/SkyPillar_Top/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SkyPillar_Top_EventObjects: - object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 - object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT - -SkyPillar_Top_MapWarps: - warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F - -SkyPillar_Top_MapCoordEvents: - coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A - -SkyPillar_Top_MapEvents:: - map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 - diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc deleted file mode 100644 index a4ab735e0..000000000 --- a/data/maps/SkyPillar_Top/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SkyPillar_Top: - .4byte SkyPillar_Top_Layout - .4byte SkyPillar_Top_MapEvents - .4byte SkyPillar_Top_MapScripts - .4byte 0x0 - .2byte MUS_TOZAN - .2byte LAYOUT_SKY_PILLAR_TOP - .byte MAPSEC_SKY_PILLAR - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json new file mode 100644 index 000000000..0d53a80be --- /dev/null +++ b/data/maps/SkyPillar_Top/map.json @@ -0,0 +1,65 @@ +{ + "id": "MAP_SKY_PILLAR_TOP", + "name": "SkyPillar_Top", + "layout": "LAYOUT_SKY_PILLAR_TOP", + "music": "MUS_TOZAN", + "region_map_section": "MAPSEC_SKY_PILLAR", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "x": 14, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_1", + "x": 14, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SkyPillar_Top_EventScript_239722", + "flag": "FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT" + } + ], + "warp_events": [ + { + "x": 16, + "y": 14, + "elevation": 3, + "dest_map": "MAP_SKY_PILLAR_5F", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 14, + "y": 9, + "elevation": 3, + "var": "VAR_0x40D7", + "var_value": 0, + "script": "SkyPillar_Top_EventScript_23979A" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index c091991a3..f764ea79c 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex 438 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc deleted file mode 100644 index 09e0b790a..000000000 --- a/data/maps/SlateportCity/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -SlateportCity_MapConnectionsList: - connection up, 0, MAP_ROUTE110 - connection down, 0, MAP_ROUTE109 - connection right, 0, MAP_ROUTE134 - -SlateportCity_MapConnections: - .4byte 3 - .4byte SlateportCity_MapConnectionsList - diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc deleted file mode 100644 index ce576927c..000000000 --- a/data/maps/SlateportCity/events.inc +++ /dev/null @@ -1,71 +0,0 @@ -SlateportCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 - object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0 - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE63, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCE84, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 37, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0 - object_event 14, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFF7, 0 - object_event 15, EVENT_OBJ_GFX_MAN_3, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DD000, 0 - object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_1DCFBB, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0 - object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0 - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0 - object_event 22, EVENT_OBJ_GFX_MAN_5, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0 - object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DD1D8, FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN - object_event 25, EVENT_OBJ_GFX_POKEFAN_M, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_1DCDBD, 0 - object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD04E, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD065, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD07C, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD093, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_1DD0AA, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD0C1, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD14A, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 25, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_1DD153, FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA - object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 - object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT - -SlateportCity_MapWarps: - warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART - warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY - warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB - warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1 - warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR - warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR - warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 - -SlateportCity_MapCoordEvents: - coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC - -SlateportCity_MapBGEvents: - bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 - bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 - bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 - bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A - bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF94 - bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E6A - bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF8B - bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF79 - bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF82 - bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF70 - bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF36 - bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F - bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 - -SlateportCity_MapEvents:: - map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents - diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc deleted file mode 100644 index 3a6e14534..000000000 --- a/data/maps/SlateportCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity: - .4byte SlateportCity_Layout - .4byte SlateportCity_MapEvents - .4byte SlateportCity_MapScripts - .4byte SlateportCity_MapConnections - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json new file mode 100644 index 000000000..52f2f6412 --- /dev/null +++ b/data/maps/SlateportCity/map.json @@ -0,0 +1,685 @@ +{ + "id": "MAP_SLATEPORT_CITY", + "name": "SlateportCity", + "layout": "LAYOUT_SLATEPORT_CITY", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_ROUTE110" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_ROUTE109" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE134" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 21, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCED9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 34, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCEF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RICH_BOY", + "x": 5, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCEB8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 26, + "y": 29, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCF17", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 31, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD009", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_COOK", + "x": 5, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE42", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN", + "x": 20, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE63", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 8, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCE84", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "x": 29, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD353", + "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 28, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD35C", + "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 28, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD1F8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 37, + "y": 41, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFE5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 28, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFEE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 9, + "y": 50, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFF7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 16, + "y": 46, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD000", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 8, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFBB", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 15, + "y": 31, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCFDC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 30, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD020", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 29, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD037", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 6, + "y": 38, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD198", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 5, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD16A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "x": 34, + "y": 51, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD365", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCDE4", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 11, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD1D8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 5, + "y": 47, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DCDBD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 22, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD04E", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 23, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD065", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 24, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD07C", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 21, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD093", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD0AA", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 26, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD0C1", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 28, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD14A", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 25, + "y": 27, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD153", + "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 11, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_EventScript_1DD36E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 10, + "y": 12, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_SCOTT" + } + ], + "warp_events": [ + { + "x": 19, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 13, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 26, + "y": 38, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 4, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "dest_warp_id": 0 + }, + { + "x": 30, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 0 + }, + { + "x": 5, + "y": 19, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 1 + }, + { + "x": 28, + "y": 12, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HARBOR", + "dest_warp_id": 0 + }, + { + "x": 40, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HARBOR", + "dest_warp_id": 2 + }, + { + "x": 21, + "y": 44, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_HOUSE2", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 10, + "y": 13, + "elevation": 3, + "var": "VAR_0x40D2", + "var_value": 2, + "script": "SlateportCity_EventScript_1DD5DC" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCFB2" + }, + { + "type": "sign", + "x": 20, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 21, + "y": 19, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 14, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 24, + "y": 12, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF94" + }, + { + "type": "sign", + "x": 15, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 14, + "y": 51, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF8B" + }, + { + "type": "sign", + "x": 26, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF79" + }, + { + "type": "sign", + "x": 16, + "y": 22, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF82" + }, + { + "type": "sign", + "x": 8, + "y": 26, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF70" + }, + { + "type": "sign", + "x": 7, + "y": 13, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF36" + }, + { + "type": "sign", + "x": 23, + "y": 38, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_EventScript_1DCF3F" + }, + { + "type": "sign", + "x": 10, + "y": 36, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SlateportCity_EventScript_1DD643" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc deleted file mode 100644 index 2dae03138..000000000 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -SlateportCity_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -SlateportCity_BattleTentBattleRoom_MapEvents:: - map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc deleted file mode 100644 index ff2970197..000000000 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentBattleRoom: - .4byte BattleTentBattleRoom_Layout - .4byte SlateportCity_BattleTentBattleRoom_MapEvents - .4byte SlateportCity_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/map.json b/data/maps/SlateportCity_BattleTentBattleRoom/map.json new file mode 100644 index 000000000..ed9a8866c --- /dev/null +++ b/data/maps/SlateportCity_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM", + "name": "SlateportCity_BattleTentBattleRoom", + "layout": "LAYOUT_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 1, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 5, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc deleted file mode 100644 index f165ab2fa..000000000 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -SlateportCity_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -SlateportCity_BattleTentCorridor_MapEvents:: - map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc deleted file mode 100644 index d1e0a8911..000000000 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte SlateportCity_BattleTentCorridor_MapEvents - .4byte SlateportCity_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentCorridor/map.json b/data/maps/SlateportCity_BattleTentCorridor/map.json new file mode 100644 index 000000000..d5e2d5e37 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR", + "name": "SlateportCity_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc deleted file mode 100644 index 81a3499ec..000000000 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ /dev/null @@ -1,17 +0,0 @@ -SlateportCity_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 - -SlateportCity_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY - warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY - -SlateportCity_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 - -SlateportCity_BattleTentLobby_MapEvents:: - map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents - diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc deleted file mode 100644 index 8b9df581e..000000000 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte SlateportCity_BattleTentLobby_MapEvents - .4byte SlateportCity_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_BattleTentLobby/map.json b/data/maps/SlateportCity_BattleTentLobby/map.json new file mode 100644 index 000000000..07af8ad73 --- /dev/null +++ b/data/maps/SlateportCity_BattleTentLobby/map.json @@ -0,0 +1,110 @@ +{ + "id": "MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY", + "name": "SlateportCity_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_2088AA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 1, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A3D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 3, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A7E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A87", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 11, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_BattleTentLobby_EventScript_208A90", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 3 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_BattleTentLobby_EventScript_208A99" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc deleted file mode 100644 index 7984e2992..000000000 --- a/data/maps/SlateportCity_Harbor/events.inc +++ /dev/null @@ -1,25 +0,0 @@ -SlateportCity_Harbor_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT - object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW - -SlateportCity_Harbor_MapWarps: - warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY - warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY - warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY - warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY - -SlateportCity_Harbor_MapCoordEvents: - coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB - coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 - coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 - coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF - -SlateportCity_Harbor_MapEvents:: - map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 - diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc deleted file mode 100644 index 24b39a88f..000000000 --- a/data/maps/SlateportCity_Harbor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_Harbor: - .4byte Harbor_Layout - .4byte SlateportCity_Harbor_MapEvents - .4byte SlateportCity_Harbor_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HARBOR - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json new file mode 100644 index 000000000..a48b6a82f --- /dev/null +++ b/data/maps/SlateportCity_Harbor/map.json @@ -0,0 +1,191 @@ +{ + "id": "MAP_SLATEPORT_CITY_HARBOR", + "name": "SlateportCity_Harbor", + "layout": "LAYOUT_HARBOR", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CAF1", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 4, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CC52", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 1, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CC99", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Harbor_EventScript_20CCA2", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 8, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 7, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 8, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "x": 7, + "y": 9, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW" + } + ], + "warp_events": [ + { + "x": 11, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 8 + }, + { + "x": 12, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 8 + }, + { + "x": 19, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 9 + }, + { + "x": 20, + "y": 15, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 8, + "y": 11, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9BB" + }, + { + "type": "trigger", + "x": 8, + "y": 12, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9C7" + }, + { + "type": "trigger", + "x": 8, + "y": 13, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9D3" + }, + { + "type": "trigger", + "x": 8, + "y": 14, + "elevation": 3, + "var": "VAR_0x40A0", + "var_value": 1, + "script": "SlateportCity_Harbor_EventScript_20C9DF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc deleted file mode 100644 index a5fcfba7e..000000000 --- a/data/maps/SlateportCity_House1/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SlateportCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 - -SlateportCity_House1_MapWarps: - warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY - -SlateportCity_House1_MapEvents:: - map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc deleted file mode 100644 index 2673a3716..000000000 --- a/data/maps/SlateportCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_House1: - .4byte HouseWithBed_Layout - .4byte SlateportCity_House1_MapEvents - .4byte SlateportCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HOUSE_WITH_BED - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json new file mode 100644 index 000000000..b1eed1027 --- /dev/null +++ b/data/maps/SlateportCity_House1/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SLATEPORT_CITY_HOUSE1", + "name": "SlateportCity_House1", + "layout": "LAYOUT_HOUSE_WITH_BED", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 7, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House1_EventScript_209AA5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc deleted file mode 100644 index eba48e548..000000000 --- a/data/maps/SlateportCity_House2/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 - -SlateportCity_House2_MapWarps: - warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY - -SlateportCity_House2_MapEvents:: - map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc deleted file mode 100644 index 0e756ee4a..000000000 --- a/data/maps/SlateportCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_House2: - .4byte House2_Layout - .4byte SlateportCity_House2_MapEvents - .4byte SlateportCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json new file mode 100644 index 000000000..24ae6e67d --- /dev/null +++ b/data/maps/SlateportCity_House2/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SLATEPORT_CITY_HOUSE2", + "name": "SlateportCity_House2", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House2_EventScript_20D9AF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_House2_EventScript_20D9B8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc deleted file mode 100644 index a6d872630..000000000 --- a/data/maps/SlateportCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SlateportCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 - -SlateportCity_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY - -SlateportCity_Mart_MapEvents:: - map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc deleted file mode 100644 index a98e7bb90..000000000 --- a/data/maps/SlateportCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_Mart: - .4byte Mart_Layout - .4byte SlateportCity_Mart_MapEvents - .4byte SlateportCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json new file mode 100644 index 000000000..cec96e59f --- /dev/null +++ b/data/maps/SlateportCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SLATEPORT_CITY_MART", + "name": "SlateportCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC49", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC76", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_Mart_EventScript_20DC7F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc deleted file mode 100644 index 254506300..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ /dev/null @@ -1,43 +0,0 @@ -SlateportCity_OceanicMuseum_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 - object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS - object_event 9, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - -SlateportCity_OceanicMuseum_1F_MapWarps: - warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY - warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY - warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F - -SlateportCity_OceanicMuseum_1F_MapCoordEvents: - coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F - coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 - -SlateportCity_OceanicMuseum_1F_MapBGEvents: - bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 - bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 - bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE9E - bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEA7 - bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB0 - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEB9 - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AEC2 - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB - -SlateportCity_OceanicMuseum_1F_MapEvents:: - map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc deleted file mode 100644 index 0bf69b52a..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_1F: - .4byte SlateportCity_OceanicMuseum_1F_Layout - .4byte SlateportCity_OceanicMuseum_1F_MapEvents - .4byte SlateportCity_OceanicMuseum_1F_MapScripts - .4byte 0x0 - .2byte MUS_FUNE_KAN - .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json new file mode 100644 index 000000000..7202fc35a --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -0,0 +1,349 @@ +{ + "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "name": "SlateportCity_OceanicMuseum_1F", + "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "music": "MUS_FUNE_KAN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 7, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 18, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE5F", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE68", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE56", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_F", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE4D", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 14, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE71", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE7A", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AED4", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 10, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEDD", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 17, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEE6", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEEF", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 9, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEF8", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_28C883", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + } + ], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 5 + }, + { + "x": 10, + "y": 8, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 7 + }, + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 7, + "elevation": 3, + "var": "VAR_0x40AA", + "var_value": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F" + }, + { + "type": "trigger", + "x": 10, + "y": 7, + "elevation": 3, + "var": "VAR_0x40AA", + "var_value": 0, + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 2, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE83" + }, + { + "type": "sign", + "x": 2, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE8C" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + }, + { + "type": "sign", + "x": 10, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE95" + }, + { + "type": "sign", + "x": 13, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AE9E" + }, + { + "type": "sign", + "x": 15, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEA7" + }, + { + "type": "sign", + "x": 18, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB0" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEB9" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + }, + { + "type": "sign", + "x": 3, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AEC2" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + }, + { + "type": "sign", + "x": 17, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AECB" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc deleted file mode 100644 index b1cd4477a..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ /dev/null @@ -1,38 +0,0 @@ -SlateportCity_OceanicMuseum_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN - object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE - object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 - object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2 - object_event 5, EVENT_OBJ_GFX_OLD_MAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION - -SlateportCity_OceanicMuseum_2F_MapWarps: - warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - -SlateportCity_OceanicMuseum_2F_MapBGEvents: - bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A - bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 - bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 - bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD49 - bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD5B - bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD37 - bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD2E - bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD25 - bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD1C - bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 - -SlateportCity_OceanicMuseum_2F_MapEvents:: - map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc deleted file mode 100644 index 8212c6be5..000000000 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_OceanicMuseum_2F: - .4byte SlateportCity_OceanicMuseum_2F_Layout - .4byte SlateportCity_OceanicMuseum_2F_MapEvents - .4byte SlateportCity_OceanicMuseum_2F_MapScripts - .4byte 0x0 - .2byte MUS_FUNE_KAN - .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json new file mode 100644 index 000000000..dbb46dbfc --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -0,0 +1,289 @@ +{ + "id": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "name": "SlateportCity_OceanicMuseum_2F", + "layout": "LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F", + "music": "MUS_FUNE_KAN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 13, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BB00", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M", + "x": 6, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD64", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD6D", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD76", + "flag": "FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION" + } + ], + "warp_events": [ + { + "x": 6, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 18, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD0A" + }, + { + "type": "sign", + "x": 18, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD13" + }, + { + "type": "sign", + "x": 4, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + }, + { + "type": "sign", + "x": 4, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD52" + }, + { + "type": "sign", + "x": 3, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 2, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 3, + "y": 4, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD49" + }, + { + "type": "sign", + "x": 3, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 4, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 13, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + }, + { + "type": "sign", + "x": 14, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD5B" + }, + { + "type": "sign", + "x": 18, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + }, + { + "type": "sign", + "x": 19, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD37" + }, + { + "type": "sign", + "x": 15, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + }, + { + "type": "sign", + "x": 16, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD2E" + }, + { + "type": "sign", + "x": 8, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + }, + { + "type": "sign", + "x": 9, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD25" + }, + { + "type": "sign", + "x": 12, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + }, + { + "type": "sign", + "x": 13, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD1C" + }, + { + "type": "sign", + "x": 3, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + }, + { + "type": "sign", + "x": 4, + "y": 7, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SlateportCity_OceanicMuseum_2F_EventScript_20BD40" + } + ] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 79442b1aa..000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -SlateportCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 - -SlateportCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY - warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY - warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F - -SlateportCity_PokemonCenter_1F_MapEvents:: - map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc deleted file mode 100644 index aee6e2e1c..000000000 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte SlateportCity_PokemonCenter_1F_MapEvents - .4byte SlateportCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..eecc72248 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -0,0 +1,82 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "name": "SlateportCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAD3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAE1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_1F_EventScript_20DAEA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc deleted file mode 100644 index 34f7fe078..000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -SlateportCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -SlateportCity_PokemonCenter_2F_MapEvents:: - map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc deleted file mode 100644 index bc9640581..000000000 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte SlateportCity_PokemonCenter_2F_MapEvents - .4byte SlateportCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..e12efc0f0 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_CENTER_2F", + "name": "SlateportCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SLATEPORT_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc deleted file mode 100644 index 861d9cb62..000000000 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SlateportCity_PokemonFanClub_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 - -SlateportCity_PokemonFanClub_MapWarps: - warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY - warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY - -SlateportCity_PokemonFanClub_MapEvents:: - map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc deleted file mode 100644 index 29e6816a3..000000000 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_PokemonFanClub: - .4byte SlateportCity_PokemonFanClub_Layout - .4byte SlateportCity_PokemonFanClub_MapEvents - .4byte SlateportCity_PokemonFanClub_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json new file mode 100644 index 000000000..e41bee0fd --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "name": "SlateportCity_PokemonFanClub", + "layout": "LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 11, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 1, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "x": 11, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_28C943", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 6, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A17E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 6, + "y": 5, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_209E96", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON_2", + "x": 3, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A20D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "x": 8, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 10, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_20A220", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "x": 11, + "y": 8, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 4 + }, + { + "x": 7, + "y": 10, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc deleted file mode 100644 index 052ccd965..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_SternsShipyard_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 - object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - -SlateportCity_SternsShipyard_1F_MapWarps: - warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY - warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY - warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F - -SlateportCity_SternsShipyard_1F_MapEvents:: - map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc deleted file mode 100644 index 3731923e2..000000000 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_1F: - .4byte SlateportCity_SternsShipyard_1F_Layout - .4byte SlateportCity_SternsShipyard_1F_MapEvents - .4byte SlateportCity_SternsShipyard_1F_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json new file mode 100644 index 000000000..8497f4212 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "name": "SlateportCity_SternsShipyard_1F", + "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 18, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF", + "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY" + } + ], + "warp_events": [ + { + "x": 2, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 14, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY", + "dest_warp_id": 2 + }, + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc deleted file mode 100644 index 2e48eb8b4..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_SternsShipyard_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 - -SlateportCity_SternsShipyard_2F_MapWarps: - warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - -SlateportCity_SternsShipyard_2F_MapEvents:: - map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc deleted file mode 100644 index 094f9fdec..000000000 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SlateportCity_SternsShipyard_2F: - .4byte SlateportCity_SternsShipyard_2F_Layout - .4byte SlateportCity_SternsShipyard_2F_MapEvents - .4byte SlateportCity_SternsShipyard_2F_MapScripts - .4byte 0x0 - .2byte MUS_FINECITY - .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F - .byte MAPSEC_SLATEPORT_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json new file mode 100644 index 000000000..025d97f9a --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "name": "SlateportCity_SternsShipyard_2F", + "layout": "LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F", + "music": "MUS_FINECITY", + "region_map_section": "MAPSEC_SLATEPORT_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 10, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "x": 0, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SlateportCity_SternsShipyard_2F_EventScript_208647", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity/connections.inc b/data/maps/SootopolisCity/connections.inc deleted file mode 100644 index 230f56b2e..000000000 --- a/data/maps/SootopolisCity/connections.inc +++ /dev/null @@ -1,6 +0,0 @@ -SootopolisCity_MapConnectionsList:: @ 84867F0 - @ empty - -SootopolisCity_MapConnections:: @ 84867F0 - .4byte 0 - .4byte SootopolisCity_MapConnectionsList diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc deleted file mode 100644 index 6592c293d..000000000 --- a/data/maps/SootopolisCity/events.inc +++ /dev/null @@ -1,46 +0,0 @@ -SootopolisCity_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 - object_event 4, EVENT_OBJ_GFX_NINJA_BOY, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1 - object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 20, 36, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6166, FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6038, 0 - object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 28, 44, 0, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON - object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 34, 44, 1, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE - object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 31, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA - object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 17, 44, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6411, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 14, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E63DB, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_1E6393, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 19, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E635D, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS - object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 29, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E64F2, FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE - object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE - object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE - -SootopolisCity_MapWarps: - warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART - warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F - warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1 - warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2 - warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3 - warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4 - warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5 - warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6 - warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7 - warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - -SootopolisCity_MapBGEvents: - bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B - bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A - bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 - bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 - bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A - bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 - -SootopolisCity_MapEvents:: - map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents - diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc deleted file mode 100644 index 0d12af500..000000000 --- a/data/maps/SootopolisCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity: - .4byte SootopolisCity_Layout - .4byte SootopolisCity_MapEvents - .4byte SootopolisCity_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_CITY - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json new file mode 100644 index 000000000..88ca51ff7 --- /dev/null +++ b/data/maps/SootopolisCity/map.json @@ -0,0 +1,396 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY", + "name": "SootopolisCity", + "layout": "LAYOUT_SOOTOPOLIS_CITY", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_CITY", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5E8D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 47, + "y": 33, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5FE2", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 9, + "y": 43, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E5ED8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NINJA_BOY", + "x": 51, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E608E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 43, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E60E3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 26, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6017", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1" + }, + { + "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "x": 20, + "y": 36, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6166", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 49, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6038", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_3", + "x": 28, + "y": 44, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_GROUDON" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KYOGRE_3", + "x": 34, + "y": 44, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_KYOGRE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA_2", + "x": 31, + "y": 41, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 17, + "y": 44, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6411", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 14, + "y": 42, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E63DB", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 17, + "y": 40, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6393", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 19, + "y": 37, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E635D", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAXIE", + "x": 29, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E64F2", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ARCHIE", + "x": 31, + "y": 33, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E651F", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "x": 31, + "y": 18, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_EventScript_1E6446", + "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE" + } + ], + "warp_events": [ + { + "x": 43, + "y": 31, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 29, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MART", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 32, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "dest_warp_id": 0 + }, + { + "x": 31, + "y": 16, + "elevation": 3, + "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE1", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE2", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE3", + "dest_warp_id": 0 + }, + { + "x": 44, + "y": 17, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE4", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 26, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE5", + "dest_warp_id": 0 + }, + { + "x": 53, + "y": 28, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE6", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 35, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_HOUSE7", + "dest_warp_id": 0 + }, + { + "x": 48, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 51, + "y": 36, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 33, + "y": 34, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_EventScript_1E614B" + }, + { + "type": "sign", + "x": 19, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 44, + "y": 31, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 45, + "y": 31, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E73" + }, + { + "type": "sign", + "x": 18, + "y": 29, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_EventScript_271E6A" + }, + { + "type": "sign", + "x": 41, + "y": 37, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_EventScript_1E6154" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index a116aeb56..5e212ddfe 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800 return SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex 357 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200 return SootopolisCity_EventScript_1E5805:: @ 81E5805 diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc deleted file mode 100644 index 288d78343..000000000 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -SootopolisCity_Gym_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 - -SootopolisCity_Gym_1F_MapWarps: - warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY - warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY - warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F - -SootopolisCity_Gym_1F_MapBGEvents: - bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F - bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F - -SootopolisCity_Gym_1F_MapEvents:: - map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents - diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc deleted file mode 100644 index 72e6fd2c8..000000000 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F: - .4byte SootopolisCity_Gym_1F_Layout - .4byte SootopolisCity_Gym_1F_MapEvents - .4byte SootopolisCity_Gym_1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json new file mode 100644 index 000000000..6c1e4374d --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "name": "SootopolisCity_Gym_1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_JUAN", + "x": 8, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Gym_1F_EventScript_224F44", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 7, + "y": 24, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Gym_1F_EventScript_225040", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 8, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 25, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 2 + }, + { + "x": 11, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 6, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_Gym_1F_EventScript_22505F" + }, + { + "type": "sign", + "x": 10, + "y": 24, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SootopolisCity_Gym_1F_EventScript_22506F" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc deleted file mode 100644 index 2ef2609e7..000000000 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -SootopolisCity_Gym_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 11, 9, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0 - object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 - object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 - -SootopolisCity_Gym_B1F_MapWarps: - warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F - -SootopolisCity_Gym_B1F_MapEvents:: - map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc deleted file mode 100644 index afa12fa9f..000000000 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F: - .4byte SootopolisCity_Gym_B1F_Layout - .4byte SootopolisCity_Gym_B1F_MapEvents - .4byte SootopolisCity_Gym_B1F_MapScripts - .4byte 0x0 - .2byte MUS_GIM - .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_B1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_GYM - diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json new file mode 100644 index 000000000..663d7db84 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -0,0 +1,159 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_GYM_B1F", + "name": "SootopolisCity_Gym_B1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_GYM_B1F", + "music": "MUS_GIM", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_GYM", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 7, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225C8B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 9, + "y": 19, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225CD0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 1, + "script": "SootopolisCity_Gym_B1F_EventScript_225CB9", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 11, + "y": 9, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 5, + "script": "SootopolisCity_Gym_B1F_EventScript_225CE7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 5, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "SootopolisCity_Gym_B1F_EventScript_225D15", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SootopolisCity_Gym_B1F_EventScript_225D2C", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 4, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "SootopolisCity_Gym_B1F_EventScript_225CA2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225CFE", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 6, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225D5A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 10, + "y": 13, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "SootopolisCity_Gym_B1F_EventScript_225D43", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 11, + "y": 22, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_GYM_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc deleted file mode 100644 index 64012784a..000000000 --- a/data/maps/SootopolisCity_House1/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House1_EventObjects: - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 - -SootopolisCity_House1_MapWarps: - warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House1_MapEvents:: - map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc deleted file mode 100644 index af4cf939c..000000000 --- a/data/maps/SootopolisCity_House1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House1: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House1_MapEvents - .4byte SootopolisCity_House1_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json new file mode 100644 index 000000000..b5ecf4e41 --- /dev/null +++ b/data/maps/SootopolisCity_House1/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE1", + "name": "SootopolisCity_House1", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House1_EventScript_22694D", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House1_EventScript_22698E", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 4 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 4 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc deleted file mode 100644 index ea70cecb9..000000000 --- a/data/maps/SootopolisCity_House2/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House2_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 - -SootopolisCity_House2_MapWarps: - warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House2_MapEvents:: - map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc deleted file mode 100644 index 42b7e14aa..000000000 --- a/data/maps/SootopolisCity_House2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House2: - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House2_MapEvents - .4byte SootopolisCity_House2_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json new file mode 100644 index 000000000..ea9d58284 --- /dev/null +++ b/data/maps/SootopolisCity_House2/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE2", + "name": "SootopolisCity_House2", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House2_EventScript_226A77", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc deleted file mode 100644 index d078de8ec..000000000 --- a/data/maps/SootopolisCity_House3/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House3_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 - -SootopolisCity_House3_MapWarps: - warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House3_MapEvents:: - map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc deleted file mode 100644 index 0913505e1..000000000 --- a/data/maps/SootopolisCity_House3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House3: - .4byte SootopolisCity_House3_Layout - .4byte SootopolisCity_House3_MapEvents - .4byte SootopolisCity_House3_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json new file mode 100644 index 000000000..765803e8a --- /dev/null +++ b/data/maps/SootopolisCity_House3/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE3", + "name": "SootopolisCity_House3", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House3_EventScript_226B72", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House3_EventScript_226B9B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc deleted file mode 100644 index ce669cd75..000000000 --- a/data/maps/SootopolisCity_House4/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_House4_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 - -SootopolisCity_House4_MapWarps: - warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House4_MapEvents:: - map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc deleted file mode 100644 index 1266c68fe..000000000 --- a/data/maps/SootopolisCity_House4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House4: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House4_MapEvents - .4byte SootopolisCity_House4_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json new file mode 100644 index 000000000..492aac134 --- /dev/null +++ b/data/maps/SootopolisCity_House4/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE4", + "name": "SootopolisCity_House4", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D16", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "x": 5, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 2, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D1F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House4_EventScript_226D28", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 7 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 7 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc deleted file mode 100644 index fa6d0452d..000000000 --- a/data/maps/SootopolisCity_House5/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House5_EventObjects: - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 - -SootopolisCity_House5_MapWarps: - warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House5_MapEvents:: - map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc deleted file mode 100644 index 0b1b3664c..000000000 --- a/data/maps/SootopolisCity_House5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House5: - .4byte SootopolisCity_House2_Layout - .4byte SootopolisCity_House5_MapEvents - .4byte SootopolisCity_House5_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json new file mode 100644 index 000000000..24cdafe8b --- /dev/null +++ b/data/maps/SootopolisCity_House5/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE5", + "name": "SootopolisCity_House5", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "x": 3, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House5_EventScript_226E94", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 6, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House5_EventScript_226E9D", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 8 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 8 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc deleted file mode 100644 index c89c13538..000000000 --- a/data/maps/SootopolisCity_House6/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House6_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 - -SootopolisCity_House6_MapWarps: - warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House6_MapEvents:: - map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc deleted file mode 100644 index 3268fbf09..000000000 --- a/data/maps/SootopolisCity_House6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House6: - .4byte SootopolisCity_House3_Layout - .4byte SootopolisCity_House6_MapEvents - .4byte SootopolisCity_House6_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json new file mode 100644 index 000000000..d787c3e67 --- /dev/null +++ b/data/maps/SootopolisCity_House6/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE6", + "name": "SootopolisCity_House6", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 4, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House6_EventScript_226F5C", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 9 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 9 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc deleted file mode 100644 index e978cb8d4..000000000 --- a/data/maps/SootopolisCity_House7/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House7_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 - object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 - -SootopolisCity_House7_MapWarps: - warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House7_MapEvents:: - map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc deleted file mode 100644 index 0398f1cf7..000000000 --- a/data/maps/SootopolisCity_House7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_House7: - .4byte SootopolisCity_House1_Layout - .4byte SootopolisCity_House7_MapEvents - .4byte SootopolisCity_House7_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json new file mode 100644 index 000000000..de0464682 --- /dev/null +++ b/data/maps/SootopolisCity_House7/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_HOUSE7", + "name": "SootopolisCity_House7", + "layout": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 5, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House7_EventScript_2270CC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_House7_EventScript_2270D5", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 10 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 10 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc deleted file mode 100644 index da5b123fe..000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 - -SootopolisCity_LotadAndSeedotHouse_MapWarps: - warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY - -SootopolisCity_LotadAndSeedotHouse_MapBGEvents: - bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D - bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B - -SootopolisCity_LotadAndSeedotHouse_MapEvents:: - map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents - diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc deleted file mode 100644 index 35da7aa8b..000000000 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_LotadAndSeedotHouse: - .4byte SootopolisCity_LotadAndSeedotHouse_Layout - .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents - .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json new file mode 100644 index 000000000..5f8acc9bb --- /dev/null +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json @@ -0,0 +1,79 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "name": "SootopolisCity_LotadAndSeedotHouse", + "layout": "LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_HIKER", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 11 + }, + { + "x": 4, + "y": 6, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 11 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 5, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22734D" + }, + { + "type": "sign", + "x": 2, + "y": 1, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22735B" + } + ] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc deleted file mode 100644 index 0fb940fd9..000000000 --- a/data/maps/SootopolisCity_Mart/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 - -SootopolisCity_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY - -SootopolisCity_Mart_MapEvents:: - map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc deleted file mode 100644 index 5b5ad1a01..000000000 --- a/data/maps/SootopolisCity_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Mart: - .4byte Mart_Layout - .4byte SootopolisCity_Mart_MapEvents - .4byte SootopolisCity_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json new file mode 100644 index 000000000..bb031b2af --- /dev/null +++ b/data/maps/SootopolisCity_Mart/map.json @@ -0,0 +1,75 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MART", + "name": "SootopolisCity_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_226795", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_2267C2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 9, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_Mart_EventScript_2267EC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc deleted file mode 100644 index 560e693cf..000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 - -SootopolisCity_MysteryEventsHouse_1F_MapWarps: - warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY - warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F - -SootopolisCity_MysteryEventsHouse_1F_MapEvents:: - map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc deleted file mode 100644 index bf7d81321..000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_1F: - .4byte SootopolisCity_MysteryEventsHouse_1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents - .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json new file mode 100644 index 000000000..b57eae35c --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "name": "SootopolisCity_MysteryEventsHouse_1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_OLD_MAN", + "x": 6, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 12 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 12 + }, + { + "x": 3, + "y": 1, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 0493cb05f..252bd1201 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN - setmaplayoutindex 441 + setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc deleted file mode 100644 index 816cbaecc..000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 - -SootopolisCity_MysteryEventsHouse_B1F_MapWarps: - warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F - -SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: - map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc deleted file mode 100644 index ee7def94c..000000000 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_MysteryEventsHouse_B1F: - .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents - .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts - .4byte 0x0 - .2byte MUS_RUNECITY - .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json new file mode 100644 index 000000000..fcc77a331 --- /dev/null +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/map.json @@ -0,0 +1,42 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "name": "SootopolisCity_MysteryEventsHouse_B1F", + "layout": "LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F", + "music": "MUS_RUNECITY", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 6, + "y": 5, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 1, + "elevation": 0, + "dest_map": "MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F", + "dest_warp_id": 2 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc deleted file mode 100644 index 743ba0ccb..000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 - -SootopolisCity_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY - warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY - warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F - -SootopolisCity_PokemonCenter_1F_MapEvents:: - map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc deleted file mode 100644 index 972cf28e4..000000000 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte SootopolisCity_PokemonCenter_1F_MapEvents - .4byte SootopolisCity_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json new file mode 100644 index 000000000..bce2e52bd --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "name": "SootopolisCity_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_226500", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_22650E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_226538", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "x": 2, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc deleted file mode 100644 index e8fb6e09f..000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -SootopolisCity_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -SootopolisCity_PokemonCenter_2F_MapEvents:: - map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc deleted file mode 100644 index 03ab97ea5..000000000 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte SootopolisCity_PokemonCenter_2F_MapEvents - .4byte SootopolisCity_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_SOOTOPOLIS_CITY - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json new file mode 100644 index 000000000..32e27dbdf --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F", + "name": "SootopolisCity_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_SOOTOPOLIS_CITY", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SootopolisCity_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc deleted file mode 100644 index eeb21d3af..000000000 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Exterior_EventObjects: - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 - -SouthernIsland_Exterior_MapWarps: - warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR - warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR - -SouthernIsland_Exterior_MapBGEvents: - bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C - -SouthernIsland_Exterior_MapEvents:: - map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents - diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc deleted file mode 100644 index 1288fbdf5..000000000 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Exterior: - .4byte SouthernIsland_Exterior_Layout - .4byte SouthernIsland_Exterior_MapEvents - .4byte SouthernIsland_Exterior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_SOUTHERN_ISLAND_EXTERIOR - .byte MAPSEC_SOUTHERN_ISLAND - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json new file mode 100644 index 000000000..a747a48b8 --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -0,0 +1,71 @@ +{ + "id": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "name": "SouthernIsland_Exterior", + "layout": "LAYOUT_SOUTHERN_ISLAND_EXTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_SOUTHERN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "x": 13, + "y": 23, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "SouthernIsland_Exterior_EventScript_2429D2", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "x": 13, + "y": 25, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 14, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR", + "dest_warp_id": 0 + }, + { + "x": 15, + "y": 5, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_INTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 16, + "y": 7, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "SouthernIsland_Exterior_EventScript_242A3C" + } + ] +} \ No newline at end of file diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc deleted file mode 100644 index 190762f5b..000000000 --- a/data/maps/SouthernIsland_Interior/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -SouthernIsland_Interior_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON - -SouthernIsland_Interior_MapWarps: - warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR - warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR - -SouthernIsland_Interior_MapBGEvents: - bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 - -SouthernIsland_Interior_MapEvents:: - map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents - diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc deleted file mode 100644 index 95eb61d7c..000000000 --- a/data/maps/SouthernIsland_Interior/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -SouthernIsland_Interior: - .4byte SouthernIsland_Interior_Layout - .4byte SouthernIsland_Interior_MapEvents - .4byte SouthernIsland_Interior_MapScripts - .4byte 0x0 - .2byte MUS_DAN02 - .2byte LAYOUT_SOUTHERN_ISLAND_INTERIOR - .byte MAPSEC_SOUTHERN_ISLAND - .byte 0 - .byte WEATHER_SHADE - .byte MAP_TYPE_ROUTE - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json new file mode 100644 index 000000000..6d099763a --- /dev/null +++ b/data/maps/SouthernIsland_Interior/map.json @@ -0,0 +1,71 @@ +{ + "id": "MAP_SOUTHERN_ISLAND_INTERIOR", + "name": "SouthernIsland_Interior", + "layout": "LAYOUT_SOUTHERN_ISLAND_INTERIOR", + "music": "MUS_DAN02", + "region_map_section": "MAPSEC_SOUTHERN_ISLAND", + "requires_flash": false, + "weather": "WEATHER_SHADE", + "map_type": "MAP_TYPE_ROUTE", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 13, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 13, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON" + } + ], + "warp_events": [ + { + "x": 13, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "dest_warp_id": 0 + }, + { + "x": 14, + "y": 18, + "elevation": 3, + "dest_map": "MAP_SOUTHERN_ISLAND_EXTERIOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 13, + "y": 11, + "elevation": 3, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "SouthernIsland_Interior_EventScript_242AC4" + } + ] +} \ No newline at end of file diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc deleted file mode 100644 index f20abd8fd..000000000 --- a/data/maps/TerraCave_End/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -TerraCave_End_EventObjects: - object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON - -TerraCave_End_MapWarps: - warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE - -TerraCave_End_MapCoordEvents: - coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC - -TerraCave_End_MapEvents:: - map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 - diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc deleted file mode 100644 index f95ac38b8..000000000 --- a/data/maps/TerraCave_End/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_End: - .4byte TerraCave_End_Layout - .4byte TerraCave_End_MapEvents - .4byte TerraCave_End_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_TERRA_CAVE_END - .byte MAPSEC_TERRA_CAVE - .byte 0 - .byte WEATHER_FOG_1 - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TerraCave_End/map.json b/data/maps/TerraCave_End/map.json new file mode 100644 index 000000000..9b5ab9f32 --- /dev/null +++ b/data/maps/TerraCave_End/map.json @@ -0,0 +1,52 @@ +{ + "id": "MAP_TERRA_CAVE_END", + "name": "TerraCave_End", + "layout": "LAYOUT_TERRA_CAVE_END", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_FOG_1", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": false, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GROUDON_1", + "x": 17, + "y": 22, + "elevation": 1, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "FLAG_HIDE_TERRA_CAVE_GROUDON" + } + ], + "warp_events": [ + { + "x": 5, + "y": 4, + "elevation": 3, + "dest_map": "MAP_TERRA_CAVE_ENTRANCE", + "dest_warp_id": 1 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 17, + "y": 26, + "elevation": 3, + "var": "VAR_TEMP_1", + "var_value": 1, + "script": "TerraCave_End_EventScript_23B0EC" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc deleted file mode 100644 index bfa4092fd..000000000 --- a/data/maps/TerraCave_Entrance/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TerraCave_Entrance_MapWarps: - warp_def 8, 18, 0, 127, MAP_NONE - warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END - -TerraCave_Entrance_MapEvents:: - map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc deleted file mode 100644 index 5ede2a448..000000000 --- a/data/maps/TerraCave_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TerraCave_Entrance: - .4byte TerraCave_Entrance_Layout - .4byte TerraCave_Entrance_MapEvents - .4byte TerraCave_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_TERRA_CAVE_ENTRANCE - .byte MAPSEC_TERRA_CAVE - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TerraCave_Entrance/map.json b/data/maps/TerraCave_Entrance/map.json new file mode 100644 index 000000000..8ca5c69df --- /dev/null +++ b/data/maps/TerraCave_Entrance/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TERRA_CAVE_ENTRANCE", + "name": "TerraCave_Entrance", + "layout": "LAYOUT_TERRA_CAVE_ENTRANCE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 18, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 14, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TERRA_CAVE_END", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc deleted file mode 100644 index 79faca7e6..000000000 --- a/data/maps/TradeCenter/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -TradeCenter_EventObjects: - object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 - -TradeCenter_MapWarps: - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - -TradeCenter_MapCoordEvents: - coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 - coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF - -TradeCenter_MapEvents:: - map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 - diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc deleted file mode 100644 index 80a11cd52..000000000 --- a/data/maps/TradeCenter/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TradeCenter: - .4byte TradeCenter_Layout - .4byte TradeCenter_MapEvents - .4byte TradeCenter_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_TRADE_CENTER - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json new file mode 100644 index 000000000..f7511a753 --- /dev/null +++ b/data/maps/TradeCenter/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_TRADE_CENTER", + "name": "TradeCenter", + "layout": "LAYOUT_TRADE_CENTER", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TradeCenter_EventScript_2774B6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 4, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773F5" + }, + { + "type": "trigger", + "x": 7, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": 0, + "script": "gUnknown_082773FF" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc deleted file mode 100644 index 21e62b951..000000000 --- a/data/maps/TrainerHill_1F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_1F_MapWarps: - warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F - -TrainerHill_1F_MapEvents:: - map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc deleted file mode 100644 index a3654edf2..000000000 --- a/data/maps/TrainerHill_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_1F: - .4byte TrainerHill_1F_Layout - .4byte TrainerHill_1F_MapEvents - .4byte TrainerHill_1F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_1F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_1F/map.json b/data/maps/TrainerHill_1F/map.json new file mode 100644 index 000000000..77c8ee094 --- /dev/null +++ b/data/maps/TrainerHill_1F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_1F", + "name": "TrainerHill_1F", + "layout": "LAYOUT_TRAINER_HILL_1F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ENTRANCE", + "dest_warp_id": 2 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc deleted file mode 100644 index 4752e33cd..000000000 --- a/data/maps/TrainerHill_2F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_2F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F - -TrainerHill_2F_MapEvents:: - map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc deleted file mode 100644 index 2f607baff..000000000 --- a/data/maps/TrainerHill_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_2F: - .4byte TrainerHill_2F_Layout - .4byte TrainerHill_2F_MapEvents - .4byte TrainerHill_2F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_2F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_2F/map.json b/data/maps/TrainerHill_2F/map.json new file mode 100644 index 000000000..a10f68baf --- /dev/null +++ b/data/maps/TrainerHill_2F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_2F", + "name": "TrainerHill_2F", + "layout": "LAYOUT_TRAINER_HILL_2F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_1F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_3F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc deleted file mode 100644 index 5de009a47..000000000 --- a/data/maps/TrainerHill_3F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_3F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F - -TrainerHill_3F_MapEvents:: - map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc deleted file mode 100644 index 4dd8e394f..000000000 --- a/data/maps/TrainerHill_3F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_3F: - .4byte TrainerHill_3F_Layout - .4byte TrainerHill_3F_MapEvents - .4byte TrainerHill_3F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_3F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_3F/map.json b/data/maps/TrainerHill_3F/map.json new file mode 100644 index 000000000..dfaa57f59 --- /dev/null +++ b/data/maps/TrainerHill_3F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_3F", + "name": "TrainerHill_3F", + "layout": "LAYOUT_TRAINER_HILL_3F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_2F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_4F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc deleted file mode 100644 index 05f6e8917..000000000 --- a/data/maps/TrainerHill_4F/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -TrainerHill_4F_MapWarps: - warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F - warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF - -TrainerHill_4F_MapEvents:: - map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc deleted file mode 100644 index 4f370c5d9..000000000 --- a/data/maps/TrainerHill_4F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_4F: - .4byte TrainerHill_4F_Layout - .4byte TrainerHill_4F_MapEvents - .4byte TrainerHill_4F_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_4F - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_4F/map.json b/data/maps/TrainerHill_4F/map.json new file mode 100644 index 000000000..01f20a8f7 --- /dev/null +++ b/data/maps/TrainerHill_4F/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_TRAINER_HILL_4F", + "name": "TrainerHill_4F", + "layout": "LAYOUT_TRAINER_HILL_4F", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 2, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_3F", + "dest_warp_id": 1 + }, + { + "x": 12, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc deleted file mode 100644 index c0336a267..000000000 --- a/data/maps/TrainerHill_Elevator/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -TrainerHill_Elevator_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 - -TrainerHill_Elevator_MapWarps: - warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF - warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF - -TrainerHill_Elevator_MapEvents:: - map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc deleted file mode 100644 index 5eeaa994b..000000000 --- a/data/maps/TrainerHill_Elevator/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Elevator: - .4byte BattleElevator_Layout - .4byte TrainerHill_Elevator_MapEvents - .4byte TrainerHill_Elevator_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_ELEVATOR - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json new file mode 100644 index 000000000..731bcf44a --- /dev/null +++ b/data/maps/TrainerHill_Elevator/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_TRAINER_HILL_ELEVATOR", + "name": "TrainerHill_Elevator", + "layout": "LAYOUT_BATTLE_ELEVATOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 0, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Elevator_EventScript_26935F", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 1 + }, + { + "x": 2, + "y": 6, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_ROOF", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc deleted file mode 100644 index ddc3f3f09..000000000 --- a/data/maps/TrainerHill_Entrance/events.inc +++ /dev/null @@ -1,21 +0,0 @@ -TrainerHill_Entrance_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 - object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 - -TrainerHill_Entrance_MapWarps: - warp_def 9, 16, 3, 4, MAP_ROUTE111 - warp_def 10, 16, 3, 4, MAP_ROUTE111 - warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F - -TrainerHill_Entrance_MapCoordEvents: - coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 - -TrainerHill_Entrance_MapBGEvents: - bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 - -TrainerHill_Entrance_MapEvents:: - map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents - diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc deleted file mode 100644 index 26e215a6e..000000000 --- a/data/maps/TrainerHill_Entrance/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Entrance: - .4byte TrainerHill_Entrance_Layout - .4byte TrainerHill_Entrance_MapEvents - .4byte TrainerHill_Entrance_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_ENTRANCE - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json new file mode 100644 index 000000000..32f6cee37 --- /dev/null +++ b/data/maps/TrainerHill_Entrance/map.json @@ -0,0 +1,127 @@ +{ + "id": "MAP_TRAINER_HILL_ENTRANCE", + "name": "TrainerHill_Entrance", + "layout": "LAYOUT_TRAINER_HILL_ENTRANCE", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 11, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2681FD", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 4, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2681EF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 14, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2683C7", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "x": 5, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_2683AC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 15, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Entrance_EventScript_268391", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 4 + }, + { + "x": 10, + "y": 16, + "elevation": 3, + "dest_map": "MAP_ROUTE111", + "dest_warp_id": 4 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_1F", + "dest_warp_id": 0 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 9, + "y": 6, + "elevation": 3, + "var": "VAR_0x40D6", + "var_value": 0, + "script": "TrainerHill_Entrance_EventScript_268229" + } + ], + "bg_events": [ + { + "type": "sign", + "x": 8, + "y": 10, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "TrainerHill_Entrance_EventScript_268388" + } + ] +} \ No newline at end of file diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc deleted file mode 100644 index 0a3b361c4..000000000 --- a/data/maps/TrainerHill_Roof/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -TrainerHill_Roof_EventObjects: - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 - -TrainerHill_Roof_MapWarps: - warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F - warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR - -TrainerHill_Roof_MapEvents:: - map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 - diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc deleted file mode 100644 index c27cb3b5a..000000000 --- a/data/maps/TrainerHill_Roof/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -TrainerHill_Roof: - .4byte TrainerHill_Roof_Layout - .4byte TrainerHill_Roof_MapEvents - .4byte TrainerHill_Roof_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_TRAINER_HILL_ROOF - .byte MAPSEC_TRAINER_HILL - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json new file mode 100644 index 000000000..d54779a8e --- /dev/null +++ b/data/maps/TrainerHill_Roof/map.json @@ -0,0 +1,49 @@ +{ + "id": "MAP_TRAINER_HILL_ROOF", + "name": "TrainerHill_Roof", + "layout": "LAYOUT_TRAINER_HILL_ROOF", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_TRAINER_HILL", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 12, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "TrainerHill_Roof_EventScript_268FB2", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 9, + "y": 5, + "elevation": 3, + "dest_map": "MAP_TRAINER_HILL_4F", + "dest_warp_id": 1 + }, + { + "x": 15, + "y": 5, + "elevation": 0, + "dest_map": "MAP_TRAINER_HILL_ELEVATOR", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc deleted file mode 100644 index 01c45b11b..000000000 --- a/data/maps/Underwater1/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater1_MapConnectionsList: - connection down, 0, MAP_UNDERWATER2 - connection emerge, 0, MAP_ROUTE124 - -Underwater1_MapConnections: - .4byte 2 - .4byte Underwater1_MapConnectionsList - diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc deleted file mode 100644 index ef329306f..000000000 --- a/data/maps/Underwater1/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Underwater1_MapBGEvents: - bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS - bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD - bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL - bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL - bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 - bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM - bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 - -Underwater1_MapEvents:: - map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents - diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc deleted file mode 100644 index 06ab5f383..000000000 --- a/data/maps/Underwater1/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater1: - .4byte Underwater1_Layout - .4byte Underwater1_MapEvents - .4byte Underwater1_MapScripts - .4byte Underwater1_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER1 - .byte MAPSEC_UNDERWATER_124 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json new file mode 100644 index 000000000..7fd45b45f --- /dev/null +++ b/data/maps/Underwater1/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_UNDERWATER1", + "name": "Underwater1", + "layout": "LAYOUT_UNDERWATER1", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_124", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER2" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE124" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 42, + "y": 51, + "elevation": 0, + "item": "ITEM_CARBOS", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS" + }, + { + "type": "hidden_item", + "x": 14, + "y": 40, + "elevation": 0, + "item": "ITEM_GREEN_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD" + }, + { + "type": "hidden_item", + "x": 66, + "y": 34, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL" + }, + { + "type": "hidden_item", + "x": 64, + "y": 54, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 70, + "y": 64, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1" + }, + { + "type": "hidden_item", + "x": 42, + "y": 5, + "elevation": 3, + "item": "ITEM_CALCIUM", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM" + }, + { + "type": "hidden_item", + "x": 45, + "y": 36, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc deleted file mode 100644 index 74f11e5af..000000000 --- a/data/maps/Underwater2/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater2_MapConnectionsList: - connection up, 0, MAP_UNDERWATER1 - connection right, 0, MAP_UNDERWATER3 - connection emerge, 0, MAP_ROUTE126 - -Underwater2_MapConnections: - .4byte 3 - .4byte Underwater2_MapConnectionsList - diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc deleted file mode 100644 index b4127fc15..000000000 --- a/data/maps/Underwater2/events.inc +++ /dev/null @@ -1,16 +0,0 @@ -Underwater2_MapWarps: - warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY - -Underwater2_MapBGEvents: - bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE - bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL - bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST - bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL - bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON - bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD - bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL - bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD - -Underwater2_MapEvents:: - map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents - diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc deleted file mode 100644 index d1b11aa62..000000000 --- a/data/maps/Underwater2/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2: - .4byte Underwater2_Layout - .4byte Underwater2_MapEvents - .4byte Underwater2_MapScripts - .4byte Underwater2_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER2 - .byte MAPSEC_UNDERWATER_125 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json new file mode 100644 index 000000000..7977faa4f --- /dev/null +++ b/data/maps/Underwater2/map.json @@ -0,0 +1,109 @@ +{ + "id": "MAP_UNDERWATER2", + "name": "Underwater2", + "layout": "LAYOUT_UNDERWATER2", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_125", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER1" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_UNDERWATER3" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE126" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 45, + "y": 65, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 17, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 41, + "y": 19, + "elevation": 3, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL" + }, + { + "type": "hidden_item", + "x": 63, + "y": 19, + "elevation": 3, + "item": "ITEM_STARDUST", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST" + }, + { + "type": "hidden_item", + "x": 10, + "y": 36, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL" + }, + { + "type": "hidden_item", + "x": 11, + "y": 39, + "elevation": 3, + "item": "ITEM_IRON", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON" + }, + { + "type": "hidden_item", + "x": 12, + "y": 35, + "elevation": 3, + "item": "ITEM_YELLOW_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD" + }, + { + "type": "hidden_item", + "x": 65, + "y": 60, + "elevation": 3, + "item": "ITEM_BIG_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL" + }, + { + "type": "hidden_item", + "x": 9, + "y": 77, + "elevation": 3, + "item": "ITEM_BLUE_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc deleted file mode 100644 index e0e6226de..000000000 --- a/data/maps/Underwater3/connections.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater3_MapConnectionsList: - connection emerge, 0, MAP_ROUTE127 - connection left, 0, MAP_UNDERWATER2 - connection down, 0, MAP_UNDERWATER4 - -Underwater3_MapConnections: - .4byte 3 - .4byte Underwater3_MapConnectionsList - diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc deleted file mode 100644 index 92964db38..000000000 --- a/data/maps/Underwater3/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -Underwater3_MapWarps: - warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater3_MapBGEvents: - bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE - bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP - bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE - bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD - -Underwater3_MapEvents:: - map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents - diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc deleted file mode 100644 index 1722cfdd8..000000000 --- a/data/maps/Underwater3/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater3: - .4byte Underwater3_Layout - .4byte Underwater3_MapEvents - .4byte Underwater3_MapScripts - .4byte Underwater3_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER3 - .byte MAPSEC_UNDERWATER_126 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json new file mode 100644 index 000000000..ea87b5235 --- /dev/null +++ b/data/maps/Underwater3/map.json @@ -0,0 +1,84 @@ +{ + "id": "MAP_UNDERWATER3", + "name": "Underwater3", + "layout": "LAYOUT_UNDERWATER3", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_126", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE127" + }, + { + "direction": "left", + "offset": 0, + "map": "MAP_UNDERWATER2" + }, + { + "direction": "down", + "offset": 0, + "map": "MAP_UNDERWATER4" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 57, + "y": 5, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 67, + "y": 38, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 12, + "y": 42, + "elevation": 3, + "item": "ITEM_STAR_PIECE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE" + }, + { + "type": "hidden_item", + "x": 50, + "y": 36, + "elevation": 3, + "item": "ITEM_HP_UP", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP" + }, + { + "type": "hidden_item", + "x": 34, + "y": 72, + "elevation": 3, + "item": "ITEM_HEART_SCALE", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE" + }, + { + "type": "hidden_item", + "x": 72, + "y": 20, + "elevation": 3, + "item": "ITEM_RED_SHARD", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc deleted file mode 100644 index c1701e1dd..000000000 --- a/data/maps/Underwater4/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater4_MapConnectionsList: - connection up, 0, MAP_UNDERWATER3 - connection emerge, 0, MAP_ROUTE128 - -Underwater4_MapConnections: - .4byte 2 - .4byte Underwater4_MapConnectionsList - diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc deleted file mode 100644 index 4bdc98caf..000000000 --- a/data/maps/Underwater4/events.inc +++ /dev/null @@ -1,10 +0,0 @@ -Underwater4_MapWarps: - warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN - -Underwater4_MapBGEvents: - bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN - bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL - -Underwater4_MapEvents:: - map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents - diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc deleted file mode 100644 index 2b9975a90..000000000 --- a/data/maps/Underwater4/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater4: - .4byte Underwater4_Layout - .4byte Underwater4_MapEvents - .4byte Underwater4_MapScripts - .4byte Underwater4_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER4 - .byte MAPSEC_UNDERWATER_127 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json new file mode 100644 index 000000000..9226717c3 --- /dev/null +++ b/data/maps/Underwater4/map.json @@ -0,0 +1,56 @@ +{ + "id": "MAP_UNDERWATER4", + "name": "Underwater4", + "layout": "LAYOUT_UNDERWATER4", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_127", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": 0, + "map": "MAP_UNDERWATER3" + }, + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE128" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 38, + "y": 26, + "elevation": 3, + "dest_map": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 38, + "y": 19, + "elevation": 3, + "item": "ITEM_PROTEIN", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN" + }, + { + "type": "hidden_item", + "x": 69, + "y": 18, + "elevation": 3, + "item": "ITEM_PEARL", + "flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc deleted file mode 100644 index c082452d3..000000000 --- a/data/maps/Underwater5/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapConnectionsList: - connection emerge, 0, MAP_ROUTE129 - -Underwater5_MapConnections: - .4byte 1 - .4byte Underwater5_MapConnectionsList - diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc deleted file mode 100644 index 5b5c58cf4..000000000 --- a/data/maps/Underwater5/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater5_MapWarps: - warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater5_MapEvents:: - map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc deleted file mode 100644 index 3466acdf6..000000000 --- a/data/maps/Underwater5/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater5: - .4byte Underwater5_Layout - .4byte Underwater5_MapEvents - .4byte Underwater5_MapScripts - .4byte Underwater5_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER5 - .byte MAPSEC_UNDERWATER_129 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater5/map.json new file mode 100644 index 000000000..abd13a187 --- /dev/null +++ b/data/maps/Underwater5/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER5", + "name": "Underwater5", + "layout": "LAYOUT_UNDERWATER5", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_129", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE129" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 26, + "y": 3, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 32, + "y": 21, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc deleted file mode 100644 index 8e051ea55..000000000 --- a/data/maps/Underwater6/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapConnectionsList: - connection emerge, 0, MAP_ROUTE105 - -Underwater6_MapConnections: - .4byte 1 - .4byte Underwater6_MapConnectionsList - diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc deleted file mode 100644 index 067bc5561..000000000 --- a/data/maps/Underwater6/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater6_MapWarps: - warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater6_MapEvents:: - map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc deleted file mode 100644 index 5683868e2..000000000 --- a/data/maps/Underwater6/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater6: - .4byte Underwater6_Layout - .4byte Underwater6_MapEvents - .4byte Underwater6_MapScripts - .4byte Underwater6_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER6 - .byte MAPSEC_UNDERWATER_TERRA_CAVE - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater6/map.json new file mode 100644 index 000000000..9b19a1fe7 --- /dev/null +++ b/data/maps/Underwater6/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER6", + "name": "Underwater6", + "layout": "LAYOUT_UNDERWATER6", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE105" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 13, + "y": 4, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 66, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc deleted file mode 100644 index 7113f21e9..000000000 --- a/data/maps/Underwater7/connections.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapConnectionsList: - connection emerge, 0, MAP_ROUTE125 - -Underwater7_MapConnections: - .4byte 1 - .4byte Underwater7_MapConnectionsList - diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc deleted file mode 100644 index d4c2a882a..000000000 --- a/data/maps/Underwater7/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater7_MapWarps: - warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE - warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE - -Underwater7_MapEvents:: - map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc deleted file mode 100644 index a1fa2824c..000000000 --- a/data/maps/Underwater7/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater7: - .4byte Underwater7_Layout - .4byte Underwater7_MapEvents - .4byte Underwater7_MapScripts - .4byte Underwater7_MapConnections - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER7 - .byte MAPSEC_UNDERWATER_UNK1 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater7/map.json new file mode 100644 index 000000000..afabfeeec --- /dev/null +++ b/data/maps/Underwater7/map.json @@ -0,0 +1,41 @@ +{ + "id": "MAP_UNDERWATER7", + "name": "Underwater7", + "layout": "LAYOUT_UNDERWATER7", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_UNK1", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "emerge", + "offset": 0, + "map": "MAP_ROUTE125" + } + ], + "object_events": [], + "warp_events": [ + { + "x": 22, + "y": 10, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + }, + { + "x": 45, + "y": 30, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_MARINE_CAVE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc deleted file mode 100644 index b0da76440..000000000 --- a/data/maps/Underwater_MarineCave/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_MarineCave_MapWarps: - warp_def 9, 8, 0, 127, MAP_NONE - -Underwater_MarineCave_MapEvents:: - map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc deleted file mode 100644 index 1cc75bd54..000000000 --- a/data/maps/Underwater_MarineCave/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_MarineCave: - .4byte Underwater_MarineCave_Layout - .4byte Underwater_MarineCave_MapEvents - .4byte Underwater_MarineCave_MapScripts - .4byte 0x0 - .2byte MUS_DAN01 - .2byte LAYOUT_UNDERWATER_MARINE_CAVE - .byte MAPSEC_UNDERWATER_MARINE_CAVE - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_MarineCave/map.json b/data/maps/Underwater_MarineCave/map.json new file mode 100644 index 000000000..c969239c5 --- /dev/null +++ b/data/maps/Underwater_MarineCave/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_UNDERWATER_MARINE_CAVE", + "name": "Underwater_MarineCave", + "layout": "LAYOUT_UNDERWATER_MARINE_CAVE", + "music": "MUS_DAN01", + "region_map_section": "MAPSEC_UNDERWATER_MARINE_CAVE", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc deleted file mode 100644 index a514ccf72..000000000 --- a/data/maps/Underwater_Route134/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_Route134_MapWarps: - warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER - -Underwater_Route134_MapEvents:: - map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc deleted file mode 100644 index 07d1bcd8e..000000000 --- a/data/maps/Underwater_Route134/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_Route134: - .4byte Underwater_Route134_Layout - .4byte Underwater_Route134_MapEvents - .4byte Underwater_Route134_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_ROUTE134 - .byte MAPSEC_UNDERWATER_SEALED_CHAMBER - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json new file mode 100644 index 000000000..f94f110e1 --- /dev/null +++ b/data/maps/Underwater_Route134/map.json @@ -0,0 +1,28 @@ +{ + "id": "MAP_UNDERWATER_ROUTE134", + "name": "Underwater_Route134", + "layout": "LAYOUT_UNDERWATER_ROUTE134", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 8, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_SEALED_CHAMBER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc deleted file mode 100644 index d4c212a19..000000000 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ /dev/null @@ -1,12 +0,0 @@ -Underwater_SeafloorCavern_EventObjects: - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE - -Underwater_SeafloorCavern_MapWarps: - warp_def 6, 7, 0, 0, MAP_UNDERWATER4 - -Underwater_SeafloorCavern_MapEvents:: - map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc deleted file mode 100644 index 0df694b90..000000000 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SeafloorCavern: - .4byte Underwater_SeafloorCavern_Layout - .4byte Underwater_SeafloorCavern_MapEvents - .4byte Underwater_SeafloorCavern_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SEAFLOOR_CAVERN - .byte MAPSEC_UNDERWATER_128 - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json new file mode 100644 index 000000000..5497a7ba3 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -0,0 +1,81 @@ +{ + "id": "MAP_UNDERWATER_SEAFLOOR_CAVERN", + "name": "Underwater_SeafloorCavern", + "layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_128", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 6, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "x": 8, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_INVISIBLE", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "Underwater_SeafloorCavern_EventScript_2343DC", + "flag": "FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE" + } + ], + "warp_events": [ + { + "x": 6, + "y": 7, + "elevation": 0, + "dest_map": "MAP_UNDERWATER4", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc deleted file mode 100644 index e8b93885a..000000000 --- a/data/maps/Underwater_SealedChamber/events.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater_SealedChamber_MapWarps: - warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 - -Underwater_SealedChamber_MapBGEvents: - bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC - -Underwater_SealedChamber_MapEvents:: - map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents - diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc deleted file mode 100644 index f7117f905..000000000 --- a/data/maps/Underwater_SealedChamber/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SealedChamber: - .4byte Underwater_SealedChamber_Layout - .4byte Underwater_SealedChamber_MapEvents - .4byte Underwater_SealedChamber_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SEALED_CHAMBER - .byte MAPSEC_UNDERWATER_SEALED_CHAMBER - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json new file mode 100644 index 000000000..2256ee670 --- /dev/null +++ b/data/maps/Underwater_SealedChamber/map.json @@ -0,0 +1,37 @@ +{ + "id": "MAP_UNDERWATER_SEALED_CHAMBER", + "name": "Underwater_SealedChamber", + "layout": "LAYOUT_UNDERWATER_SEALED_CHAMBER", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SEALED_CHAMBER", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 7, + "y": 1, + "elevation": 0, + "dest_map": "MAP_UNDERWATER_ROUTE134", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 12, + "y": 43, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "Underwater_SealedChamber_EventScript_2390FC" + } + ] +} \ No newline at end of file diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc deleted file mode 100644 index 3829ecb10..000000000 --- a/data/maps/Underwater_SootopolisCity/events.inc +++ /dev/null @@ -1,7 +0,0 @@ -Underwater_SootopolisCity_MapWarps: - warp_def 9, 8, 0, 0, MAP_UNDERWATER2 - warp_def 10, 8, 0, 0, MAP_UNDERWATER2 - -Underwater_SootopolisCity_MapEvents:: - map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 - diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc deleted file mode 100644 index 31caf4011..000000000 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater_SootopolisCity: - .4byte Underwater_SootopolisCity_Layout - .4byte Underwater_SootopolisCity_MapEvents - .4byte Underwater_SootopolisCity_MapScripts - .4byte 0x0 - .2byte MUS_DEEPDEEP - .2byte LAYOUT_UNDERWATER_SOOTOPOLIS_CITY - .byte MAPSEC_UNDERWATER_SOOTOPOLIS - .byte 0 - .byte WEATHER_BUBBLES - .byte MAP_TYPE_UNDERWATER - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json new file mode 100644 index 000000000..a3b0a1290 --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -0,0 +1,35 @@ +{ + "id": "MAP_UNDERWATER_SOOTOPOLIS_CITY", + "name": "Underwater_SootopolisCity", + "layout": "LAYOUT_UNDERWATER_SOOTOPOLIS_CITY", + "music": "MUS_DEEPDEEP", + "region_map_section": "MAPSEC_UNDERWATER_SOOTOPOLIS", + "requires_flash": false, + "weather": "WEATHER_BUBBLES", + "map_type": "MAP_TYPE_UNDERWATER", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 9, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER2", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 8, + "elevation": 0, + "dest_map": "MAP_UNDERWATER2", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc deleted file mode 100644 index c78b86eec..000000000 --- a/data/maps/UnionRoom/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -UnionRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 - object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 - object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 - object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D222, FLAG_HIDE_UNION_ROOM_PLAYER_7 - object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D218, FLAG_HIDE_UNION_ROOM_PLAYER_6 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D20E, FLAG_HIDE_UNION_ROOM_PLAYER_5 - object_event 7, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1FA, FLAG_HIDE_UNION_ROOM_PLAYER_3 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 - object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 - -UnionRoom_MapWarps: - warp_def 7, 11, 3, 127, MAP_NONE - warp_def 8, 11, 3, 127, MAP_NONE - -UnionRoom_MapEvents:: - map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 - diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc deleted file mode 100644 index cc7e1c3d1..000000000 --- a/data/maps/UnionRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnionRoom: - .4byte UnionRoom_Layout - .4byte UnionRoom_MapEvents - .4byte UnionRoom_MapScripts - .4byte 0x0 - .2byte MUS_RAINBOW - .2byte LAYOUT_UNION_ROOM - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_FRONTIER - diff --git a/data/maps/UnionRoom/map.json b/data/maps/UnionRoom/map.json new file mode 100644 index 000000000..175ec3ad7 --- /dev/null +++ b/data/maps/UnionRoom/map.json @@ -0,0 +1,153 @@ +{ + "id": "MAP_UNION_ROOM", + "name": "UnionRoom", + "layout": "LAYOUT_UNION_ROOM", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_UNION_ROOM_NURSE", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D236", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D204", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_4" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "x": 7, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D22C", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_8" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "x": 1, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D222", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_7" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "x": 7, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D218", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_6" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "x": 13, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D20E", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_5" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1FA", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_3" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1F0", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_2" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 4, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "UnionRoom_EventScript_23D1E6", + "flag": "FLAG_HIDE_UNION_ROOM_PLAYER_1" + } + ], + "warp_events": [ + { + "x": 7, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 11, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_29/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc deleted file mode 100644 index 0520cd58a..000000000 --- a/data/maps/UnknownMap_25_29/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_29: - .4byte UnknownMap_25_29_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_29 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json new file mode 100644 index 000000000..8f7ac0226 --- /dev/null +++ b/data/maps/UnknownMap_25_29/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_29", + "name": "UnknownMap_25_29", + "layout": "LAYOUT_UNKNOWN_MAP_25_29", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_30/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc deleted file mode 100644 index ed085f46e..000000000 --- a/data/maps/UnknownMap_25_30/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_30: - .4byte UnknownMap_25_30_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_30 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json new file mode 100644 index 000000000..5f321e6b5 --- /dev/null +++ b/data/maps/UnknownMap_25_30/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_30", + "name": "UnknownMap_25_30", + "layout": "LAYOUT_UNKNOWN_MAP_25_30", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_31/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc deleted file mode 100644 index fde407fb8..000000000 --- a/data/maps/UnknownMap_25_31/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_31: - .4byte UnknownMap_25_31_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_31 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json new file mode 100644 index 000000000..f7b06ac42 --- /dev/null +++ b/data/maps/UnknownMap_25_31/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_31", + "name": "UnknownMap_25_31", + "layout": "LAYOUT_UNKNOWN_MAP_25_31", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_32/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc deleted file mode 100644 index 1f0655d54..000000000 --- a/data/maps/UnknownMap_25_32/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_32: - .4byte UnknownMap_25_32_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_32 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json new file mode 100644 index 000000000..c963d0129 --- /dev/null +++ b/data/maps/UnknownMap_25_32/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_32", + "name": "UnknownMap_25_32", + "layout": "LAYOUT_UNKNOWN_MAP_25_32", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_33/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc deleted file mode 100644 index 71f5d3523..000000000 --- a/data/maps/UnknownMap_25_33/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_33: - .4byte UnknownMap_25_33_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_33 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json new file mode 100644 index 000000000..441f767b6 --- /dev/null +++ b/data/maps/UnknownMap_25_33/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_33", + "name": "UnknownMap_25_33", + "layout": "LAYOUT_UNKNOWN_MAP_25_33", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_34/events.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc deleted file mode 100644 index 8fc47f938..000000000 --- a/data/maps/UnknownMap_25_34/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -UnknownMap_25_34: - .4byte UnknownMap_25_34_Layout - .4byte LinkContestRoom1_MapEvents - .4byte LinkContestRoom1_MapScripts - .4byte 0x0 - .2byte MUS_NIBI - .2byte LAYOUT_UNKNOWN_MAP_25_34 - .byte MAPSEC_DYNAMIC - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json new file mode 100644 index 000000000..7bdf1d226 --- /dev/null +++ b/data/maps/UnknownMap_25_34/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_34", + "name": "UnknownMap_25_34", + "layout": "LAYOUT_UNKNOWN_MAP_25_34", + "music": "MUS_NIBI", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc deleted file mode 100644 index 805bab59e..000000000 --- a/data/maps/VerdanturfTown/connections.inc +++ /dev/null @@ -1,8 +0,0 @@ -VerdanturfTown_MapConnectionsList: - connection up, -80, MAP_ROUTE116 - connection right, 0, MAP_ROUTE117 - -VerdanturfTown_MapConnections: - .4byte 2 - .4byte VerdanturfTown_MapConnectionsList - diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc deleted file mode 100644 index d5e99eece..000000000 --- a/data/maps/VerdanturfTown/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -VerdanturfTown_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 - object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 - -VerdanturfTown_MapWarps: - warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY - warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART - warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE - warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL - warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE - warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE - -VerdanturfTown_MapBGEvents: - bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A - bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 - bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 - bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5E2 - bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A - bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 - bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB - bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 - -VerdanturfTown_MapEvents:: - map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents - diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc deleted file mode 100644 index c2e0109f6..000000000 --- a/data/maps/VerdanturfTown/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown: - .4byte VerdanturfTown_Layout - .4byte VerdanturfTown_MapEvents - .4byte VerdanturfTown_MapScripts - .4byte VerdanturfTown_MapConnections - .2byte MUS_GOMACHI0 - .2byte LAYOUT_VERDANTURF_TOWN - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_SUNNY - .byte MAP_TYPE_TOWN - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json new file mode 100644 index 000000000..06e6cc959 --- /dev/null +++ b/data/maps/VerdanturfTown/map.json @@ -0,0 +1,199 @@ +{ + "id": "MAP_VERDANTURF_TOWN", + "name": "VerdanturfTown", + "layout": "LAYOUT_VERDANTURF_TOWN", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_TOWN", + "allow_bike": true, + "allow_escape_rope": false, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": [ + { + "direction": "up", + "offset": -80, + "map": "MAP_ROUTE116" + }, + { + "direction": "right", + "offset": 0, + "map": "MAP_ROUTE117" + } + ], + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "x": 4, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5A8", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TWIN", + "x": 9, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB575", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "x": 7, + "y": 11, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_UP_AND_DOWN", + "movement_range_x": 0, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "x": 7, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_EventScript_1EB5B1", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", + "dest_warp_id": 0 + }, + { + "x": 12, + "y": 3, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_MART", + "dest_warp_id": 0 + }, + { + "x": 16, + "y": 3, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 0 + }, + { + "x": 10, + "y": 14, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 8, + "y": 1, + "elevation": 0, + "dest_map": "MAP_RUSTURF_TUNNEL", + "dest_warp_id": 1 + }, + { + "x": 1, + "y": 14, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 15, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN_HOUSE", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 14, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 14, + "y": 6, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5D9" + }, + { + "type": "sign", + "x": 17, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 7, + "y": 14, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5E2" + }, + { + "type": "sign", + "x": 13, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E6A" + }, + { + "type": "sign", + "x": 18, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", + "script": "VerdanturfTown_EventScript_271E73" + }, + { + "type": "sign", + "x": 1, + "y": 8, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5EB" + }, + { + "type": "sign", + "x": 7, + "y": 3, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_EventScript_1EB5F4" + } + ] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc deleted file mode 100644 index fb424a056..000000000 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ /dev/null @@ -1,8 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom_EventObjects: - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 - -VerdanturfTown_BattleTentBattleRoom_MapEvents:: - map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc deleted file mode 100644 index af844405e..000000000 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentBattleRoom: - .4byte VerdanturfTown_BattleTentBattleRoom_Layout - .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents - .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json new file mode 100644 index 000000000..e08187b61 --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/map.json @@ -0,0 +1,60 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "name": "VerdanturfTown_BattleTentBattleRoom", + "layout": "LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "x": 11, + "y": 1, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 4, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc deleted file mode 100644 index b5a8f71fb..000000000 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ /dev/null @@ -1,6 +0,0 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 - -VerdanturfTown_BattleTentCorridor_MapEvents:: - map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc deleted file mode 100644 index 49e27d7f5..000000000 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentCorridor: - .4byte BattleTentCorridor_Layout - .4byte VerdanturfTown_BattleTentCorridor_MapEvents - .4byte VerdanturfTown_BattleTentCorridor_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_CORRIDOR - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/map.json b/data/maps/VerdanturfTown_BattleTentCorridor/map.json new file mode 100644 index 000000000..2e3b9aed1 --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentCorridor/map.json @@ -0,0 +1,34 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR", + "name": "VerdanturfTown_BattleTentCorridor", + "layout": "LAYOUT_BATTLE_TENT_CORRIDOR", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 2, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "0x0", + "flag": "0" + } + ], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc deleted file mode 100644 index 68ee1322f..000000000 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ /dev/null @@ -1,18 +0,0 @@ -VerdanturfTown_BattleTentLobby_EventObjects: - object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 - object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0 - object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 - -VerdanturfTown_BattleTentLobby_MapWarps: - warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN - warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN - -VerdanturfTown_BattleTentLobby_MapBGEvents: - bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 - -VerdanturfTown_BattleTentLobby_MapEvents:: - map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents - diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc deleted file mode 100644 index 012f55ec9..000000000 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_BattleTentLobby: - .4byte BattleTentLobby_Layout - .4byte VerdanturfTown_BattleTentLobby_MapEvents - .4byte VerdanturfTown_BattleTentLobby_MapScripts - .4byte 0x0 - .2byte MUS_B_TOWER - .2byte LAYOUT_BATTLE_TENT_LOBBY - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_BattleTentLobby/map.json b/data/maps/VerdanturfTown_BattleTentLobby/map.json new file mode 100644 index 000000000..2f5190f61 --- /dev/null +++ b/data/maps/VerdanturfTown_BattleTentLobby/map.json @@ -0,0 +1,123 @@ +{ + "id": "MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY", + "name": "VerdanturfTown_BattleTentLobby", + "layout": "LAYOUT_BATTLE_TENT_LOBBY", + "music": "MUS_B_TOWER", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 6, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201873", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "x": 0, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201A7B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "x": 9, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201ABC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 1, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AC5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_SCOTT", + "x": 12, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AD0", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_SCOTT" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 2, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_BattleTentLobby_EventScript_201AF7", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 9, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 0 + }, + { + "x": 7, + "y": 9, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "sign", + "x": 4, + "y": 5, + "elevation": 0, + "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", + "script": "VerdanturfTown_BattleTentLobby_EventScript_201B02" + } + ] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc deleted file mode 100644 index 8d15647d6..000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 - -VerdanturfTown_FriendshipRatersHouse_MapWarps: - warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN - -VerdanturfTown_FriendshipRatersHouse_MapEvents:: - map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc deleted file mode 100644 index 512004a3e..000000000 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse: - .4byte House2_Layout - .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents - .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_HOUSE2 - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json new file mode 100644 index 000000000..3a6785136 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE", + "name": "VerdanturfTown_FriendshipRatersHouse", + "layout": "LAYOUT_HOUSE2", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 3, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_203031", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 5 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 5 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc deleted file mode 100644 index a5f61b86f..000000000 --- a/data/maps/VerdanturfTown_House/events.inc +++ /dev/null @@ -1,11 +0,0 @@ -VerdanturfTown_House_EventObjects: - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 - -VerdanturfTown_House_MapWarps: - warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN - warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN - -VerdanturfTown_House_MapEvents:: - map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc deleted file mode 100644 index 910126e29..000000000 --- a/data/maps/VerdanturfTown_House/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_House: - .4byte House1_Layout - .4byte VerdanturfTown_House_MapEvents - .4byte VerdanturfTown_House_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_HOUSE1 - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json new file mode 100644 index 000000000..cf6170e8a --- /dev/null +++ b/data/maps/VerdanturfTown_House/map.json @@ -0,0 +1,62 @@ +{ + "id": "MAP_VERDANTURF_TOWN_HOUSE", + "name": "VerdanturfTown_House", + "layout": "LAYOUT_HOUSE1", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_House_EventScript_20335F", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 4, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_House_EventScript_203368", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 8, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 6 + }, + { + "x": 4, + "y": 8, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc deleted file mode 100644 index 79e731fe4..000000000 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ /dev/null @@ -1,13 +0,0 @@ -VerdanturfTown_Mart_EventObjects: - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 - -VerdanturfTown_Mart_MapWarps: - warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN - -VerdanturfTown_Mart_MapEvents:: - map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc deleted file mode 100644 index e04be5fd6..000000000 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_Mart: - .4byte Mart_Layout - .4byte VerdanturfTown_Mart_MapEvents - .4byte VerdanturfTown_Mart_MapScripts - .4byte 0x0 - .2byte MUS_FRIENDLY - .2byte LAYOUT_MART - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json new file mode 100644 index 000000000..8ea0e1bf5 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -0,0 +1,88 @@ +{ + "id": "MAP_VERDANTURF_TOWN_MART", + "name": "VerdanturfTown_Mart", + "layout": "LAYOUT_MART", + "music": "MUS_FRIENDLY", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "x": 1, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_202587", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025BA", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_F", + "x": 8, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025C3", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LASS", + "x": 3, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_Mart_EventScript_2025CC", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 3, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 1 + }, + { + "x": 4, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 1 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc deleted file mode 100644 index 47449cd1b..000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 - object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 - -VerdanturfTown_PokemonCenter_1F_MapWarps: - warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN - warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN - warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F - -VerdanturfTown_PokemonCenter_1F_MapEvents:: - map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc deleted file mode 100644 index e2adc24a4..000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_PokemonCenter_1F: - .4byte PokemonCenter_1F_Layout - .4byte VerdanturfTown_PokemonCenter_1F_MapEvents - .4byte VerdanturfTown_PokemonCenter_1F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_1F - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json new file mode 100644 index 000000000..1c1145565 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "name": "VerdanturfTown_PokemonCenter_1F", + "layout": "LAYOUT_POKEMON_CENTER_1F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_NURSE", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_20273A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "x": 4, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202748", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_EXPERT_M", + "x": 12, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_202751", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY", + "x": 10, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 2 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 2 + }, + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc deleted file mode 100644 index a4e13db36..000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 - object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN - -VerdanturfTown_PokemonCenter_2F_MapWarps: - warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_UNION_ROOM - warp_def 9, 1, 3, 0, MAP_TRADE_CENTER - -VerdanturfTown_PokemonCenter_2F_MapEvents:: - map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc deleted file mode 100644 index d64084b53..000000000 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_PokemonCenter_2F: - .4byte PokemonCenter_2F_Layout - .4byte VerdanturfTown_PokemonCenter_2F_MapEvents - .4byte VerdanturfTown_PokemonCenter_2F_MapScripts - .4byte 0x0 - .2byte MUS_POKECEN - .2byte LAYOUT_POKEMON_CENTER_2F - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json new file mode 100644 index 000000000..ad2df3d36 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -0,0 +1,95 @@ +{ + "id": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F", + "name": "VerdanturfTown_PokemonCenter_2F", + "layout": "LAYOUT_POKEMON_CENTER_2F", + "music": "MUS_POKECEN", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 6, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_27375B", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 2, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273761", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_TEALA", + "x": 10, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_273767", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MYSTERY_GIFT_MAN", + "x": 1, + "y": 2, + "elevation": 0, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_PokemonCenter_2F_EventScript_276B03", + "flag": "FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN" + } + ], + "warp_events": [ + { + "x": 1, + "y": 6, + "elevation": 4, + "dest_map": "MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 1, + "elevation": 3, + "dest_map": "MAP_UNION_ROOM", + "dest_warp_id": 0 + }, + { + "x": 9, + "y": 1, + "elevation": 3, + "dest_map": "MAP_TRADE_CENTER", + "dest_warp_id": 0 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc deleted file mode 100644 index 940417c7a..000000000 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_WandasHouse_EventObjects: - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN - object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN - -VerdanturfTown_WandasHouse_MapWarps: - warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN - warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN - -VerdanturfTown_WandasHouse_MapEvents:: - map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc deleted file mode 100644 index bb285600f..000000000 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_WandasHouse: - .4byte VerdanturfTown_WandasHouse_Layout - .4byte VerdanturfTown_WandasHouse_MapEvents - .4byte VerdanturfTown_WandasHouse_MapScripts - .4byte 0x0 - .2byte MUS_GOMACHI0 - .2byte LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE - .byte MAPSEC_VERDANTURF_TOWN - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_INDOOR - .2byte 0 - map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json new file mode 100644 index 000000000..10a3996fd --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -0,0 +1,101 @@ +{ + "id": "MAP_VERDANTURF_TOWN_WANDAS_HOUSE", + "name": "VerdanturfTown_WandasHouse", + "layout": "LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE", + "music": "MUS_GOMACHI0", + "region_map_section": "MAPSEC_VERDANTURF_TOWN", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 14, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_WANDER_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_2028BF", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "x": 5, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_202913", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_M", + "x": 7, + "y": 2, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_2028E1", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_POKEFAN_F", + "x": 2, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_20294E", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "x": 5, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VerdanturfTown_WandasHouse_EventScript_20291C", + "flag": "FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN" + } + ], + "warp_events": [ + { + "x": 7, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 3 + }, + { + "x": 8, + "y": 7, + "elevation": 0, + "dest_map": "MAP_VERDANTURF_TOWN", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc deleted file mode 100644 index 1e34108ed..000000000 --- a/data/maps/VictoryRoad_1F/events.inc +++ /dev/null @@ -1,28 +0,0 @@ -VictoryRoad_1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 12, 25, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E2C, FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291483, FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_291490, FLAG_ITEM_VICTORY_ROAD_1F_PP_UP - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_235E35, FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY - object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 - object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 - -VictoryRoad_1F_MapWarps: - warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY - warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY - warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F - warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F - warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F - -VictoryRoad_1F_MapCoordEvents: - coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF - coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 - -VictoryRoad_1F_MapBGEvents: - bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL - -VictoryRoad_1F_MapEvents:: - map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents - diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc deleted file mode 100644 index eb1e53c9b..000000000 --- a/data/maps/VictoryRoad_1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_1F: - .4byte VictoryRoad_1F_Layout - .4byte VictoryRoad_1F_MapEvents - .4byte VictoryRoad_1F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_1F - .byte MAPSEC_VICTORY_ROAD - .byte 0 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json new file mode 100644 index 000000000..b45981587 --- /dev/null +++ b/data/maps/VictoryRoad_1F/map.json @@ -0,0 +1,202 @@ +{ + "id": "MAP_VICTORY_ROAD_1F", + "name": "VictoryRoad_1F", + "layout": "LAYOUT_VICTORY_ROAD_1F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 33, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_1F_EventScript_235E73", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 6, + "y": 15, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_1F_EventScript_235EA1", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 27, + "y": 34, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_1F_EventScript_235E8A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 12, + "y": 25, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_235E2C", + "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 40, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_291483", + "flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 37, + "y": 39, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_291490", + "flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WALLY", + "x": 31, + "y": 9, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_1F_EventScript_235E35", + "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 29, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_1F_EventScript_235ECF", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 32, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_1F_EventScript_235EB8", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 15, + "y": 40, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 2 + }, + { + "x": 39, + "y": 5, + "elevation": 3, + "dest_map": "MAP_EVER_GRANDE_CITY", + "dest_warp_id": 3 + }, + { + "x": 21, + "y": 32, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 5 + }, + { + "x": 42, + "y": 38, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 2 + }, + { + "x": 9, + "y": 14, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 4 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 2, + "y": 23, + "elevation": 4, + "var": "VAR_0x40C3", + "var_value": 0, + "script": "VictoryRoad_1F_EventScript_235DAF" + }, + { + "type": "trigger", + "x": 3, + "y": 23, + "elevation": 4, + "var": "VAR_0x40C3", + "var_value": 0, + "script": "VictoryRoad_1F_EventScript_235DC8" + } + ], + "bg_events": [ + { + "type": "hidden_item", + "x": 30, + "y": 39, + "elevation": 4, + "item": "ITEM_ULTRA_BALL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL" + } + ] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc deleted file mode 100644 index 35c4fe428..000000000 --- a/data/maps/VictoryRoad_B1F/events.inc +++ /dev/null @@ -1,35 +0,0 @@ -VictoryRoad_B1F_EventObjects: - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1E - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1A - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1B - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1C - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_1D - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_1F - object_event 14, EVENT_OBJ_GFX_MAN_3, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2907A6, FLAG_TEMP_15 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_29149D, FLAG_ITEM_VICTORY_ROAD_B1F_TM_29 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_2914AA, FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE - object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 - object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 - -VictoryRoad_B1F_MapWarps: - warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F - warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F - warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F - warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F - warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F - warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F - warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F - -VictoryRoad_B1F_MapEvents:: - map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 - diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc deleted file mode 100644 index cc0064fd6..000000000 --- a/data/maps/VictoryRoad_B1F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B1F: - .4byte VictoryRoad_B1F_Layout - .4byte VictoryRoad_B1F_MapEvents - .4byte VictoryRoad_B1F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_B1F - .byte MAPSEC_VICTORY_ROAD - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json new file mode 100644 index 000000000..523eddc06 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/map.json @@ -0,0 +1,344 @@ +{ + "id": "MAP_VICTORY_ROAD_B1F", + "name": "VictoryRoad_B1F", + "layout": "LAYOUT_VICTORY_ROAD_B1F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 20, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_13" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 21, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_14" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 4, + "y": 7, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_11" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 9, + "y": 10, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_12" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 20, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_17" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 21, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_16" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 35, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_1E" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 19, + "y": 5, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_19" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1A" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 18, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1B" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 20, + "y": 25, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1C" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 21, + "y": 26, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_1D" + }, + { + "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "x": 34, + "y": 4, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2908BA", + "flag": "FLAG_TEMP_1F" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 37, + "y": 12, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_B1F_EventScript_2364E5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 26, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B1F_EventScript_2364FC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 5, + "y": 21, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B1F_EventScript_236513", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "x": 34, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2907A6", + "flag": "FLAG_TEMP_15" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 42, + "y": 8, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_29149D", + "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_29" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 32, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B1F_EventScript_2914AA", + "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 14, + "y": 16, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B1F_EventScript_23652A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 14, + "y": 20, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP_AND_RIGHT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 3, + "script": "VictoryRoad_B1F_EventScript_236541", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 0 + }, + { + "x": 17, + "y": 16, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 2 + }, + { + "x": 42, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 3 + }, + { + "x": 42, + "y": 2, + "elevation": 4, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 1 + }, + { + "x": 8, + "y": 3, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 4 + }, + { + "x": 20, + "y": 21, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_1F", + "dest_warp_id": 2 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B2F", + "dest_warp_id": 3 + } + ], + "coord_events": [], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc deleted file mode 100644 index 0bc77cade..000000000 --- a/data/maps/VictoryRoad_B2F/events.inc +++ /dev/null @@ -1,22 +0,0 @@ -VictoryRoad_B2F_EventObjects: - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_2914B7, FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 - -VictoryRoad_B2F_MapWarps: - warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F - warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F - warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F - warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F - -VictoryRoad_B2F_MapBGEvents: - bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR - bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL - -VictoryRoad_B2F_MapEvents:: - map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents - diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc deleted file mode 100644 index 0af51f971..000000000 --- a/data/maps/VictoryRoad_B2F/header.inc +++ /dev/null @@ -1,15 +0,0 @@ -VictoryRoad_B2F: - .4byte VictoryRoad_B2F_Layout - .4byte VictoryRoad_B2F_MapEvents - .4byte VictoryRoad_B2F_MapScripts - .4byte 0x0 - .2byte MUS_C_ROAD - .2byte LAYOUT_VICTORY_ROAD_B2F - .byte MAPSEC_VICTORY_ROAD - .byte 1 - .byte WEATHER_NONE - .byte MAP_TYPE_UNDERGROUND - .2byte 0 - map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1 - .byte MAP_BATTLE_SCENE_NORMAL - diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json new file mode 100644 index 000000000..2667155a9 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/map.json @@ -0,0 +1,158 @@ +{ + "id": "MAP_VICTORY_ROAD_B2F", + "name": "VictoryRoad_B2F", + "layout": "LAYOUT_VICTORY_ROAD_B2F", + "music": "MUS_C_ROAD", + "region_map_section": "MAPSEC_VICTORY_ROAD", + "requires_flash": true, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_UNDERGROUND", + "allow_bike": true, + "allow_escape_rope": true, + "allow_running": true, + "show_map_name": true, + "battle_scene": "MAP_BATTLE_SCENE_NORMAL", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 15, + "y": 6, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_2368D5", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 43, + "y": 14, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 4, + "script": "VictoryRoad_B2F_EventScript_2368EC", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 2, + "y": 17, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236903", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 35, + "y": 22, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_23691A", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "x": 13, + "y": 8, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_LOOK_AROUND", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 0, + "trainer_sight_or_berry_tree_id": 0, + "script": "VictoryRoad_B2F_EventScript_2914B7", + "flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL" + }, + { + "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "x": 25, + "y": 18, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_DOWN", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236948", + "flag": "0" + }, + { + "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "x": 25, + "y": 21, + "elevation": 4, + "movement_type": "MOVEMENT_TYPE_FACE_UP", + "movement_range_x": 1, + "movement_range_y": 1, + "trainer_type": 1, + "trainer_sight_or_berry_tree_id": 2, + "script": "VictoryRoad_B2F_EventScript_236931", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 30, + "y": 25, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 0 + }, + { + "x": 43, + "y": 2, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 3 + }, + { + "x": 19, + "y": 12, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 1 + }, + { + "x": 5, + "y": 26, + "elevation": 3, + "dest_map": "MAP_VICTORY_ROAD_B1F", + "dest_warp_id": 6 + } + ], + "coord_events": [], + "bg_events": [ + { + "type": "hidden_item", + "x": 28, + "y": 5, + "elevation": 3, + "item": "ITEM_ELIXIR", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR" + }, + { + "type": "hidden_item", + "x": 37, + "y": 1, + "elevation": 3, + "item": "ITEM_MAX_REPEL", + "flag": "FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL" + } + ] +} \ No newline at end of file diff --git a/data/maps/connections.inc b/data/maps/connections.inc deleted file mode 100644 index a95024921..000000000 --- a/data/maps/connections.inc +++ /dev/null @@ -1,65 +0,0 @@ - .include "data/maps/LittlerootTown/connections.inc" - .include "data/maps/OldaleTown/connections.inc" - .include "data/maps/DewfordTown/connections.inc" - .include "data/maps/LavaridgeTown/connections.inc" - .include "data/maps/FallarborTown/connections.inc" - .include "data/maps/VerdanturfTown/connections.inc" - .include "data/maps/PacifidlogTown/connections.inc" - .include "data/maps/PetalburgCity/connections.inc" - .include "data/maps/SlateportCity/connections.inc" - .include "data/maps/MauvilleCity/connections.inc" - .include "data/maps/RustboroCity/connections.inc" - .include "data/maps/FortreeCity/connections.inc" - .include "data/maps/LilycoveCity/connections.inc" - .include "data/maps/MossdeepCity/connections.inc" - .include "data/maps/SootopolisCity/connections.inc" - .include "data/maps/EverGrandeCity/connections.inc" - .include "data/maps/Route101/connections.inc" - .include "data/maps/Route102/connections.inc" - .include "data/maps/Route103/connections.inc" - .include "data/maps/Route104/connections.inc" - .include "data/maps/Route105/connections.inc" - .include "data/maps/Route106/connections.inc" - .include "data/maps/Route107/connections.inc" - .include "data/maps/Route108/connections.inc" - .include "data/maps/Route109/connections.inc" - .include "data/maps/Route110/connections.inc" - .include "data/maps/Route111/connections.inc" - .include "data/maps/Route112/connections.inc" - .include "data/maps/Route113/connections.inc" - .include "data/maps/Route114/connections.inc" - .include "data/maps/Route115/connections.inc" - .include "data/maps/Route116/connections.inc" - .include "data/maps/Route117/connections.inc" - .include "data/maps/Route118/connections.inc" - .include "data/maps/Route119/connections.inc" - .include "data/maps/Route120/connections.inc" - .include "data/maps/Route121/connections.inc" - .include "data/maps/Route122/connections.inc" - .include "data/maps/Route123/connections.inc" - .include "data/maps/Route124/connections.inc" - .include "data/maps/Route125/connections.inc" - .include "data/maps/Route126/connections.inc" - .include "data/maps/Route127/connections.inc" - .include "data/maps/Route128/connections.inc" - .include "data/maps/Route129/connections.inc" - .include "data/maps/Route130/connections.inc" - .include "data/maps/Route131/connections.inc" - .include "data/maps/Route132/connections.inc" - .include "data/maps/Route133/connections.inc" - .include "data/maps/Route134/connections.inc" - .include "data/maps/Underwater6/connections.inc" - .include "data/maps/Underwater1/connections.inc" - .include "data/maps/Underwater7/connections.inc" - .include "data/maps/Underwater2/connections.inc" - .include "data/maps/Underwater3/connections.inc" - .include "data/maps/Underwater4/connections.inc" - .include "data/maps/Underwater5/connections.inc" - .include "data/maps/SafariZone_Northwest/connections.inc" - .include "data/maps/SafariZone_North/connections.inc" - .include "data/maps/SafariZone_Southwest/connections.inc" - .include "data/maps/SafariZone_South/connections.inc" - .include "data/maps/SafariZone_Northeast/connections.inc" - .include "data/maps/SafariZone_Southeast/connections.inc" - .include "data/maps/BattleFrontier_OutsideWest/connections.inc" - .include "data/maps/BattleFrontier_OutsideEast/connections.inc" diff --git a/data/maps/groups.inc b/data/maps/groups.inc deleted file mode 100644 index 77f9c4441..000000000 --- a/data/maps/groups.inc +++ /dev/null @@ -1,623 +0,0 @@ -gMapGroup0: @ 8485D60 - .4byte PetalburgCity - .4byte SlateportCity - .4byte MauvilleCity - .4byte RustboroCity - .4byte FortreeCity - .4byte LilycoveCity - .4byte MossdeepCity - .4byte SootopolisCity - .4byte EverGrandeCity - .4byte LittlerootTown - .4byte OldaleTown - .4byte DewfordTown - .4byte LavaridgeTown - .4byte FallarborTown - .4byte VerdanturfTown - .4byte PacifidlogTown - .4byte Route101 - .4byte Route102 - .4byte Route103 - .4byte Route104 - .4byte Route105 - .4byte Route106 - .4byte Route107 - .4byte Route108 - .4byte Route109 - .4byte Route110 - .4byte Route111 - .4byte Route112 - .4byte Route113 - .4byte Route114 - .4byte Route115 - .4byte Route116 - .4byte Route117 - .4byte Route118 - .4byte Route119 - .4byte Route120 - .4byte Route121 - .4byte Route122 - .4byte Route123 - .4byte Route124 - .4byte Route125 - .4byte Route126 - .4byte Route127 - .4byte Route128 - .4byte Route129 - .4byte Route130 - .4byte Route131 - .4byte Route132 - .4byte Route133 - .4byte Route134 - .4byte Underwater1 - .4byte Underwater2 - .4byte Underwater3 - .4byte Underwater4 - .4byte Underwater5 - .4byte Underwater6 - .4byte Underwater7 - -gMapGroup1: @ 8485E44 - .4byte LittlerootTown_BrendansHouse_1F - .4byte LittlerootTown_BrendansHouse_2F - .4byte LittlerootTown_MaysHouse_1F - .4byte LittlerootTown_MaysHouse_2F - .4byte LittlerootTown_ProfessorBirchsLab - -gMapGroup2: @ 8485E58 - .4byte OldaleTown_House1 - .4byte OldaleTown_House2 - .4byte OldaleTown_PokemonCenter_1F - .4byte OldaleTown_PokemonCenter_2F - .4byte OldaleTown_Mart - -gMapGroup3: @ 8485E6C - .4byte DewfordTown_House1 - .4byte DewfordTown_PokemonCenter_1F - .4byte DewfordTown_PokemonCenter_2F - .4byte DewfordTown_Gym - .4byte DewfordTown_Hall - .4byte DewfordTown_House2 - -gMapGroup4: @ 8485E84 - .4byte LavaridgeTown_HerbShop - .4byte LavaridgeTown_Gym_1F - .4byte LavaridgeTown_Gym_B1F - .4byte LavaridgeTown_House - .4byte LavaridgeTown_Mart - .4byte LavaridgeTown_PokemonCenter_1F - .4byte LavaridgeTown_PokemonCenter_2F - -gMapGroup5: @ 8485EA0 - .4byte FallarborTown_Mart - .4byte FallarborTown_BattleTentLobby - .4byte FallarborTown_BattleTentCorridor - .4byte FallarborTown_BattleTentBattleRoom - .4byte FallarborTown_PokemonCenter_1F - .4byte FallarborTown_PokemonCenter_2F - .4byte FallarborTown_House1 - .4byte FallarborTown_House2 - -gMapGroup6: @ 8485EC0 - .4byte VerdanturfTown_BattleTentLobby - .4byte VerdanturfTown_BattleTentCorridor - .4byte VerdanturfTown_BattleTentBattleRoom - .4byte VerdanturfTown_Mart - .4byte VerdanturfTown_PokemonCenter_1F - .4byte VerdanturfTown_PokemonCenter_2F - .4byte VerdanturfTown_WandasHouse - .4byte VerdanturfTown_FriendshipRatersHouse - .4byte VerdanturfTown_House - -gMapGroup7: @ 8485EE4 - .4byte PacifidlogTown_PokemonCenter_1F - .4byte PacifidlogTown_PokemonCenter_2F - .4byte PacifidlogTown_House1 - .4byte PacifidlogTown_House2 - .4byte PacifidlogTown_House3 - .4byte PacifidlogTown_House4 - .4byte PacifidlogTown_House5 - -gMapGroup8: @ 8485F00 - .4byte PetalburgCity_WallysHouse - .4byte PetalburgCity_Gym - .4byte PetalburgCity_House1 - .4byte PetalburgCity_House2 - .4byte PetalburgCity_PokemonCenter_1F - .4byte PetalburgCity_PokemonCenter_2F - .4byte PetalburgCity_Mart - -gMapGroup9: @ 8485F1C - .4byte SlateportCity_SternsShipyard_1F - .4byte SlateportCity_SternsShipyard_2F - .4byte SlateportCity_BattleTentLobby - .4byte SlateportCity_BattleTentCorridor - .4byte SlateportCity_BattleTentBattleRoom - .4byte SlateportCity_House1 - .4byte SlateportCity_PokemonFanClub - .4byte SlateportCity_OceanicMuseum_1F - .4byte SlateportCity_OceanicMuseum_2F - .4byte SlateportCity_Harbor - .4byte SlateportCity_House2 - .4byte SlateportCity_PokemonCenter_1F - .4byte SlateportCity_PokemonCenter_2F - .4byte SlateportCity_Mart - -gMapGroup10: @ 8485F54 - .4byte MauvilleCity_Gym - .4byte MauvilleCity_BikeShop - .4byte MauvilleCity_House1 - .4byte MauvilleCity_GameCorner - .4byte MauvilleCity_House2 - .4byte MauvilleCity_PokemonCenter_1F - .4byte MauvilleCity_PokemonCenter_2F - .4byte MauvilleCity_Mart - -gMapGroup11: @ 8485F74 - .4byte RustboroCity_DevonCorp_1F - .4byte RustboroCity_DevonCorp_2F - .4byte RustboroCity_DevonCorp_3F - .4byte RustboroCity_Gym - .4byte RustboroCity_PokemonSchool - .4byte RustboroCity_PokemonCenter_1F - .4byte RustboroCity_PokemonCenter_2F - .4byte RustboroCity_Mart - .4byte RustboroCity_Flat1_1F - .4byte RustboroCity_Flat1_2F - .4byte RustboroCity_House1 - .4byte RustboroCity_CuttersHouse - .4byte RustboroCity_House2 - .4byte RustboroCity_Flat2_1F - .4byte RustboroCity_Flat2_2F - .4byte RustboroCity_Flat2_3F - .4byte RustboroCity_House3 - -gMapGroup12: @ 8485FB8 - .4byte FortreeCity_House1 - .4byte FortreeCity_Gym - .4byte FortreeCity_PokemonCenter_1F - .4byte FortreeCity_PokemonCenter_2F - .4byte FortreeCity_Mart - .4byte FortreeCity_House2 - .4byte FortreeCity_House3 - .4byte FortreeCity_House4 - .4byte FortreeCity_House5 - .4byte FortreeCity_DecorationShop - -gMapGroup13: @ 8485FE0 - .4byte LilycoveCity_CoveLilyMotel_1F - .4byte LilycoveCity_CoveLilyMotel_2F - .4byte LilycoveCity_LilycoveMuseum_1F - .4byte LilycoveCity_LilycoveMuseum_2F - .4byte LilycoveCity_ContestLobby - .4byte LilycoveCity_ContestHall - .4byte LilycoveCity_PokemonCenter_1F - .4byte LilycoveCity_PokemonCenter_2F - .4byte LilycoveCity_UnusedMart - .4byte LilycoveCity_PokemonTrainerFanClub - .4byte LilycoveCity_Harbor - .4byte LilycoveCity_MoveDeletersHouse - .4byte LilycoveCity_House1 - .4byte LilycoveCity_House2 - .4byte LilycoveCity_House3 - .4byte LilycoveCity_House4 - .4byte LilycoveCity_DepartmentStore_1F - .4byte LilycoveCity_DepartmentStore_2F - .4byte LilycoveCity_DepartmentStore_3F - .4byte LilycoveCity_DepartmentStore_4F - .4byte LilycoveCity_DepartmentStore_5F - .4byte LilycoveCity_DepartmentStoreRooftop - .4byte LilycoveCity_DepartmentStoreElevator - -gMapGroup14: @ 848603C - .4byte MossdeepCity_Gym - .4byte MossdeepCity_House1 - .4byte MossdeepCity_House2 - .4byte MossdeepCity_PokemonCenter_1F - .4byte MossdeepCity_PokemonCenter_2F - .4byte MossdeepCity_Mart - .4byte MossdeepCity_House3 - .4byte MossdeepCity_StevensHouse - .4byte MossdeepCity_House4 - .4byte MossdeepCity_SpaceCenter_1F - .4byte MossdeepCity_SpaceCenter_2F - .4byte MossdeepCity_GameCorner_1F - .4byte MossdeepCity_GameCorner_B1F - -gMapGroup15: @ 8486070 - .4byte SootopolisCity_Gym_1F - .4byte SootopolisCity_Gym_B1F - .4byte SootopolisCity_PokemonCenter_1F - .4byte SootopolisCity_PokemonCenter_2F - .4byte SootopolisCity_Mart - .4byte SootopolisCity_House1 - .4byte SootopolisCity_House2 - .4byte SootopolisCity_House3 - .4byte SootopolisCity_House4 - .4byte SootopolisCity_House5 - .4byte SootopolisCity_House6 - .4byte SootopolisCity_House7 - .4byte SootopolisCity_LotadAndSeedotHouse - .4byte SootopolisCity_MysteryEventsHouse_1F - .4byte SootopolisCity_MysteryEventsHouse_B1F - -gMapGroup16: @ 84860AC - .4byte EverGrandeCity_SidneysRoom - .4byte EverGrandeCity_PhoebesRoom - .4byte EverGrandeCity_GlaciasRoom - .4byte EverGrandeCity_DrakesRoom - .4byte EverGrandeCity_ChampionsRoom - .4byte EverGrandeCity_Hall1 - .4byte EverGrandeCity_Hall2 - .4byte EverGrandeCity_Hall3 - .4byte EverGrandeCity_Hall4 - .4byte EverGrandeCity_Hall5 - .4byte EverGrandeCity_PokemonLeague_1F - .4byte EverGrandeCity_HallOfFame - .4byte EverGrandeCity_PokemonCenter_1F - .4byte EverGrandeCity_PokemonCenter_2F - .4byte EverGrandeCity_PokemonLeague_2F - -gMapGroup17: @ 84860E8 - .4byte Route104_MrBrineysHouse - .4byte Route104_PrettyPetalFlowerShop - -gMapGroup18: @ 84860F0 - .4byte Route111_WinstrateFamilysHouse - .4byte Route111_OldLadysRestStop - -gMapGroup19: @ 84860F8 - .4byte Route112_CableCarStation - .4byte MtChimney_CableCarStation - -gMapGroup20: @ 8486100 - .4byte Route114_FossilManiacsHouse - .4byte Route114_FossilManiacsTunnel - .4byte Route114_LanettesHouse - -gMapGroup21: @ 848610C - .4byte Route116_TunnelersRestHouse - -gMapGroup22: @ 8486110 - .4byte Route117_PokemonDayCare - -gMapGroup23: @ 8486114 - .4byte Route121_SafariZoneEntrance - -gMapGroup24: @ 8486118 - .4byte MeteorFalls_1F_1R - .4byte MeteorFalls_1F_2R - .4byte MeteorFalls_B1F_1R - .4byte MeteorFalls_B1F_2R - .4byte RusturfTunnel - .4byte Underwater_SootopolisCity - .4byte DesertRuins - .4byte GraniteCave_1F - .4byte GraniteCave_B1F - .4byte GraniteCave_B2F - .4byte GraniteCave_StevensRoom - .4byte PetalburgWoods - .4byte MtChimney - .4byte JaggedPass - .4byte FieryPath - .4byte MtPyre_1F - .4byte MtPyre_2F - .4byte MtPyre_3F - .4byte MtPyre_4F - .4byte MtPyre_5F - .4byte MtPyre_6F - .4byte MtPyre_Exterior - .4byte MtPyre_Summit - .4byte AquaHideout_1F - .4byte AquaHideout_B1F - .4byte AquaHideout_B2F - .4byte Underwater_SeafloorCavern - .4byte SeafloorCavern_Entrance - .4byte SeafloorCavern_Room1 - .4byte SeafloorCavern_Room2 - .4byte SeafloorCavern_Room3 - .4byte SeafloorCavern_Room4 - .4byte SeafloorCavern_Room5 - .4byte SeafloorCavern_Room6 - .4byte SeafloorCavern_Room7 - .4byte SeafloorCavern_Room8 - .4byte SeafloorCavern_Room9 - .4byte CaveOfOrigin_Entrance - .4byte CaveOfOrigin_1F - .4byte CaveOfOrigin_UnusedRubySapphireMap1 - .4byte CaveOfOrigin_UnusedRubySapphireMap2 - .4byte CaveOfOrigin_UnusedRubySapphireMap3 - .4byte CaveOfOrigin_B1F - .4byte VictoryRoad_1F - .4byte VictoryRoad_B1F - .4byte VictoryRoad_B2F - .4byte ShoalCave_LowTideEntranceRoom - .4byte ShoalCave_LowTideInnerRoom - .4byte ShoalCave_LowTideStairsRoom - .4byte ShoalCave_LowTideLowerRoom - .4byte ShoalCave_HighTideEntranceRoom - .4byte ShoalCave_HighTideInnerRoom - .4byte NewMauville_Entrance - .4byte NewMauville_Inside - .4byte AbandonedShip_Deck - .4byte AbandonedShip_Corridors_1F - .4byte AbandonedShip_Rooms_1F - .4byte AbandonedShip_Corridors_B1F - .4byte AbandonedShip_Rooms_B1F - .4byte AbandonedShip_Rooms2_B1F - .4byte AbandonedShip_Underwater1 - .4byte AbandonedShip_Room_B1F - .4byte AbandonedShip_Rooms2_1F - .4byte AbandonedShip_CaptainsOffice - .4byte AbandonedShip_Underwater2 - .4byte AbandonedShip_HiddenFloorCorridors - .4byte AbandonedShip_HiddenFloorRooms - .4byte IslandCave - .4byte AncientTomb - .4byte Underwater_Route134 - .4byte Underwater_SealedChamber - .4byte SealedChamber_OuterRoom - .4byte SealedChamber_InnerRoom - .4byte ScorchedSlab - .4byte AquaHideout_UnusedRubyMap1 - .4byte AquaHideout_UnusedRubyMap2 - .4byte AquaHideout_UnusedRubyMap3 - .4byte SkyPillar_Entrance - .4byte SkyPillar_Outside - .4byte SkyPillar_1F - .4byte SkyPillar_2F - .4byte SkyPillar_3F - .4byte SkyPillar_4F - .4byte ShoalCave_LowTideIceRoom - .4byte SkyPillar_5F - .4byte SkyPillar_Top - .4byte MagmaHideout_1F - .4byte MagmaHideout_2F_1R - .4byte MagmaHideout_2F_2R - .4byte MagmaHideout_3F_1R - .4byte MagmaHideout_3F_2R - .4byte MagmaHideout_4F - .4byte MagmaHideout_3F_3R - .4byte MagmaHideout_2F_3R - .4byte MirageTower_1F - .4byte MirageTower_2F - .4byte MirageTower_3F - .4byte MirageTower_4F - .4byte DesertUnderpass - .4byte ArtisanCave_B1F - .4byte ArtisanCave_1F - .4byte Underwater_MarineCave - .4byte MarineCave_Entrance - .4byte MarineCave_End - .4byte TerraCave_Entrance - .4byte TerraCave_End - .4byte AlteringCave - .4byte MeteorFalls_StevensCave - -gMapGroup25: @ 84862C8 - .4byte SecretBase_RedCave1 - .4byte SecretBase_BrownCave1 - .4byte SecretBase_BlueCave1 - .4byte SecretBase_YellowCave1 - .4byte SecretBase_Tree1 - .4byte SecretBase_Shrub1 - .4byte SecretBase_RedCave2 - .4byte SecretBase_BrownCave2 - .4byte SecretBase_BlueCave2 - .4byte SecretBase_YellowCave2 - .4byte SecretBase_Tree2 - .4byte SecretBase_Shrub2 - .4byte SecretBase_RedCave3 - .4byte SecretBase_BrownCave3 - .4byte SecretBase_BlueCave3 - .4byte SecretBase_YellowCave3 - .4byte SecretBase_Tree3 - .4byte SecretBase_Shrub3 - .4byte SecretBase_RedCave4 - .4byte SecretBase_BrownCave4 - .4byte SecretBase_BlueCave4 - .4byte SecretBase_YellowCave4 - .4byte SecretBase_Tree4 - .4byte SecretBase_Shrub4 - .4byte SingleBattleColosseum - .4byte TradeCenter - .4byte RecordCorner - .4byte DoubleBattleColosseum - .4byte LinkContestRoom1 - .4byte UnknownMap_25_29 - .4byte UnknownMap_25_30 - .4byte UnknownMap_25_31 - .4byte UnknownMap_25_32 - .4byte UnknownMap_25_33 - .4byte UnknownMap_25_34 - .4byte LinkContestRoom2 - .4byte LinkContestRoom3 - .4byte LinkContestRoom4 - .4byte LinkContestRoom5 - .4byte LinkContestRoom6 - .4byte InsideOfTruck - .4byte SSTidalCorridor - .4byte SSTidalLowerDeck - .4byte SSTidalRooms - .4byte BattlePyramidSquare01 - .4byte BattlePyramidSquare02 - .4byte BattlePyramidSquare03 - .4byte BattlePyramidSquare04 - .4byte BattlePyramidSquare05 - .4byte BattlePyramidSquare06 - .4byte BattlePyramidSquare07 - .4byte BattlePyramidSquare08 - .4byte BattlePyramidSquare09 - .4byte BattlePyramidSquare10 - .4byte BattlePyramidSquare11 - .4byte BattlePyramidSquare12 - .4byte BattlePyramidSquare13 - .4byte BattlePyramidSquare14 - .4byte BattlePyramidSquare15 - .4byte BattlePyramidSquare16 - .4byte UnionRoom - -gMapGroup26: @ 84863BC - .4byte SafariZone_Northwest - .4byte SafariZone_North - .4byte SafariZone_Southwest - .4byte SafariZone_South - .4byte BattleFrontier_OutsideWest - .4byte BattleFrontier_BattleTowerLobby - .4byte BattleFrontier_BattleTowerElevator - .4byte BattleFrontier_BattleTowerCorridor - .4byte BattleFrontier_BattleTowerBattleRoom - .4byte SouthernIsland_Exterior - .4byte SouthernIsland_Interior - .4byte SafariZone_RestHouse - .4byte SafariZone_Northeast - .4byte SafariZone_Southeast - .4byte BattleFrontier_OutsideEast - .4byte BattleFrontier_BattleTowerMultiBattleRoom - .4byte BattleFrontier_BattleTowerCorridor2 - .4byte BattleFrontier_BattleTowerBattleRoom2 - .4byte BattleFrontier_BattleDomeLobby - .4byte BattleFrontier_BattleDomeCorridor - .4byte BattleFrontier_BattleDomePreBattleRoom - .4byte BattleFrontier_BattleDomeBattleRoom - .4byte BattleFrontier_BattlePalaceLobby - .4byte BattleFrontier_BattlePalaceCorridor - .4byte BattleFrontier_BattlePalaceBattleRoom - .4byte BattleFrontier_BattlePyramidLobby - .4byte BattleFrontier_BattlePyramidEmptySquare - .4byte BattleFrontier_BattlePyramidTop - .4byte BattleFrontier_BattleArenaLobby - .4byte BattleFrontier_BattleArenaCorridor - .4byte BattleFrontier_BattleArenaBattleRoom - .4byte BattleFrontier_BattleFactoryLobby - .4byte BattleFrontier_BattleFactoryPreBattleRoom - .4byte BattleFrontier_BattleFactoryBattleRoom - .4byte BattleFrontier_BattlePikeLobby - .4byte BattleFrontier_BattlePikeCorridor - .4byte BattleFrontier_BattlePikeThreePathRoom - .4byte BattleFrontier_BattlePikeRandomRoom1 - .4byte BattleFrontier_BattlePikeRandomRoom2 - .4byte BattleFrontier_BattlePikeRandomRoom3 - .4byte BattleFrontier_RankingHall - .4byte BattleFrontier_Lounge1 - .4byte BattleFrontier_BattlePointExchangeServiceCorner - .4byte BattleFrontier_Lounge2 - .4byte BattleFrontier_Lounge3 - .4byte BattleFrontier_Lounge4 - .4byte BattleFrontier_ScottsHouse - .4byte BattleFrontier_Lounge5 - .4byte BattleFrontier_Lounge6 - .4byte BattleFrontier_Lounge7 - .4byte BattleFrontier_ReceptionGate - .4byte BattleFrontier_Lounge8 - .4byte BattleFrontier_Lounge9 - .4byte BattleFrontier_PokemonCenter_1F - .4byte BattleFrontier_PokemonCenter_2F - .4byte BattleFrontier_Mart - .4byte FarawayIsland_Entrance - .4byte FarawayIsland_Interior - .4byte BirthIsland_Exterior - .4byte BirthIsland_Harbor - .4byte TrainerHill_Entrance - .4byte TrainerHill_1F - .4byte TrainerHill_2F - .4byte TrainerHill_3F - .4byte TrainerHill_4F - .4byte TrainerHill_Roof - .4byte NavelRock_Exterior - .4byte NavelRock_Harbor - .4byte NavelRock_Entrance - .4byte NavelRock_B1F - .4byte NavelRock_Fork - .4byte NavelRock_Up1 - .4byte NavelRock_Up2 - .4byte NavelRock_Up3 - .4byte NavelRock_Up4 - .4byte NavelRock_Top - .4byte NavelRock_Down01 - .4byte NavelRock_Down02 - .4byte NavelRock_Down03 - .4byte NavelRock_Down04 - .4byte NavelRock_Down05 - .4byte NavelRock_Down06 - .4byte NavelRock_Down07 - .4byte NavelRock_Down08 - .4byte NavelRock_Down09 - .4byte NavelRock_Down10 - .4byte NavelRock_Down11 - .4byte NavelRock_Bottom - .4byte TrainerHill_Elevator - -gMapGroup27: @ 8486520 - .4byte Route104_Prototype - .4byte Route104_PrototypePrettyPetalFlowerShop - -gMapGroup28: @ 8486528 - .4byte Route109_SeashoreHouse - -gMapGroup29: @ 848652C - .4byte Route110_TrickHouseEntrance - .4byte Route110_TrickHouseEnd - .4byte Route110_TrickHouseCorridor - .4byte Route110_TrickHousePuzzle1 - .4byte Route110_TrickHousePuzzle2 - .4byte Route110_TrickHousePuzzle3 - .4byte Route110_TrickHousePuzzle4 - .4byte Route110_TrickHousePuzzle5 - .4byte Route110_TrickHousePuzzle6 - .4byte Route110_TrickHousePuzzle7 - .4byte Route110_TrickHousePuzzle8 - .4byte Route110_SeasideCyclingRoadNorthEntrance - .4byte Route110_SeasideCyclingRoadSouthEntrance - -gMapGroup30: @ 8486560 - .4byte Route113_GlassWorkshop - -gMapGroup31: @ 8486564 - .4byte Route123_BerryMastersHouse - -gMapGroup32: @ 8486568 - .4byte Route119_WeatherInstitute_1F - .4byte Route119_WeatherInstitute_2F - .4byte Route119_House - -gMapGroup33: @ 8486574 - .4byte Route124_DivingTreasureHuntersHouse - - .align 2 -gMapGroups:: @ 8486578 - .4byte gMapGroup0 - .4byte gMapGroup1 - .4byte gMapGroup2 - .4byte gMapGroup3 - .4byte gMapGroup4 - .4byte gMapGroup5 - .4byte gMapGroup6 - .4byte gMapGroup7 - .4byte gMapGroup8 - .4byte gMapGroup9 - .4byte gMapGroup10 - .4byte gMapGroup11 - .4byte gMapGroup12 - .4byte gMapGroup13 - .4byte gMapGroup14 - .4byte gMapGroup15 - .4byte gMapGroup16 - .4byte gMapGroup17 - .4byte gMapGroup18 - .4byte gMapGroup19 - .4byte gMapGroup20 - .4byte gMapGroup21 - .4byte gMapGroup22 - .4byte gMapGroup23 - .4byte gMapGroup24 - .4byte gMapGroup25 - .4byte gMapGroup26 - .4byte gMapGroup27 - .4byte gMapGroup28 - .4byte gMapGroup29 - .4byte gMapGroup30 - .4byte gMapGroup31 - .4byte gMapGroup32 - .4byte gMapGroup33 - diff --git a/data/maps/headers.inc b/data/maps/headers.inc deleted file mode 100644 index b4be3ab0c..000000000 --- a/data/maps/headers.inc +++ /dev/null @@ -1,518 +0,0 @@ - .include "data/maps/PetalburgCity/header.inc" - .include "data/maps/SlateportCity/header.inc" - .include "data/maps/MauvilleCity/header.inc" - .include "data/maps/RustboroCity/header.inc" - .include "data/maps/FortreeCity/header.inc" - .include "data/maps/LilycoveCity/header.inc" - .include "data/maps/MossdeepCity/header.inc" - .include "data/maps/SootopolisCity/header.inc" - .include "data/maps/EverGrandeCity/header.inc" - .include "data/maps/LittlerootTown/header.inc" - .include "data/maps/OldaleTown/header.inc" - .include "data/maps/DewfordTown/header.inc" - .include "data/maps/LavaridgeTown/header.inc" - .include "data/maps/FallarborTown/header.inc" - .include "data/maps/VerdanturfTown/header.inc" - .include "data/maps/PacifidlogTown/header.inc" - .include "data/maps/Route101/header.inc" - .include "data/maps/Route102/header.inc" - .include "data/maps/Route103/header.inc" - .include "data/maps/Route104/header.inc" - .include "data/maps/Route105/header.inc" - .include "data/maps/Route106/header.inc" - .include "data/maps/Route107/header.inc" - .include "data/maps/Route108/header.inc" - .include "data/maps/Route109/header.inc" - .include "data/maps/Route110/header.inc" - .include "data/maps/Route111/header.inc" - .include "data/maps/Route112/header.inc" - .include "data/maps/Route113/header.inc" - .include "data/maps/Route114/header.inc" - .include "data/maps/Route115/header.inc" - .include "data/maps/Route116/header.inc" - .include "data/maps/Route117/header.inc" - .include "data/maps/Route118/header.inc" - .include "data/maps/Route119/header.inc" - .include "data/maps/Route120/header.inc" - .include "data/maps/Route121/header.inc" - .include "data/maps/Route122/header.inc" - .include "data/maps/Route123/header.inc" - .include "data/maps/Route124/header.inc" - .include "data/maps/Route125/header.inc" - .include "data/maps/Route126/header.inc" - .include "data/maps/Route127/header.inc" - .include "data/maps/Route128/header.inc" - .include "data/maps/Route129/header.inc" - .include "data/maps/Route130/header.inc" - .include "data/maps/Route131/header.inc" - .include "data/maps/Route132/header.inc" - .include "data/maps/Route133/header.inc" - .include "data/maps/Route134/header.inc" - .include "data/maps/Underwater1/header.inc" - .include "data/maps/Underwater2/header.inc" - .include "data/maps/Underwater3/header.inc" - .include "data/maps/Underwater4/header.inc" - .include "data/maps/Underwater5/header.inc" - .include "data/maps/Underwater6/header.inc" - .include "data/maps/Underwater7/header.inc" - .include "data/maps/LittlerootTown_BrendansHouse_1F/header.inc" - .include "data/maps/LittlerootTown_BrendansHouse_2F/header.inc" - .include "data/maps/LittlerootTown_MaysHouse_1F/header.inc" - .include "data/maps/LittlerootTown_MaysHouse_2F/header.inc" - .include "data/maps/LittlerootTown_ProfessorBirchsLab/header.inc" - .include "data/maps/OldaleTown_House1/header.inc" - .include "data/maps/OldaleTown_House2/header.inc" - .include "data/maps/OldaleTown_PokemonCenter_1F/header.inc" - .include "data/maps/OldaleTown_PokemonCenter_2F/header.inc" - .include "data/maps/OldaleTown_Mart/header.inc" - .include "data/maps/DewfordTown_House1/header.inc" - .include "data/maps/DewfordTown_PokemonCenter_1F/header.inc" - .include "data/maps/DewfordTown_PokemonCenter_2F/header.inc" - .include "data/maps/DewfordTown_Gym/header.inc" - .include "data/maps/DewfordTown_Hall/header.inc" - .include "data/maps/DewfordTown_House2/header.inc" - .include "data/maps/LavaridgeTown_HerbShop/header.inc" - .include "data/maps/LavaridgeTown_Gym_1F/header.inc" - .include "data/maps/LavaridgeTown_Gym_B1F/header.inc" - .include "data/maps/LavaridgeTown_House/header.inc" - .include "data/maps/LavaridgeTown_Mart/header.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_1F/header.inc" - .include "data/maps/LavaridgeTown_PokemonCenter_2F/header.inc" - .include "data/maps/FallarborTown_Mart/header.inc" - .include "data/maps/FallarborTown_BattleTentLobby/header.inc" - .include "data/maps/FallarborTown_BattleTentCorridor/header.inc" - .include "data/maps/FallarborTown_BattleTentBattleRoom/header.inc" - .include "data/maps/FallarborTown_PokemonCenter_1F/header.inc" - .include "data/maps/FallarborTown_PokemonCenter_2F/header.inc" - .include "data/maps/FallarborTown_House1/header.inc" - .include "data/maps/FallarborTown_House2/header.inc" - .include "data/maps/VerdanturfTown_BattleTentLobby/header.inc" - .include "data/maps/VerdanturfTown_BattleTentCorridor/header.inc" - .include "data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc" - .include "data/maps/VerdanturfTown_Mart/header.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_1F/header.inc" - .include "data/maps/VerdanturfTown_PokemonCenter_2F/header.inc" - .include "data/maps/VerdanturfTown_WandasHouse/header.inc" - .include "data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc" - .include "data/maps/VerdanturfTown_House/header.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_1F/header.inc" - .include "data/maps/PacifidlogTown_PokemonCenter_2F/header.inc" - .include "data/maps/PacifidlogTown_House1/header.inc" - .include "data/maps/PacifidlogTown_House2/header.inc" - .include "data/maps/PacifidlogTown_House3/header.inc" - .include "data/maps/PacifidlogTown_House4/header.inc" - .include "data/maps/PacifidlogTown_House5/header.inc" - .include "data/maps/PetalburgCity_WallysHouse/header.inc" - .include "data/maps/PetalburgCity_Gym/header.inc" - .include "data/maps/PetalburgCity_House1/header.inc" - .include "data/maps/PetalburgCity_House2/header.inc" - .include "data/maps/PetalburgCity_PokemonCenter_1F/header.inc" - .include "data/maps/PetalburgCity_PokemonCenter_2F/header.inc" - .include "data/maps/PetalburgCity_Mart/header.inc" - .include "data/maps/SlateportCity_SternsShipyard_1F/header.inc" - .include "data/maps/SlateportCity_SternsShipyard_2F/header.inc" - .include "data/maps/SlateportCity_BattleTentLobby/header.inc" - .include "data/maps/SlateportCity_BattleTentCorridor/header.inc" - .include "data/maps/SlateportCity_BattleTentBattleRoom/header.inc" - .include "data/maps/SlateportCity_House1/header.inc" - .include "data/maps/SlateportCity_PokemonFanClub/header.inc" - .include "data/maps/SlateportCity_OceanicMuseum_1F/header.inc" - .include "data/maps/SlateportCity_OceanicMuseum_2F/header.inc" - .include "data/maps/SlateportCity_Harbor/header.inc" - .include "data/maps/SlateportCity_House2/header.inc" - .include "data/maps/SlateportCity_PokemonCenter_1F/header.inc" - .include "data/maps/SlateportCity_PokemonCenter_2F/header.inc" - .include "data/maps/SlateportCity_Mart/header.inc" - .include "data/maps/MauvilleCity_Gym/header.inc" - .include "data/maps/MauvilleCity_BikeShop/header.inc" - .include "data/maps/MauvilleCity_House1/header.inc" - .include "data/maps/MauvilleCity_GameCorner/header.inc" - .include "data/maps/MauvilleCity_House2/header.inc" - .include "data/maps/MauvilleCity_PokemonCenter_1F/header.inc" - .include "data/maps/MauvilleCity_PokemonCenter_2F/header.inc" - .include "data/maps/MauvilleCity_Mart/header.inc" - .include "data/maps/RustboroCity_DevonCorp_1F/header.inc" - .include "data/maps/RustboroCity_DevonCorp_2F/header.inc" - .include "data/maps/RustboroCity_DevonCorp_3F/header.inc" - .include "data/maps/RustboroCity_Gym/header.inc" - .include "data/maps/RustboroCity_PokemonSchool/header.inc" - .include "data/maps/RustboroCity_PokemonCenter_1F/header.inc" - .include "data/maps/RustboroCity_PokemonCenter_2F/header.inc" - .include "data/maps/RustboroCity_Mart/header.inc" - .include "data/maps/RustboroCity_Flat1_1F/header.inc" - .include "data/maps/RustboroCity_Flat1_2F/header.inc" - .include "data/maps/RustboroCity_House1/header.inc" - .include "data/maps/RustboroCity_CuttersHouse/header.inc" - .include "data/maps/RustboroCity_House2/header.inc" - .include "data/maps/RustboroCity_Flat2_1F/header.inc" - .include "data/maps/RustboroCity_Flat2_2F/header.inc" - .include "data/maps/RustboroCity_Flat2_3F/header.inc" - .include "data/maps/RustboroCity_House3/header.inc" - .include "data/maps/FortreeCity_House1/header.inc" - .include "data/maps/FortreeCity_Gym/header.inc" - .include "data/maps/FortreeCity_PokemonCenter_1F/header.inc" - .include "data/maps/FortreeCity_PokemonCenter_2F/header.inc" - .include "data/maps/FortreeCity_Mart/header.inc" - .include "data/maps/FortreeCity_House2/header.inc" - .include "data/maps/FortreeCity_House3/header.inc" - .include "data/maps/FortreeCity_House4/header.inc" - .include "data/maps/FortreeCity_House5/header.inc" - .include "data/maps/FortreeCity_DecorationShop/header.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc" - .include "data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc" - .include "data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc" - .include "data/maps/LilycoveCity_ContestLobby/header.inc" - .include "data/maps/LilycoveCity_ContestHall/header.inc" - .include "data/maps/LilycoveCity_PokemonCenter_1F/header.inc" - .include "data/maps/LilycoveCity_PokemonCenter_2F/header.inc" - .include "data/maps/LilycoveCity_UnusedMart/header.inc" - .include "data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc" - .include "data/maps/LilycoveCity_Harbor/header.inc" - .include "data/maps/LilycoveCity_MoveDeletersHouse/header.inc" - .include "data/maps/LilycoveCity_House1/header.inc" - .include "data/maps/LilycoveCity_House2/header.inc" - .include "data/maps/LilycoveCity_House3/header.inc" - .include "data/maps/LilycoveCity_House4/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_1F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_2F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_3F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_4F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStore_5F/header.inc" - .include "data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc" - .include "data/maps/LilycoveCity_DepartmentStoreElevator/header.inc" - .include "data/maps/MossdeepCity_Gym/header.inc" - .include "data/maps/MossdeepCity_House1/header.inc" - .include "data/maps/MossdeepCity_House2/header.inc" - .include "data/maps/MossdeepCity_PokemonCenter_1F/header.inc" - .include "data/maps/MossdeepCity_PokemonCenter_2F/header.inc" - .include "data/maps/MossdeepCity_Mart/header.inc" - .include "data/maps/MossdeepCity_House3/header.inc" - .include "data/maps/MossdeepCity_StevensHouse/header.inc" - .include "data/maps/MossdeepCity_House4/header.inc" - .include "data/maps/MossdeepCity_SpaceCenter_1F/header.inc" - .include "data/maps/MossdeepCity_SpaceCenter_2F/header.inc" - .include "data/maps/MossdeepCity_GameCorner_1F/header.inc" - .include "data/maps/MossdeepCity_GameCorner_B1F/header.inc" - .include "data/maps/SootopolisCity_Gym_1F/header.inc" - .include "data/maps/SootopolisCity_Gym_B1F/header.inc" - .include "data/maps/SootopolisCity_PokemonCenter_1F/header.inc" - .include "data/maps/SootopolisCity_PokemonCenter_2F/header.inc" - .include "data/maps/SootopolisCity_Mart/header.inc" - .include "data/maps/SootopolisCity_House1/header.inc" - .include "data/maps/SootopolisCity_House2/header.inc" - .include "data/maps/SootopolisCity_House3/header.inc" - .include "data/maps/SootopolisCity_House4/header.inc" - .include "data/maps/SootopolisCity_House5/header.inc" - .include "data/maps/SootopolisCity_House6/header.inc" - .include "data/maps/SootopolisCity_House7/header.inc" - .include "data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc" - .include "data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc" - .include "data/maps/EverGrandeCity_SidneysRoom/header.inc" - .include "data/maps/EverGrandeCity_PhoebesRoom/header.inc" - .include "data/maps/EverGrandeCity_GlaciasRoom/header.inc" - .include "data/maps/EverGrandeCity_DrakesRoom/header.inc" - .include "data/maps/EverGrandeCity_ChampionsRoom/header.inc" - .include "data/maps/EverGrandeCity_Hall1/header.inc" - .include "data/maps/EverGrandeCity_Hall2/header.inc" - .include "data/maps/EverGrandeCity_Hall3/header.inc" - .include "data/maps/EverGrandeCity_Hall4/header.inc" - .include "data/maps/EverGrandeCity_Hall5/header.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_1F/header.inc" - .include "data/maps/EverGrandeCity_HallOfFame/header.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_1F/header.inc" - .include "data/maps/EverGrandeCity_PokemonCenter_2F/header.inc" - .include "data/maps/EverGrandeCity_PokemonLeague_2F/header.inc" - .include "data/maps/Route104_MrBrineysHouse/header.inc" - .include "data/maps/Route104_PrettyPetalFlowerShop/header.inc" - .include "data/maps/Route111_WinstrateFamilysHouse/header.inc" - .include "data/maps/Route111_OldLadysRestStop/header.inc" - .include "data/maps/Route112_CableCarStation/header.inc" - .include "data/maps/MtChimney_CableCarStation/header.inc" - .include "data/maps/Route114_FossilManiacsHouse/header.inc" - .include "data/maps/Route114_FossilManiacsTunnel/header.inc" - .include "data/maps/Route114_LanettesHouse/header.inc" - .include "data/maps/Route116_TunnelersRestHouse/header.inc" - .include "data/maps/Route117_PokemonDayCare/header.inc" - .include "data/maps/Route121_SafariZoneEntrance/header.inc" - .include "data/maps/MeteorFalls_1F_1R/header.inc" - .include "data/maps/MeteorFalls_1F_2R/header.inc" - .include "data/maps/MeteorFalls_B1F_1R/header.inc" - .include "data/maps/MeteorFalls_B1F_2R/header.inc" - .include "data/maps/RusturfTunnel/header.inc" - .include "data/maps/Underwater_SootopolisCity/header.inc" - .include "data/maps/DesertRuins/header.inc" - .include "data/maps/GraniteCave_1F/header.inc" - .include "data/maps/GraniteCave_B1F/header.inc" - .include "data/maps/GraniteCave_B2F/header.inc" - .include "data/maps/GraniteCave_StevensRoom/header.inc" - .include "data/maps/PetalburgWoods/header.inc" - .include "data/maps/MtChimney/header.inc" - .include "data/maps/JaggedPass/header.inc" - .include "data/maps/FieryPath/header.inc" - .include "data/maps/MtPyre_1F/header.inc" - .include "data/maps/MtPyre_2F/header.inc" - .include "data/maps/MtPyre_3F/header.inc" - .include "data/maps/MtPyre_4F/header.inc" - .include "data/maps/MtPyre_5F/header.inc" - .include "data/maps/MtPyre_6F/header.inc" - .include "data/maps/MtPyre_Exterior/header.inc" - .include "data/maps/MtPyre_Summit/header.inc" - .include "data/maps/AquaHideout_1F/header.inc" - .include "data/maps/AquaHideout_B1F/header.inc" - .include "data/maps/AquaHideout_B2F/header.inc" - .include "data/maps/Underwater_SeafloorCavern/header.inc" - .include "data/maps/SeafloorCavern_Entrance/header.inc" - .include "data/maps/SeafloorCavern_Room1/header.inc" - .include "data/maps/SeafloorCavern_Room2/header.inc" - .include "data/maps/SeafloorCavern_Room3/header.inc" - .include "data/maps/SeafloorCavern_Room4/header.inc" - .include "data/maps/SeafloorCavern_Room5/header.inc" - .include "data/maps/SeafloorCavern_Room6/header.inc" - .include "data/maps/SeafloorCavern_Room7/header.inc" - .include "data/maps/SeafloorCavern_Room8/header.inc" - .include "data/maps/SeafloorCavern_Room9/header.inc" - .include "data/maps/CaveOfOrigin_Entrance/header.inc" - .include "data/maps/CaveOfOrigin_1F/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc" - .include "data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc" - .include "data/maps/CaveOfOrigin_B1F/header.inc" - .include "data/maps/VictoryRoad_1F/header.inc" - .include "data/maps/VictoryRoad_B1F/header.inc" - .include "data/maps/VictoryRoad_B2F/header.inc" - .include "data/maps/ShoalCave_LowTideEntranceRoom/header.inc" - .include "data/maps/ShoalCave_LowTideInnerRoom/header.inc" - .include "data/maps/ShoalCave_LowTideStairsRoom/header.inc" - .include "data/maps/ShoalCave_LowTideLowerRoom/header.inc" - .include "data/maps/ShoalCave_HighTideEntranceRoom/header.inc" - .include "data/maps/ShoalCave_HighTideInnerRoom/header.inc" - .include "data/maps/NewMauville_Entrance/header.inc" - .include "data/maps/NewMauville_Inside/header.inc" - .include "data/maps/AbandonedShip_Deck/header.inc" - .include "data/maps/AbandonedShip_Corridors_1F/header.inc" - .include "data/maps/AbandonedShip_Rooms_1F/header.inc" - .include "data/maps/AbandonedShip_Corridors_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms2_B1F/header.inc" - .include "data/maps/AbandonedShip_Underwater1/header.inc" - .include "data/maps/AbandonedShip_Room_B1F/header.inc" - .include "data/maps/AbandonedShip_Rooms2_1F/header.inc" - .include "data/maps/AbandonedShip_CaptainsOffice/header.inc" - .include "data/maps/AbandonedShip_Underwater2/header.inc" - .include "data/maps/AbandonedShip_HiddenFloorCorridors/header.inc" - .include "data/maps/AbandonedShip_HiddenFloorRooms/header.inc" - .include "data/maps/IslandCave/header.inc" - .include "data/maps/AncientTomb/header.inc" - .include "data/maps/Underwater_Route134/header.inc" - .include "data/maps/Underwater_SealedChamber/header.inc" - .include "data/maps/SealedChamber_OuterRoom/header.inc" - .include "data/maps/SealedChamber_InnerRoom/header.inc" - .include "data/maps/ScorchedSlab/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap1/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap2/header.inc" - .include "data/maps/AquaHideout_UnusedRubyMap3/header.inc" - .include "data/maps/SkyPillar_Entrance/header.inc" - .include "data/maps/SkyPillar_Outside/header.inc" - .include "data/maps/SkyPillar_1F/header.inc" - .include "data/maps/SkyPillar_2F/header.inc" - .include "data/maps/SkyPillar_3F/header.inc" - .include "data/maps/SkyPillar_4F/header.inc" - .include "data/maps/ShoalCave_LowTideIceRoom/header.inc" - .include "data/maps/SkyPillar_5F/header.inc" - .include "data/maps/SkyPillar_Top/header.inc" - .include "data/maps/MagmaHideout_1F/header.inc" - .include "data/maps/MagmaHideout_2F_1R/header.inc" - .include "data/maps/MagmaHideout_2F_2R/header.inc" - .include "data/maps/MagmaHideout_3F_1R/header.inc" - .include "data/maps/MagmaHideout_3F_2R/header.inc" - .include "data/maps/MagmaHideout_4F/header.inc" - .include "data/maps/MagmaHideout_3F_3R/header.inc" - .include "data/maps/MagmaHideout_2F_3R/header.inc" - .include "data/maps/MirageTower_1F/header.inc" - .include "data/maps/MirageTower_2F/header.inc" - .include "data/maps/MirageTower_3F/header.inc" - .include "data/maps/MirageTower_4F/header.inc" - .include "data/maps/DesertUnderpass/header.inc" - .include "data/maps/ArtisanCave_B1F/header.inc" - .include "data/maps/ArtisanCave_1F/header.inc" - .include "data/maps/Underwater_MarineCave/header.inc" - .include "data/maps/MarineCave_Entrance/header.inc" - .include "data/maps/MarineCave_End/header.inc" - .include "data/maps/TerraCave_Entrance/header.inc" - .include "data/maps/TerraCave_End/header.inc" - .include "data/maps/AlteringCave/header.inc" - .include "data/maps/MeteorFalls_StevensCave/header.inc" - .include "data/maps/SecretBase_RedCave1/header.inc" - .include "data/maps/SecretBase_BrownCave1/header.inc" - .include "data/maps/SecretBase_BlueCave1/header.inc" - .include "data/maps/SecretBase_YellowCave1/header.inc" - .include "data/maps/SecretBase_Tree1/header.inc" - .include "data/maps/SecretBase_Shrub1/header.inc" - .include "data/maps/SecretBase_RedCave2/header.inc" - .include "data/maps/SecretBase_BrownCave2/header.inc" - .include "data/maps/SecretBase_BlueCave2/header.inc" - .include "data/maps/SecretBase_YellowCave2/header.inc" - .include "data/maps/SecretBase_Tree2/header.inc" - .include "data/maps/SecretBase_Shrub2/header.inc" - .include "data/maps/SecretBase_RedCave3/header.inc" - .include "data/maps/SecretBase_BrownCave3/header.inc" - .include "data/maps/SecretBase_BlueCave3/header.inc" - .include "data/maps/SecretBase_YellowCave3/header.inc" - .include "data/maps/SecretBase_Tree3/header.inc" - .include "data/maps/SecretBase_Shrub3/header.inc" - .include "data/maps/SecretBase_RedCave4/header.inc" - .include "data/maps/SecretBase_BrownCave4/header.inc" - .include "data/maps/SecretBase_BlueCave4/header.inc" - .include "data/maps/SecretBase_YellowCave4/header.inc" - .include "data/maps/SecretBase_Tree4/header.inc" - .include "data/maps/SecretBase_Shrub4/header.inc" - .include "data/maps/SingleBattleColosseum/header.inc" - .include "data/maps/TradeCenter/header.inc" - .include "data/maps/RecordCorner/header.inc" - .include "data/maps/DoubleBattleColosseum/header.inc" - .include "data/maps/LinkContestRoom1/header.inc" - .include "data/maps/UnknownMap_25_29/header.inc" - .include "data/maps/UnknownMap_25_30/header.inc" - .include "data/maps/UnknownMap_25_31/header.inc" - .include "data/maps/UnknownMap_25_32/header.inc" - .include "data/maps/UnknownMap_25_33/header.inc" - .include "data/maps/UnknownMap_25_34/header.inc" - .include "data/maps/LinkContestRoom2/header.inc" - .include "data/maps/LinkContestRoom3/header.inc" - .include "data/maps/LinkContestRoom4/header.inc" - .include "data/maps/LinkContestRoom5/header.inc" - .include "data/maps/LinkContestRoom6/header.inc" - .include "data/maps/InsideOfTruck/header.inc" - .include "data/maps/SSTidalCorridor/header.inc" - .include "data/maps/SSTidalLowerDeck/header.inc" - .include "data/maps/SSTidalRooms/header.inc" - .include "data/maps/BattlePyramidSquare01/header.inc" - .include "data/maps/BattlePyramidSquare02/header.inc" - .include "data/maps/BattlePyramidSquare03/header.inc" - .include "data/maps/BattlePyramidSquare04/header.inc" - .include "data/maps/BattlePyramidSquare05/header.inc" - .include "data/maps/BattlePyramidSquare06/header.inc" - .include "data/maps/BattlePyramidSquare07/header.inc" - .include "data/maps/BattlePyramidSquare08/header.inc" - .include "data/maps/BattlePyramidSquare09/header.inc" - .include "data/maps/BattlePyramidSquare10/header.inc" - .include "data/maps/BattlePyramidSquare11/header.inc" - .include "data/maps/BattlePyramidSquare12/header.inc" - .include "data/maps/BattlePyramidSquare13/header.inc" - .include "data/maps/BattlePyramidSquare14/header.inc" - .include "data/maps/BattlePyramidSquare15/header.inc" - .include "data/maps/BattlePyramidSquare16/header.inc" - .include "data/maps/UnionRoom/header.inc" - .include "data/maps/SafariZone_Northwest/header.inc" - .include "data/maps/SafariZone_North/header.inc" - .include "data/maps/SafariZone_Southwest/header.inc" - .include "data/maps/SafariZone_South/header.inc" - .include "data/maps/BattleFrontier_OutsideWest/header.inc" - .include "data/maps/BattleFrontier_BattleTowerLobby/header.inc" - .include "data/maps/BattleFrontier_BattleTowerElevator/header.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc" - .include "data/maps/SouthernIsland_Exterior/header.inc" - .include "data/maps/SouthernIsland_Interior/header.inc" - .include "data/maps/SafariZone_RestHouse/header.inc" - .include "data/maps/SafariZone_Northeast/header.inc" - .include "data/maps/SafariZone_Southeast/header.inc" - .include "data/maps/BattleFrontier_OutsideEast/header.inc" - .include "data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleTowerCorridor2/header.inc" - .include "data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc" - .include "data/maps/BattleFrontier_BattleDomeLobby/header.inc" - .include "data/maps/BattleFrontier_BattleDomeCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceCorridor/header.inc" - .include "data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc" - .include "data/maps/BattleFrontier_BattlePyramidTop/header.inc" - .include "data/maps/BattleFrontier_BattleArenaLobby/header.inc" - .include "data/maps/BattleFrontier_BattleArenaCorridor/header.inc" - .include "data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryLobby/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePikeLobby/header.inc" - .include "data/maps/BattleFrontier_BattlePikeCorridor/header.inc" - .include "data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc" - .include "data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc" - .include "data/maps/BattleFrontier_RankingHall/header.inc" - .include "data/maps/BattleFrontier_Lounge1/header.inc" - .include "data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc" - .include "data/maps/BattleFrontier_Lounge2/header.inc" - .include "data/maps/BattleFrontier_Lounge3/header.inc" - .include "data/maps/BattleFrontier_Lounge4/header.inc" - .include "data/maps/BattleFrontier_ScottsHouse/header.inc" - .include "data/maps/BattleFrontier_Lounge5/header.inc" - .include "data/maps/BattleFrontier_Lounge6/header.inc" - .include "data/maps/BattleFrontier_Lounge7/header.inc" - .include "data/maps/BattleFrontier_ReceptionGate/header.inc" - .include "data/maps/BattleFrontier_Lounge8/header.inc" - .include "data/maps/BattleFrontier_Lounge9/header.inc" - .include "data/maps/BattleFrontier_PokemonCenter_1F/header.inc" - .include "data/maps/BattleFrontier_PokemonCenter_2F/header.inc" - .include "data/maps/BattleFrontier_Mart/header.inc" - .include "data/maps/FarawayIsland_Entrance/header.inc" - .include "data/maps/FarawayIsland_Interior/header.inc" - .include "data/maps/BirthIsland_Exterior/header.inc" - .include "data/maps/BirthIsland_Harbor/header.inc" - .include "data/maps/TrainerHill_Entrance/header.inc" - .include "data/maps/TrainerHill_1F/header.inc" - .include "data/maps/TrainerHill_2F/header.inc" - .include "data/maps/TrainerHill_3F/header.inc" - .include "data/maps/TrainerHill_4F/header.inc" - .include "data/maps/TrainerHill_Roof/header.inc" - .include "data/maps/NavelRock_Exterior/header.inc" - .include "data/maps/NavelRock_Harbor/header.inc" - .include "data/maps/NavelRock_Entrance/header.inc" - .include "data/maps/NavelRock_B1F/header.inc" - .include "data/maps/NavelRock_Fork/header.inc" - .include "data/maps/NavelRock_Up1/header.inc" - .include "data/maps/NavelRock_Up2/header.inc" - .include "data/maps/NavelRock_Up3/header.inc" - .include "data/maps/NavelRock_Up4/header.inc" - .include "data/maps/NavelRock_Top/header.inc" - .include "data/maps/NavelRock_Down01/header.inc" - .include "data/maps/NavelRock_Down02/header.inc" - .include "data/maps/NavelRock_Down03/header.inc" - .include "data/maps/NavelRock_Down04/header.inc" - .include "data/maps/NavelRock_Down05/header.inc" - .include "data/maps/NavelRock_Down06/header.inc" - .include "data/maps/NavelRock_Down07/header.inc" - .include "data/maps/NavelRock_Down08/header.inc" - .include "data/maps/NavelRock_Down09/header.inc" - .include "data/maps/NavelRock_Down10/header.inc" - .include "data/maps/NavelRock_Down11/header.inc" - .include "data/maps/NavelRock_Bottom/header.inc" - .include "data/maps/TrainerHill_Elevator/header.inc" - .include "data/maps/Route104_Prototype/header.inc" - .include "data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc" - .include "data/maps/Route109_SeashoreHouse/header.inc" - .include "data/maps/Route110_TrickHouseEntrance/header.inc" - .include "data/maps/Route110_TrickHouseEnd/header.inc" - .include "data/maps/Route110_TrickHouseCorridor/header.inc" - .include "data/maps/Route110_TrickHousePuzzle1/header.inc" - .include "data/maps/Route110_TrickHousePuzzle2/header.inc" - .include "data/maps/Route110_TrickHousePuzzle3/header.inc" - .include "data/maps/Route110_TrickHousePuzzle4/header.inc" - .include "data/maps/Route110_TrickHousePuzzle5/header.inc" - .include "data/maps/Route110_TrickHousePuzzle6/header.inc" - .include "data/maps/Route110_TrickHousePuzzle7/header.inc" - .include "data/maps/Route110_TrickHousePuzzle8/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc" - .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc" - .include "data/maps/Route113_GlassWorkshop/header.inc" - .include "data/maps/Route123_BerryMastersHouse/header.inc" - .include "data/maps/Route119_WeatherInstitute_1F/header.inc" - .include "data/maps/Route119_WeatherInstitute_2F/header.inc" - .include "data/maps/Route119_House/header.inc" - .include "data/maps/Route124_DivingTreasureHuntersHouse/header.inc" diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json new file mode 100644 index 000000000..e20d1adf2 --- /dev/null +++ b/data/maps/map_groups.json @@ -0,0 +1,691 @@ +{ + "group_order": [ + "gMapGroup0", + "gMapGroup1", + "gMapGroup2", + "gMapGroup3", + "gMapGroup4", + "gMapGroup5", + "gMapGroup6", + "gMapGroup7", + "gMapGroup8", + "gMapGroup9", + "gMapGroup10", + "gMapGroup11", + "gMapGroup12", + "gMapGroup13", + "gMapGroup14", + "gMapGroup15", + "gMapGroup16", + "gMapGroup17", + "gMapGroup18", + "gMapGroup19", + "gMapGroup20", + "gMapGroup21", + "gMapGroup22", + "gMapGroup23", + "gMapGroup24", + "gMapGroup25", + "gMapGroup26", + "gMapGroup27", + "gMapGroup28", + "gMapGroup29", + "gMapGroup30", + "gMapGroup31", + "gMapGroup32", + "gMapGroup33" + ], + "gMapGroup0": [ + "PetalburgCity", + "SlateportCity", + "MauvilleCity", + "RustboroCity", + "FortreeCity", + "LilycoveCity", + "MossdeepCity", + "SootopolisCity", + "EverGrandeCity", + "LittlerootTown", + "OldaleTown", + "DewfordTown", + "LavaridgeTown", + "FallarborTown", + "VerdanturfTown", + "PacifidlogTown", + "Route101", + "Route102", + "Route103", + "Route104", + "Route105", + "Route106", + "Route107", + "Route108", + "Route109", + "Route110", + "Route111", + "Route112", + "Route113", + "Route114", + "Route115", + "Route116", + "Route117", + "Route118", + "Route119", + "Route120", + "Route121", + "Route122", + "Route123", + "Route124", + "Route125", + "Route126", + "Route127", + "Route128", + "Route129", + "Route130", + "Route131", + "Route132", + "Route133", + "Route134", + "Underwater1", + "Underwater2", + "Underwater3", + "Underwater4", + "Underwater5", + "Underwater6", + "Underwater7" + ], + "gMapGroup1": [ + "LittlerootTown_BrendansHouse_1F", + "LittlerootTown_BrendansHouse_2F", + "LittlerootTown_MaysHouse_1F", + "LittlerootTown_MaysHouse_2F", + "LittlerootTown_ProfessorBirchsLab" + ], + "gMapGroup2": [ + "OldaleTown_House1", + "OldaleTown_House2", + "OldaleTown_PokemonCenter_1F", + "OldaleTown_PokemonCenter_2F", + "OldaleTown_Mart" + ], + "gMapGroup3": [ + "DewfordTown_House1", + "DewfordTown_PokemonCenter_1F", + "DewfordTown_PokemonCenter_2F", + "DewfordTown_Gym", + "DewfordTown_Hall", + "DewfordTown_House2" + ], + "gMapGroup4": [ + "LavaridgeTown_HerbShop", + "LavaridgeTown_Gym_1F", + "LavaridgeTown_Gym_B1F", + "LavaridgeTown_House", + "LavaridgeTown_Mart", + "LavaridgeTown_PokemonCenter_1F", + "LavaridgeTown_PokemonCenter_2F" + ], + "gMapGroup5": [ + "FallarborTown_Mart", + "FallarborTown_BattleTentLobby", + "FallarborTown_BattleTentCorridor", + "FallarborTown_BattleTentBattleRoom", + "FallarborTown_PokemonCenter_1F", + "FallarborTown_PokemonCenter_2F", + "FallarborTown_House1", + "FallarborTown_House2" + ], + "gMapGroup6": [ + "VerdanturfTown_BattleTentLobby", + "VerdanturfTown_BattleTentCorridor", + "VerdanturfTown_BattleTentBattleRoom", + "VerdanturfTown_Mart", + "VerdanturfTown_PokemonCenter_1F", + "VerdanturfTown_PokemonCenter_2F", + "VerdanturfTown_WandasHouse", + "VerdanturfTown_FriendshipRatersHouse", + "VerdanturfTown_House" + ], + "gMapGroup7": [ + "PacifidlogTown_PokemonCenter_1F", + "PacifidlogTown_PokemonCenter_2F", + "PacifidlogTown_House1", + "PacifidlogTown_House2", + "PacifidlogTown_House3", + "PacifidlogTown_House4", + "PacifidlogTown_House5" + ], + "gMapGroup8": [ + "PetalburgCity_WallysHouse", + "PetalburgCity_Gym", + "PetalburgCity_House1", + "PetalburgCity_House2", + "PetalburgCity_PokemonCenter_1F", + "PetalburgCity_PokemonCenter_2F", + "PetalburgCity_Mart" + ], + "gMapGroup9": [ + "SlateportCity_SternsShipyard_1F", + "SlateportCity_SternsShipyard_2F", + "SlateportCity_BattleTentLobby", + "SlateportCity_BattleTentCorridor", + "SlateportCity_BattleTentBattleRoom", + "SlateportCity_House1", + "SlateportCity_PokemonFanClub", + "SlateportCity_OceanicMuseum_1F", + "SlateportCity_OceanicMuseum_2F", + "SlateportCity_Harbor", + "SlateportCity_House2", + "SlateportCity_PokemonCenter_1F", + "SlateportCity_PokemonCenter_2F", + "SlateportCity_Mart" + ], + "gMapGroup10": [ + "MauvilleCity_Gym", + "MauvilleCity_BikeShop", + "MauvilleCity_House1", + "MauvilleCity_GameCorner", + "MauvilleCity_House2", + "MauvilleCity_PokemonCenter_1F", + "MauvilleCity_PokemonCenter_2F", + "MauvilleCity_Mart" + ], + "gMapGroup11": [ + "RustboroCity_DevonCorp_1F", + "RustboroCity_DevonCorp_2F", + "RustboroCity_DevonCorp_3F", + "RustboroCity_Gym", + "RustboroCity_PokemonSchool", + "RustboroCity_PokemonCenter_1F", + "RustboroCity_PokemonCenter_2F", + "RustboroCity_Mart", + "RustboroCity_Flat1_1F", + "RustboroCity_Flat1_2F", + "RustboroCity_House1", + "RustboroCity_CuttersHouse", + "RustboroCity_House2", + "RustboroCity_Flat2_1F", + "RustboroCity_Flat2_2F", + "RustboroCity_Flat2_3F", + "RustboroCity_House3" + ], + "gMapGroup12": [ + "FortreeCity_House1", + "FortreeCity_Gym", + "FortreeCity_PokemonCenter_1F", + "FortreeCity_PokemonCenter_2F", + "FortreeCity_Mart", + "FortreeCity_House2", + "FortreeCity_House3", + "FortreeCity_House4", + "FortreeCity_House5", + "FortreeCity_DecorationShop" + ], + "gMapGroup13": [ + "LilycoveCity_CoveLilyMotel_1F", + "LilycoveCity_CoveLilyMotel_2F", + "LilycoveCity_LilycoveMuseum_1F", + "LilycoveCity_LilycoveMuseum_2F", + "LilycoveCity_ContestLobby", + "LilycoveCity_ContestHall", + "LilycoveCity_PokemonCenter_1F", + "LilycoveCity_PokemonCenter_2F", + "LilycoveCity_UnusedMart", + "LilycoveCity_PokemonTrainerFanClub", + "LilycoveCity_Harbor", + "LilycoveCity_MoveDeletersHouse", + "LilycoveCity_House1", + "LilycoveCity_House2", + "LilycoveCity_House3", + "LilycoveCity_House4", + "LilycoveCity_DepartmentStore_1F", + "LilycoveCity_DepartmentStore_2F", + "LilycoveCity_DepartmentStore_3F", + "LilycoveCity_DepartmentStore_4F", + "LilycoveCity_DepartmentStore_5F", + "LilycoveCity_DepartmentStoreRooftop", + "LilycoveCity_DepartmentStoreElevator" + ], + "gMapGroup14": [ + "MossdeepCity_Gym", + "MossdeepCity_House1", + "MossdeepCity_House2", + "MossdeepCity_PokemonCenter_1F", + "MossdeepCity_PokemonCenter_2F", + "MossdeepCity_Mart", + "MossdeepCity_House3", + "MossdeepCity_StevensHouse", + "MossdeepCity_House4", + "MossdeepCity_SpaceCenter_1F", + "MossdeepCity_SpaceCenter_2F", + "MossdeepCity_GameCorner_1F", + "MossdeepCity_GameCorner_B1F" + ], + "gMapGroup15": [ + "SootopolisCity_Gym_1F", + "SootopolisCity_Gym_B1F", + "SootopolisCity_PokemonCenter_1F", + "SootopolisCity_PokemonCenter_2F", + "SootopolisCity_Mart", + "SootopolisCity_House1", + "SootopolisCity_House2", + "SootopolisCity_House3", + "SootopolisCity_House4", + "SootopolisCity_House5", + "SootopolisCity_House6", + "SootopolisCity_House7", + "SootopolisCity_LotadAndSeedotHouse", + "SootopolisCity_MysteryEventsHouse_1F", + "SootopolisCity_MysteryEventsHouse_B1F" + ], + "gMapGroup16": [ + "EverGrandeCity_SidneysRoom", + "EverGrandeCity_PhoebesRoom", + "EverGrandeCity_GlaciasRoom", + "EverGrandeCity_DrakesRoom", + "EverGrandeCity_ChampionsRoom", + "EverGrandeCity_Hall1", + "EverGrandeCity_Hall2", + "EverGrandeCity_Hall3", + "EverGrandeCity_Hall4", + "EverGrandeCity_Hall5", + "EverGrandeCity_PokemonLeague_1F", + "EverGrandeCity_HallOfFame", + "EverGrandeCity_PokemonCenter_1F", + "EverGrandeCity_PokemonCenter_2F", + "EverGrandeCity_PokemonLeague_2F" + ], + "gMapGroup17": [ + "Route104_MrBrineysHouse", + "Route104_PrettyPetalFlowerShop" + ], + "gMapGroup18": [ + "Route111_WinstrateFamilysHouse", + "Route111_OldLadysRestStop" + ], + "gMapGroup19": [ + "Route112_CableCarStation", + "MtChimney_CableCarStation" + ], + "gMapGroup20": [ + "Route114_FossilManiacsHouse", + "Route114_FossilManiacsTunnel", + "Route114_LanettesHouse" + ], + "gMapGroup21": [ + "Route116_TunnelersRestHouse" + ], + "gMapGroup22": [ + "Route117_PokemonDayCare" + ], + "gMapGroup23": [ + "Route121_SafariZoneEntrance" + ], + "gMapGroup24": [ + "MeteorFalls_1F_1R", + "MeteorFalls_1F_2R", + "MeteorFalls_B1F_1R", + "MeteorFalls_B1F_2R", + "RusturfTunnel", + "Underwater_SootopolisCity", + "DesertRuins", + "GraniteCave_1F", + "GraniteCave_B1F", + "GraniteCave_B2F", + "GraniteCave_StevensRoom", + "PetalburgWoods", + "MtChimney", + "JaggedPass", + "FieryPath", + "MtPyre_1F", + "MtPyre_2F", + "MtPyre_3F", + "MtPyre_4F", + "MtPyre_5F", + "MtPyre_6F", + "MtPyre_Exterior", + "MtPyre_Summit", + "AquaHideout_1F", + "AquaHideout_B1F", + "AquaHideout_B2F", + "Underwater_SeafloorCavern", + "SeafloorCavern_Entrance", + "SeafloorCavern_Room1", + "SeafloorCavern_Room2", + "SeafloorCavern_Room3", + "SeafloorCavern_Room4", + "SeafloorCavern_Room5", + "SeafloorCavern_Room6", + "SeafloorCavern_Room7", + "SeafloorCavern_Room8", + "SeafloorCavern_Room9", + "CaveOfOrigin_Entrance", + "CaveOfOrigin_1F", + "CaveOfOrigin_UnusedRubySapphireMap1", + "CaveOfOrigin_UnusedRubySapphireMap2", + "CaveOfOrigin_UnusedRubySapphireMap3", + "CaveOfOrigin_B1F", + "VictoryRoad_1F", + "VictoryRoad_B1F", + "VictoryRoad_B2F", + "ShoalCave_LowTideEntranceRoom", + "ShoalCave_LowTideInnerRoom", + "ShoalCave_LowTideStairsRoom", + "ShoalCave_LowTideLowerRoom", + "ShoalCave_HighTideEntranceRoom", + "ShoalCave_HighTideInnerRoom", + "NewMauville_Entrance", + "NewMauville_Inside", + "AbandonedShip_Deck", + "AbandonedShip_Corridors_1F", + "AbandonedShip_Rooms_1F", + "AbandonedShip_Corridors_B1F", + "AbandonedShip_Rooms_B1F", + "AbandonedShip_Rooms2_B1F", + "AbandonedShip_Underwater1", + "AbandonedShip_Room_B1F", + "AbandonedShip_Rooms2_1F", + "AbandonedShip_CaptainsOffice", + "AbandonedShip_Underwater2", + "AbandonedShip_HiddenFloorCorridors", + "AbandonedShip_HiddenFloorRooms", + "IslandCave", + "AncientTomb", + "Underwater_Route134", + "Underwater_SealedChamber", + "SealedChamber_OuterRoom", + "SealedChamber_InnerRoom", + "ScorchedSlab", + "AquaHideout_UnusedRubyMap1", + "AquaHideout_UnusedRubyMap2", + "AquaHideout_UnusedRubyMap3", + "SkyPillar_Entrance", + "SkyPillar_Outside", + "SkyPillar_1F", + "SkyPillar_2F", + "SkyPillar_3F", + "SkyPillar_4F", + "ShoalCave_LowTideIceRoom", + "SkyPillar_5F", + "SkyPillar_Top", + "MagmaHideout_1F", + "MagmaHideout_2F_1R", + "MagmaHideout_2F_2R", + "MagmaHideout_3F_1R", + "MagmaHideout_3F_2R", + "MagmaHideout_4F", + "MagmaHideout_3F_3R", + "MagmaHideout_2F_3R", + "MirageTower_1F", + "MirageTower_2F", + "MirageTower_3F", + "MirageTower_4F", + "DesertUnderpass", + "ArtisanCave_B1F", + "ArtisanCave_1F", + "Underwater_MarineCave", + "MarineCave_Entrance", + "MarineCave_End", + "TerraCave_Entrance", + "TerraCave_End", + "AlteringCave", + "MeteorFalls_StevensCave" + ], + "gMapGroup25": [ + "SecretBase_RedCave1", + "SecretBase_BrownCave1", + "SecretBase_BlueCave1", + "SecretBase_YellowCave1", + "SecretBase_Tree1", + "SecretBase_Shrub1", + "SecretBase_RedCave2", + "SecretBase_BrownCave2", + "SecretBase_BlueCave2", + "SecretBase_YellowCave2", + "SecretBase_Tree2", + "SecretBase_Shrub2", + "SecretBase_RedCave3", + "SecretBase_BrownCave3", + "SecretBase_BlueCave3", + "SecretBase_YellowCave3", + "SecretBase_Tree3", + "SecretBase_Shrub3", + "SecretBase_RedCave4", + "SecretBase_BrownCave4", + "SecretBase_BlueCave4", + "SecretBase_YellowCave4", + "SecretBase_Tree4", + "SecretBase_Shrub4", + "SingleBattleColosseum", + "TradeCenter", + "RecordCorner", + "DoubleBattleColosseum", + "LinkContestRoom1", + "UnknownMap_25_29", + "UnknownMap_25_30", + "UnknownMap_25_31", + "UnknownMap_25_32", + "UnknownMap_25_33", + "UnknownMap_25_34", + "LinkContestRoom2", + "LinkContestRoom3", + "LinkContestRoom4", + "LinkContestRoom5", + "LinkContestRoom6", + "InsideOfTruck", + "SSTidalCorridor", + "SSTidalLowerDeck", + "SSTidalRooms", + "BattlePyramidSquare01", + "BattlePyramidSquare02", + "BattlePyramidSquare03", + "BattlePyramidSquare04", + "BattlePyramidSquare05", + "BattlePyramidSquare06", + "BattlePyramidSquare07", + "BattlePyramidSquare08", + "BattlePyramidSquare09", + "BattlePyramidSquare10", + "BattlePyramidSquare11", + "BattlePyramidSquare12", + "BattlePyramidSquare13", + "BattlePyramidSquare14", + "BattlePyramidSquare15", + "BattlePyramidSquare16", + "UnionRoom" + ], + "gMapGroup26": [ + "SafariZone_Northwest", + "SafariZone_North", + "SafariZone_Southwest", + "SafariZone_South", + "BattleFrontier_OutsideWest", + "BattleFrontier_BattleTowerLobby", + "BattleFrontier_BattleTowerElevator", + "BattleFrontier_BattleTowerCorridor", + "BattleFrontier_BattleTowerBattleRoom", + "SouthernIsland_Exterior", + "SouthernIsland_Interior", + "SafariZone_RestHouse", + "SafariZone_Northeast", + "SafariZone_Southeast", + "BattleFrontier_OutsideEast", + "BattleFrontier_BattleTowerMultiBattleRoom", + "BattleFrontier_BattleTowerCorridor2", + "BattleFrontier_BattleTowerBattleRoom2", + "BattleFrontier_BattleDomeLobby", + "BattleFrontier_BattleDomeCorridor", + "BattleFrontier_BattleDomePreBattleRoom", + "BattleFrontier_BattleDomeBattleRoom", + "BattleFrontier_BattlePalaceLobby", + "BattleFrontier_BattlePalaceCorridor", + "BattleFrontier_BattlePalaceBattleRoom", + "BattleFrontier_BattlePyramidLobby", + "BattleFrontier_BattlePyramidEmptySquare", + "BattleFrontier_BattlePyramidTop", + "BattleFrontier_BattleArenaLobby", + "BattleFrontier_BattleArenaCorridor", + "BattleFrontier_BattleArenaBattleRoom", + "BattleFrontier_BattleFactoryLobby", + "BattleFrontier_BattleFactoryPreBattleRoom", + "BattleFrontier_BattleFactoryBattleRoom", + "BattleFrontier_BattlePikeLobby", + "BattleFrontier_BattlePikeCorridor", + "BattleFrontier_BattlePikeThreePathRoom", + "BattleFrontier_BattlePikeRandomRoom1", + "BattleFrontier_BattlePikeRandomRoom2", + "BattleFrontier_BattlePikeRandomRoom3", + "BattleFrontier_RankingHall", + "BattleFrontier_Lounge1", + "BattleFrontier_BattlePointExchangeServiceCorner", + "BattleFrontier_Lounge2", + "BattleFrontier_Lounge3", + "BattleFrontier_Lounge4", + "BattleFrontier_ScottsHouse", + "BattleFrontier_Lounge5", + "BattleFrontier_Lounge6", + "BattleFrontier_Lounge7", + "BattleFrontier_ReceptionGate", + "BattleFrontier_Lounge8", + "BattleFrontier_Lounge9", + "BattleFrontier_PokemonCenter_1F", + "BattleFrontier_PokemonCenter_2F", + "BattleFrontier_Mart", + "FarawayIsland_Entrance", + "FarawayIsland_Interior", + "BirthIsland_Exterior", + "BirthIsland_Harbor", + "TrainerHill_Entrance", + "TrainerHill_1F", + "TrainerHill_2F", + "TrainerHill_3F", + "TrainerHill_4F", + "TrainerHill_Roof", + "NavelRock_Exterior", + "NavelRock_Harbor", + "NavelRock_Entrance", + "NavelRock_B1F", + "NavelRock_Fork", + "NavelRock_Up1", + "NavelRock_Up2", + "NavelRock_Up3", + "NavelRock_Up4", + "NavelRock_Top", + "NavelRock_Down01", + "NavelRock_Down02", + "NavelRock_Down03", + "NavelRock_Down04", + "NavelRock_Down05", + "NavelRock_Down06", + "NavelRock_Down07", + "NavelRock_Down08", + "NavelRock_Down09", + "NavelRock_Down10", + "NavelRock_Down11", + "NavelRock_Bottom", + "TrainerHill_Elevator" + ], + "gMapGroup27": [ + "Route104_Prototype", + "Route104_PrototypePrettyPetalFlowerShop" + ], + "gMapGroup28": [ + "Route109_SeashoreHouse" + ], + "gMapGroup29": [ + "Route110_TrickHouseEntrance", + "Route110_TrickHouseEnd", + "Route110_TrickHouseCorridor", + "Route110_TrickHousePuzzle1", + "Route110_TrickHousePuzzle2", + "Route110_TrickHousePuzzle3", + "Route110_TrickHousePuzzle4", + "Route110_TrickHousePuzzle5", + "Route110_TrickHousePuzzle6", + "Route110_TrickHousePuzzle7", + "Route110_TrickHousePuzzle8", + "Route110_SeasideCyclingRoadNorthEntrance", + "Route110_SeasideCyclingRoadSouthEntrance" + ], + "gMapGroup30": [ + "Route113_GlassWorkshop" + ], + "gMapGroup31": [ + "Route123_BerryMastersHouse" + ], + "gMapGroup32": [ + "Route119_WeatherInstitute_1F", + "Route119_WeatherInstitute_2F", + "Route119_House" + ], + "gMapGroup33": [ + "Route124_DivingTreasureHuntersHouse" + ], + "connections_include_order": [ + "LittlerootTown", + "OldaleTown", + "DewfordTown", + "LavaridgeTown", + "FallarborTown", + "VerdanturfTown", + "PacifidlogTown", + "PetalburgCity", + "SlateportCity", + "MauvilleCity", + "RustboroCity", + "FortreeCity", + "LilycoveCity", + "MossdeepCity", + "SootopolisCity", + "EverGrandeCity", + "Route101", + "Route102", + "Route103", + "Route104", + "Route105", + "Route106", + "Route107", + "Route108", + "Route109", + "Route110", + "Route111", + "Route112", + "Route113", + "Route114", + "Route115", + "Route116", + "Route117", + "Route118", + "Route119", + "Route120", + "Route121", + "Route122", + "Route123", + "Route124", + "Route125", + "Route126", + "Route127", + "Route128", + "Route129", + "Route130", + "Route131", + "Route132", + "Route133", + "Route134", + "Underwater6", + "Underwater1", + "Underwater7", + "Underwater2", + "Underwater3", + "Underwater4", + "Underwater5", + "SafariZone_Northwest", + "SafariZone_North", + "SafariZone_Southwest", + "SafariZone_South", + "SafariZone_Northeast", + "SafariZone_Southeast", + "BattleFrontier_OutsideWest", + "BattleFrontier_OutsideEast" + ] +} \ No newline at end of file diff --git a/include/constants/layouts.h b/include/constants/layouts.h index d12db9b33..45b37ff8b 100755 --- a/include/constants/layouts.h +++ b/include/constants/layouts.h @@ -443,4 +443,4 @@ #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 #define LAYOUT_UNKNOWN_MAP_08481DBC 441 -#endif // GUARD_CONSTANTS_LAYOUTS_H +#endif // GUARD_CONSTANTS_LAYOUTS_H diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h new file mode 100755 index 000000000..003b8c6ce --- /dev/null +++ b/include/constants/map_groups.h @@ -0,0 +1,592 @@ +#ifndef GUARD_CONSTANTS_MAP_GROUPS_H +#define GUARD_CONSTANTS_MAP_GROUPS_H + +// Map Group 0 +#define MAP_PETALBURG_CITY (0 | (0 << 8)) +#define MAP_SLATEPORT_CITY (1 | (0 << 8)) +#define MAP_MAUVILLE_CITY (2 | (0 << 8)) +#define MAP_RUSTBORO_CITY (3 | (0 << 8)) +#define MAP_FORTREE_CITY (4 | (0 << 8)) +#define MAP_LILYCOVE_CITY (5 | (0 << 8)) +#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) +#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) +#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) +#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) +#define MAP_OLDALE_TOWN (10 | (0 << 8)) +#define MAP_DEWFORD_TOWN (11 | (0 << 8)) +#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) +#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) +#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) +#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) +#define MAP_ROUTE101 (16 | (0 << 8)) +#define MAP_ROUTE102 (17 | (0 << 8)) +#define MAP_ROUTE103 (18 | (0 << 8)) +#define MAP_ROUTE104 (19 | (0 << 8)) +#define MAP_ROUTE105 (20 | (0 << 8)) +#define MAP_ROUTE106 (21 | (0 << 8)) +#define MAP_ROUTE107 (22 | (0 << 8)) +#define MAP_ROUTE108 (23 | (0 << 8)) +#define MAP_ROUTE109 (24 | (0 << 8)) +#define MAP_ROUTE110 (25 | (0 << 8)) +#define MAP_ROUTE111 (26 | (0 << 8)) +#define MAP_ROUTE112 (27 | (0 << 8)) +#define MAP_ROUTE113 (28 | (0 << 8)) +#define MAP_ROUTE114 (29 | (0 << 8)) +#define MAP_ROUTE115 (30 | (0 << 8)) +#define MAP_ROUTE116 (31 | (0 << 8)) +#define MAP_ROUTE117 (32 | (0 << 8)) +#define MAP_ROUTE118 (33 | (0 << 8)) +#define MAP_ROUTE119 (34 | (0 << 8)) +#define MAP_ROUTE120 (35 | (0 << 8)) +#define MAP_ROUTE121 (36 | (0 << 8)) +#define MAP_ROUTE122 (37 | (0 << 8)) +#define MAP_ROUTE123 (38 | (0 << 8)) +#define MAP_ROUTE124 (39 | (0 << 8)) +#define MAP_ROUTE125 (40 | (0 << 8)) +#define MAP_ROUTE126 (41 | (0 << 8)) +#define MAP_ROUTE127 (42 | (0 << 8)) +#define MAP_ROUTE128 (43 | (0 << 8)) +#define MAP_ROUTE129 (44 | (0 << 8)) +#define MAP_ROUTE130 (45 | (0 << 8)) +#define MAP_ROUTE131 (46 | (0 << 8)) +#define MAP_ROUTE132 (47 | (0 << 8)) +#define MAP_ROUTE133 (48 | (0 << 8)) +#define MAP_ROUTE134 (49 | (0 << 8)) +#define MAP_UNDERWATER1 (50 | (0 << 8)) +#define MAP_UNDERWATER2 (51 | (0 << 8)) +#define MAP_UNDERWATER3 (52 | (0 << 8)) +#define MAP_UNDERWATER4 (53 | (0 << 8)) +#define MAP_UNDERWATER5 (54 | (0 << 8)) +#define MAP_UNDERWATER6 (55 | (0 << 8)) +#define MAP_UNDERWATER7 (56 | (0 << 8)) + +// Map Group 1 +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) +#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) + +// Map Group 2 +#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) +#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) +#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) +#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) + +// Map Group 3 +#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) +#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) +#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) +#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) + +// Map Group 4 +#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) +#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) + +// Map Group 5 +#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_HOUSE1 (6 | (5 << 8)) +#define MAP_FALLARBOR_TOWN_HOUSE2 (7 | (5 << 8)) + +// Map Group 6 +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) +#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) + +// Map Group 7 +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) +#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) + +// Map Group 8 +#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) +#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) +#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) +#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) +#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) +#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) + +// Map Group 9 +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) +#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) +#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) +#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) +#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) +#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) +#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) + +// Map Group 10 +#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) +#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) +#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) +#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) +#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) +#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) + +// Map Group 11 +#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) +#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) +#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) +#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) +#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) +#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) +#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) +#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) + +// Map Group 12 +#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) +#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) +#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) +#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) +#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) +#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) + +// Map Group 13 +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) +#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) +#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) +#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) +#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) +#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) +#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) +#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) +#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) + +// Map Group 14 +#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) +#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) + +// Map Group 15 +#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) +#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) + +// Map Group 16 +#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) +#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) + +// Map Group 17 +#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) +#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) + +// Map Group 18 +#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) +#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) + +// Map Group 19 +#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) +#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) + +// Map Group 20 +#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) +#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) +#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) + +// Map Group 21 +#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) + +// Map Group 22 +#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) + +// Map Group 23 +#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) + +// Map Group 24 +#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) +#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) +#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) +#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) +#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) +#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) +#define MAP_DESERT_RUINS (6 | (24 << 8)) +#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) +#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) +#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) +#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) +#define MAP_PETALBURG_WOODS (11 | (24 << 8)) +#define MAP_MT_CHIMNEY (12 | (24 << 8)) +#define MAP_JAGGED_PASS (13 | (24 << 8)) +#define MAP_FIERY_PATH (14 | (24 << 8)) +#define MAP_MT_PYRE_1F (15 | (24 << 8)) +#define MAP_MT_PYRE_2F (16 | (24 << 8)) +#define MAP_MT_PYRE_3F (17 | (24 << 8)) +#define MAP_MT_PYRE_4F (18 | (24 << 8)) +#define MAP_MT_PYRE_5F (19 | (24 << 8)) +#define MAP_MT_PYRE_6F (20 | (24 << 8)) +#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) +#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) +#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) +#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) +#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) +#define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) +#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) +#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) +#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) +#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) +#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) +#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) +#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) +#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) +#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) +#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) +#define MAP_ISLAND_CAVE (67 | (24 << 8)) +#define MAP_ANCIENT_TOMB (68 | (24 << 8)) +#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) +#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) +#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) +#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) +#define MAP_SCORCHED_SLAB (73 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 (74 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 (75 | (24 << 8)) +#define MAP_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 (76 | (24 << 8)) +#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) +#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) +#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) +#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) +#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) +#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) +#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) +#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) +#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) +#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) +#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) +#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) +#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) +#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) +#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) +#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) +#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) +#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) +#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) +#define MAP_MARINE_CAVE_END (103 | (24 << 8)) +#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) +#define MAP_TERRA_CAVE_END (105 | (24 << 8)) +#define MAP_ALTERING_CAVE (106 | (24 << 8)) +#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) + +// Map Group 25 +#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) +#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) +#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) +#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) +#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) +#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) +#define MAP_TRADE_CENTER (25 | (25 << 8)) +#define MAP_RECORD_CORNER (26 | (25 << 8)) +#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) +#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) +#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) +#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) +#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) +#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) +#define MAP_UNION_ROOM (60 | (25 << 8)) + +// Map Group 26 +#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) +#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) +#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) +#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) +#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) +#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) +#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) +#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) +#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) +#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) +#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) +#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) +#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) +#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) +#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) +#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) +#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) +#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) +#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) +#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) +#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) +#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) +#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) +#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) + +// Map Group 27 +#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) +#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) + +// Map Group 28 +#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) + +// Map Group 29 +#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) +#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) +#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) + +// Map Group 30 +#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) + +// Map Group 31 +#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) + +// Map Group 32 +#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) +#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) +#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) + +// Map Group 33 +#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) + +#define MAP_GROUPS_COUNT 34 + +#endif // GUARD_CONSTANTS_MAP_GROUPS_H diff --git a/include/constants/maps.h b/include/constants/maps.h index c65f373af..e1e2da992 100644 --- a/include/constants/maps.h +++ b/include/constants/maps.h @@ -1,598 +1,11 @@ #ifndef GUARD_CONSTANTS_MAPS_H #define GUARD_CONSTANTS_MAPS_H -// Map Group 0 -#define MAP_PETALBURG_CITY (0 | (0 << 8)) -#define MAP_SLATEPORT_CITY (1 | (0 << 8)) -#define MAP_MAUVILLE_CITY (2 | (0 << 8)) -#define MAP_RUSTBORO_CITY (3 | (0 << 8)) -#define MAP_FORTREE_CITY (4 | (0 << 8)) -#define MAP_LILYCOVE_CITY (5 | (0 << 8)) -#define MAP_MOSSDEEP_CITY (6 | (0 << 8)) -#define MAP_SOOTOPOLIS_CITY (7 | (0 << 8)) -#define MAP_EVER_GRANDE_CITY (8 | (0 << 8)) -#define MAP_LITTLEROOT_TOWN (9 | (0 << 8)) -#define MAP_OLDALE_TOWN (10 | (0 << 8)) -#define MAP_DEWFORD_TOWN (11 | (0 << 8)) -#define MAP_LAVARIDGE_TOWN (12 | (0 << 8)) -#define MAP_FALLARBOR_TOWN (13 | (0 << 8)) -#define MAP_VERDANTURF_TOWN (14 | (0 << 8)) -#define MAP_PACIFIDLOG_TOWN (15 | (0 << 8)) -#define MAP_ROUTE101 (16 | (0 << 8)) -#define MAP_ROUTE102 (17 | (0 << 8)) -#define MAP_ROUTE103 (18 | (0 << 8)) -#define MAP_ROUTE104 (19 | (0 << 8)) -#define MAP_ROUTE105 (20 | (0 << 8)) -#define MAP_ROUTE106 (21 | (0 << 8)) -#define MAP_ROUTE107 (22 | (0 << 8)) -#define MAP_ROUTE108 (23 | (0 << 8)) -#define MAP_ROUTE109 (24 | (0 << 8)) -#define MAP_ROUTE110 (25 | (0 << 8)) -#define MAP_ROUTE111 (26 | (0 << 8)) -#define MAP_ROUTE112 (27 | (0 << 8)) -#define MAP_ROUTE113 (28 | (0 << 8)) -#define MAP_ROUTE114 (29 | (0 << 8)) -#define MAP_ROUTE115 (30 | (0 << 8)) -#define MAP_ROUTE116 (31 | (0 << 8)) -#define MAP_ROUTE117 (32 | (0 << 8)) -#define MAP_ROUTE118 (33 | (0 << 8)) -#define MAP_ROUTE119 (34 | (0 << 8)) -#define MAP_ROUTE120 (35 | (0 << 8)) -#define MAP_ROUTE121 (36 | (0 << 8)) -#define MAP_ROUTE122 (37 | (0 << 8)) -#define MAP_ROUTE123 (38 | (0 << 8)) -#define MAP_ROUTE124 (39 | (0 << 8)) -#define MAP_ROUTE125 (40 | (0 << 8)) -#define MAP_ROUTE126 (41 | (0 << 8)) -#define MAP_ROUTE127 (42 | (0 << 8)) -#define MAP_ROUTE128 (43 | (0 << 8)) -#define MAP_ROUTE129 (44 | (0 << 8)) -#define MAP_ROUTE130 (45 | (0 << 8)) -#define MAP_ROUTE131 (46 | (0 << 8)) -#define MAP_ROUTE132 (47 | (0 << 8)) -#define MAP_ROUTE133 (48 | (0 << 8)) -#define MAP_ROUTE134 (49 | (0 << 8)) -#define MAP_UNDERWATER1 (50 | (0 << 8)) -#define MAP_UNDERWATER2 (51 | (0 << 8)) -#define MAP_UNDERWATER3 (52 | (0 << 8)) -#define MAP_UNDERWATER4 (53 | (0 << 8)) -#define MAP_UNDERWATER5 (54 | (0 << 8)) -#define MAP_UNDERWATER6 (55 | (0 << 8)) -#define MAP_UNDERWATER7 (56 | (0 << 8)) - -// Map Group 1 -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F (1 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F (2 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F (3 | (1 << 8)) -#define MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB (4 | (1 << 8)) - -// Map Group 2 -#define MAP_OLDALE_TOWN_HOUSE1 (0 | (2 << 8)) -#define MAP_OLDALE_TOWN_HOUSE2 (1 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_1F (2 | (2 << 8)) -#define MAP_OLDALE_TOWN_POKEMON_CENTER_2F (3 | (2 << 8)) -#define MAP_OLDALE_TOWN_MART (4 | (2 << 8)) - -// Map Group 3 -#define MAP_DEWFORD_TOWN_HOUSE1 (0 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_1F (1 | (3 << 8)) -#define MAP_DEWFORD_TOWN_POKEMON_CENTER_2F (2 | (3 << 8)) -#define MAP_DEWFORD_TOWN_GYM (3 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HALL (4 | (3 << 8)) -#define MAP_DEWFORD_TOWN_HOUSE2 (5 | (3 << 8)) - -// Map Group 4 -#define MAP_LAVARIDGE_TOWN_HERB_SHOP (0 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_1F (1 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_GYM_B1F (2 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_HOUSE (3 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_MART (4 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F (5 | (4 << 8)) -#define MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F (6 | (4 << 8)) - -// Map Group 5 -#define MAP_FALLARBOR_TOWN_MART (0 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY (1 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_CORRIDOR (2 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM (3 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F (4 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F (5 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_HOUSE1 (6 | (5 << 8)) -#define MAP_FALLARBOR_TOWN_HOUSE2 (7 | (5 << 8)) - -// Map Group 6 -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY (0 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_CORRIDOR (1 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM (2 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_MART (3 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F (4 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F (5 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_WANDAS_HOUSE (6 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE (7 | (6 << 8)) -#define MAP_VERDANTURF_TOWN_HOUSE (8 | (6 << 8)) - -// Map Group 7 -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F (0 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F (1 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE1 (2 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE2 (3 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE3 (4 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE4 (5 | (7 << 8)) -#define MAP_PACIFIDLOG_TOWN_HOUSE5 (6 | (7 << 8)) - -// Map Group 8 -#define MAP_PETALBURG_CITY_WALLYS_HOUSE (0 | (8 << 8)) -#define MAP_PETALBURG_CITY_GYM (1 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE1 (2 | (8 << 8)) -#define MAP_PETALBURG_CITY_HOUSE2 (3 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_1F (4 | (8 << 8)) -#define MAP_PETALBURG_CITY_POKEMON_CENTER_2F (5 | (8 << 8)) -#define MAP_PETALBURG_CITY_MART (6 | (8 << 8)) - -// Map Group 9 -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F (0 | (9 << 8)) -#define MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F (1 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY (2 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR (3 | (9 << 8)) -#define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE1 (5 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB (6 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F (7 | (9 << 8)) -#define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F (8 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HARBOR (9 | (9 << 8)) -#define MAP_SLATEPORT_CITY_HOUSE2 (10 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F (11 | (9 << 8)) -#define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F (12 | (9 << 8)) -#define MAP_SLATEPORT_CITY_MART (13 | (9 << 8)) - -// Map Group 10 -#define MAP_MAUVILLE_CITY_GYM (0 | (10 << 8)) -#define MAP_MAUVILLE_CITY_BIKE_SHOP (1 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE1 (2 | (10 << 8)) -#define MAP_MAUVILLE_CITY_GAME_CORNER (3 | (10 << 8)) -#define MAP_MAUVILLE_CITY_HOUSE2 (4 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_1F (5 | (10 << 8)) -#define MAP_MAUVILLE_CITY_POKEMON_CENTER_2F (6 | (10 << 8)) -#define MAP_MAUVILLE_CITY_MART (7 | (10 << 8)) - -// Map Group 11 -#define MAP_RUSTBORO_CITY_DEVON_CORP_1F (0 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_2F (1 | (11 << 8)) -#define MAP_RUSTBORO_CITY_DEVON_CORP_3F (2 | (11 << 8)) -#define MAP_RUSTBORO_CITY_GYM (3 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_SCHOOL (4 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_1F (5 | (11 << 8)) -#define MAP_RUSTBORO_CITY_POKEMON_CENTER_2F (6 | (11 << 8)) -#define MAP_RUSTBORO_CITY_MART (7 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_1F (8 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT1_2F (9 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE1 (10 | (11 << 8)) -#define MAP_RUSTBORO_CITY_CUTTERS_HOUSE (11 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE2 (12 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_1F (13 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_2F (14 | (11 << 8)) -#define MAP_RUSTBORO_CITY_FLAT2_3F (15 | (11 << 8)) -#define MAP_RUSTBORO_CITY_HOUSE3 (16 | (11 << 8)) - -// Map Group 12 -#define MAP_FORTREE_CITY_HOUSE1 (0 | (12 << 8)) -#define MAP_FORTREE_CITY_GYM (1 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_1F (2 | (12 << 8)) -#define MAP_FORTREE_CITY_POKEMON_CENTER_2F (3 | (12 << 8)) -#define MAP_FORTREE_CITY_MART (4 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE2 (5 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE3 (6 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE4 (7 | (12 << 8)) -#define MAP_FORTREE_CITY_HOUSE5 (8 | (12 << 8)) -#define MAP_FORTREE_CITY_DECORATION_SHOP (9 | (12 << 8)) - -// Map Group 13 -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F (0 | (13 << 8)) -#define MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F (1 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F (2 | (13 << 8)) -#define MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F (3 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_LOBBY (4 | (13 << 8)) -#define MAP_LILYCOVE_CITY_CONTEST_HALL (5 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_1F (6 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_CENTER_2F (7 | (13 << 8)) -#define MAP_LILYCOVE_CITY_UNUSED_MART (8 | (13 << 8)) -#define MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB (9 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HARBOR (10 | (13 << 8)) -#define MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE (11 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE1 (12 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE2 (13 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE3 (14 | (13 << 8)) -#define MAP_LILYCOVE_CITY_HOUSE4 (15 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F (16 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F (17 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F (18 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F (19 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F (20 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP (21 | (13 << 8)) -#define MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR (22 | (13 << 8)) - -// Map Group 14 -#define MAP_MOSSDEEP_CITY_GYM (0 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE1 (1 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE2 (2 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F (3 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F (4 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_MART (5 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE3 (6 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_STEVENS_HOUSE (7 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_HOUSE4 (8 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_1F (9 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_SPACE_CENTER_2F (10 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_1F (11 | (14 << 8)) -#define MAP_MOSSDEEP_CITY_GAME_CORNER_B1F (12 | (14 << 8)) - -// Map Group 15 -#define MAP_SOOTOPOLIS_CITY_GYM_1F (0 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_GYM_B1F (1 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F (2 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F (3 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MART (4 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE1 (5 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE2 (6 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE3 (7 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE4 (8 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE5 (9 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE6 (10 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_HOUSE7 (11 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE (12 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F (13 | (15 << 8)) -#define MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F (14 | (15 << 8)) - -// Map Group 16 -#define MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM (0 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_PHOEBES_ROOM (1 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F (13 | (16 << 8)) -#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F (14 | (16 << 8)) - -// Map Group 17 -#define MAP_ROUTE104_MR_BRINEYS_HOUSE (0 | (17 << 8)) -#define MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP (1 | (17 << 8)) - -// Map Group 18 -#define MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE (0 | (18 << 8)) -#define MAP_ROUTE111_OLD_LADYS_REST_STOP (1 | (18 << 8)) - -// Map Group 19 -#define MAP_ROUTE112_CABLE_CAR_STATION (0 | (19 << 8)) -#define MAP_MT_CHIMNEY_CABLE_CAR_STATION (1 | (19 << 8)) - -// Map Group 20 -#define MAP_ROUTE114_FOSSIL_MANIACS_HOUSE (0 | (20 << 8)) -#define MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL (1 | (20 << 8)) -#define MAP_ROUTE114_LANETTES_HOUSE (2 | (20 << 8)) - -// Map Group 21 -#define MAP_ROUTE116_TUNNELERS_REST_HOUSE (0 | (21 << 8)) - -// Map Group 22 -#define MAP_ROUTE117_POKEMON_DAY_CARE (0 | (22 << 8)) - -// Map Group 23 -#define MAP_ROUTE121_SAFARI_ZONE_ENTRANCE (0 | (23 << 8)) - -// Map Group 24 -#define MAP_METEOR_FALLS_1F_1R (0 | (24 << 8)) -#define MAP_METEOR_FALLS_1F_2R (1 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_1R (2 | (24 << 8)) -#define MAP_METEOR_FALLS_B1F_2R (3 | (24 << 8)) -#define MAP_RUSTURF_TUNNEL (4 | (24 << 8)) -#define MAP_UNDERWATER_SOOTOPOLIS_CITY (5 | (24 << 8)) -#define MAP_DESERT_RUINS (6 | (24 << 8)) -#define MAP_GRANITE_CAVE_1F (7 | (24 << 8)) -#define MAP_GRANITE_CAVE_B1F (8 | (24 << 8)) -#define MAP_GRANITE_CAVE_B2F (9 | (24 << 8)) -#define MAP_GRANITE_CAVE_STEVENS_ROOM (10 | (24 << 8)) -#define MAP_PETALBURG_WOODS (11 | (24 << 8)) -#define MAP_MT_CHIMNEY (12 | (24 << 8)) -#define MAP_JAGGED_PASS (13 | (24 << 8)) -#define MAP_FIERY_PATH (14 | (24 << 8)) -#define MAP_MT_PYRE_1F (15 | (24 << 8)) -#define MAP_MT_PYRE_2F (16 | (24 << 8)) -#define MAP_MT_PYRE_3F (17 | (24 << 8)) -#define MAP_MT_PYRE_4F (18 | (24 << 8)) -#define MAP_MT_PYRE_5F (19 | (24 << 8)) -#define MAP_MT_PYRE_6F (20 | (24 << 8)) -#define MAP_MT_PYRE_EXTERIOR (21 | (24 << 8)) -#define MAP_MT_PYRE_SUMMIT (22 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_1F (23 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B1F (24 | (24 << 8)) -#define MAP_AQUA_HIDEOUT_B2F (25 | (24 << 8)) -#define MAP_UNDERWATER_SEAFLOOR_CAVERN (26 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ENTRANCE (27 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM1 (28 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM2 (29 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM3 (30 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM4 (31 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM5 (32 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM6 (33 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM7 (34 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM8 (35 | (24 << 8)) -#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) // -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) // -#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) -#define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) -#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) -#define MAP_VICTORY_ROAD_B2F (45 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM (46 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM (47 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM (48 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM (49 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM (50 | (24 << 8)) -#define MAP_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM (51 | (24 << 8)) -#define MAP_NEW_MAUVILLE_ENTRANCE (52 | (24 << 8)) -#define MAP_NEW_MAUVILLE_INSIDE (53 | (24 << 8)) -#define MAP_ABANDONED_SHIP_DECK (54 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_1F (55 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_1F (56 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CORRIDORS_B1F (57 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS_B1F (58 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_B1F (59 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER1 (60 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOM_B1F (61 | (24 << 8)) -#define MAP_ABANDONED_SHIP_ROOMS2_1F (62 | (24 << 8)) -#define MAP_ABANDONED_SHIP_CAPTAINS_OFFICE (63 | (24 << 8)) -#define MAP_ABANDONED_SHIP_UNDERWATER2 (64 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS (65 | (24 << 8)) -#define MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS (66 | (24 << 8)) -#define MAP_ISLAND_CAVE (67 | (24 << 8)) -#define MAP_ANCIENT_TOMB (68 | (24 << 8)) -#define MAP_UNDERWATER_ROUTE134 (69 | (24 << 8)) -#define MAP_UNDERWATER_SEALED_CHAMBER (70 | (24 << 8)) -#define MAP_SEALED_CHAMBER_OUTER_ROOM (71 | (24 << 8)) -#define MAP_SEALED_CHAMBER_INNER_ROOM (72 | (24 << 8)) -#define MAP_SCORCHED_SLAB (73 | (24 << 8)) -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_1F (74 | (24 << 8)) // -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B1F (75 | (24 << 8)) // Ruby/Sapphire leftovers -#define MAP_UNUSED_RUBY_MAGMA_HIDEOUT_B2F (76 | (24 << 8)) // -#define MAP_SKY_PILLAR_ENTRANCE (77 | (24 << 8)) -#define MAP_SKY_PILLAR_OUTSIDE (78 | (24 << 8)) -#define MAP_SKY_PILLAR_1F (79 | (24 << 8)) -#define MAP_SKY_PILLAR_2F (80 | (24 << 8)) -#define MAP_SKY_PILLAR_3F (81 | (24 << 8)) -#define MAP_SKY_PILLAR_4F (82 | (24 << 8)) -#define MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM (83 | (24 << 8)) -#define MAP_SKY_PILLAR_5F (84 | (24 << 8)) -#define MAP_SKY_PILLAR_TOP (85 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_1F (86 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_1R (87 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_2R (88 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_1R (89 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_2R (90 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_4F (91 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_3F_3R (92 | (24 << 8)) -#define MAP_MAGMA_HIDEOUT_2F_3R (93 | (24 << 8)) -#define MAP_MIRAGE_TOWER_1F (94 | (24 << 8)) -#define MAP_MIRAGE_TOWER_2F (95 | (24 << 8)) -#define MAP_MIRAGE_TOWER_3F (96 | (24 << 8)) -#define MAP_MIRAGE_TOWER_4F (97 | (24 << 8)) -#define MAP_DESERT_UNDERPASS (98 | (24 << 8)) -#define MAP_ARTISAN_CAVE_B1F (99 | (24 << 8)) -#define MAP_ARTISAN_CAVE_1F (100 | (24 << 8)) -#define MAP_UNDERWATER_MARINE_CAVE (101 | (24 << 8)) -#define MAP_MARINE_CAVE_ENTRANCE (102 | (24 << 8)) -#define MAP_MARINE_CAVE_END (103 | (24 << 8)) -#define MAP_TERRA_CAVE_ENTRANCE (104 | (24 << 8)) -#define MAP_TERRA_CAVE_END (105 | (24 << 8)) -#define MAP_ALTERING_CAVE (106 | (24 << 8)) -#define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) - -// Map Group 25 -#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) -#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) -#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) -#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) -#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) -#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) -#define MAP_TRADE_CENTER (25 | (25 << 8)) -#define MAP_RECORD_CORNER (26 | (25 << 8)) -#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) -#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) -#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) -#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) -#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) -#define MAP_UNION_ROOM (60 | (25 << 8)) - -// Map Group 26 -#define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTH (1 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHWEST (2 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTH (3 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_WEST (4 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY (5 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR (6 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR (7 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM (8 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_EXTERIOR (9 | (26 << 8)) -#define MAP_SOUTHERN_ISLAND_INTERIOR (10 | (26 << 8)) -#define MAP_SAFARI_ZONE_REST_HOUSE (11 | (26 << 8)) -#define MAP_SAFARI_ZONE_NORTHEAST (12 | (26 << 8)) -#define MAP_SAFARI_ZONE_SOUTHEAST (13 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_OUTSIDE_EAST (14 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM (15 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 (16 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM2 (17 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY (18 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR (19 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM (20 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM (21 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY (22 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM (30 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY (31 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM (32 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM (33 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY (34 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR (35 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM (36 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 (37 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 (38 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 (39 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RANKING_HALL (40 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE1 (41 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER (42 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE2 (43 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE3 (44 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE4 (45 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_SCOTTS_HOUSE (46 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE5 (47 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE6 (48 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE7 (49 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_RECEPTION_GATE (50 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE8 (51 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_LOUNGE9 (52 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F (53 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F (54 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_MART (55 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_ENTRANCE (56 | (26 << 8)) -#define MAP_FARAWAY_ISLAND_INTERIOR (57 | (26 << 8)) -#define MAP_BIRTH_ISLAND_EXTERIOR (58 | (26 << 8)) -#define MAP_BIRTH_ISLAND_HARBOR (59 | (26 << 8)) -#define MAP_TRAINER_HILL_ENTRANCE (60 | (26 << 8)) -#define MAP_TRAINER_HILL_1F (61 | (26 << 8)) -#define MAP_TRAINER_HILL_2F (62 | (26 << 8)) -#define MAP_TRAINER_HILL_3F (63 | (26 << 8)) -#define MAP_TRAINER_HILL_4F (64 | (26 << 8)) -#define MAP_TRAINER_HILL_ROOF (65 | (26 << 8)) -#define MAP_NAVEL_ROCK_EXTERIOR (66 | (26 << 8)) -#define MAP_NAVEL_ROCK_HARBOR (67 | (26 << 8)) -#define MAP_NAVEL_ROCK_ENTRANCE (68 | (26 << 8)) -#define MAP_NAVEL_ROCK_B1F (69 | (26 << 8)) -#define MAP_NAVEL_ROCK_FORK (70 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP1 (71 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP2 (72 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP3 (73 | (26 << 8)) -#define MAP_NAVEL_ROCK_UP4 (74 | (26 << 8)) -#define MAP_NAVEL_ROCK_TOP (75 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN01 (76 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN02 (77 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN03 (78 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN04 (79 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN05 (80 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN06 (81 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN07 (82 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN08 (83 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN09 (84 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN10 (85 | (26 << 8)) -#define MAP_NAVEL_ROCK_DOWN11 (86 | (26 << 8)) -#define MAP_NAVEL_ROCK_BOTTOM (87 | (26 << 8)) -#define MAP_TRAINER_HILL_ELEVATOR (88 | (26 << 8)) - -// Map Group 27 -#define MAP_ROUTE104_PROTOTYPE (0 | (27 << 8)) -#define MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP (1 | (27 << 8)) - -// Map Group 28 -#define MAP_ROUTE109_SEASHORE_HOUSE (0 | (28 << 8)) - -// Map Group 29 -#define MAP_ROUTE110_TRICK_HOUSE_ENTRANCE (0 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_END (1 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_CORRIDOR (2 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 (3 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE2 (4 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE3 (5 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE4 (6 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE5 (7 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) -#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8)) -#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8)) - -// Map Group 30 -#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) - -// Map Group 31 -#define MAP_ROUTE123_BERRY_MASTERS_HOUSE (0 | (31 << 8)) - -// Map Group 32 -#define MAP_ROUTE119_WEATHER_INSTITUTE_1F (0 | (32 << 8)) -#define MAP_ROUTE119_WEATHER_INSTITUTE_2F (1 | (32 << 8)) -#define MAP_ROUTE119_HOUSE (2 | (32 << 8)) - -// Map Group 33 -#define MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE (0 | (33 << 8)) - -#define MAP_GROUPS_COUNT 34 +#include "map_groups.h" #define MAP_NONE (0x7F | (0x7F << 8)) #define MAP_UNDEFINED (0xFF | (0xFF << 8)) - #define MAP_GROUP(map) (MAP_##map >> 8) #define MAP_NUM(map) (MAP_##map & 0xFF) diff --git a/map_data_rules.mk b/map_data_rules.mk new file mode 100755 index 000000000..6d133eb50 --- /dev/null +++ b/map_data_rules.mk @@ -0,0 +1,31 @@ +# Map JSON data + +MAPS_DIR = $(DATA_ASM_SUBDIR)/maps +LAYOUTS_DIR = $(DATA_ASM_SUBDIR)/layouts + +MAP_DIRS := $(dir $(wildcard $(MAPS_DIR)/*/)) +MAP_CONNECTIONS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/connections.inc,$(MAP_DIRS)) +MAP_EVENTS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/events.inc,$(MAP_DIRS)) +MAP_HEADERS := $(patsubst $(MAPS_DIR)/%/,$(MAPS_DIR)/%/header.inc,$(MAP_DIRS)) + +$(DATA_ASM_BUILDDIR)/maps.o: $(DATA_ASM_SUBDIR)/maps.s $(LAYOUTS_DIR)/layouts.inc $(LAYOUTS_DIR)/layouts_table.inc $(MAPS_DIR)/headers.inc $(MAPS_DIR)/groups.inc $(MAPS_DIR)/connections.inc $(MAP_CONNECTIONS) $(MAP_HEADERS) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ +$(DATA_ASM_BUILDDIR)/map_events.o: $(DATA_ASM_SUBDIR)/map_events.s $(MAPS_DIR)/events.inc $(MAP_EVENTS) + $(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@ + +$(MAPS_DIR)/%/header.inc: $(MAPS_DIR)/%/map.json + $(MAPJSON) map $< $(LAYOUTS_DIR)/layouts.json +$(MAPS_DIR)/%/events.inc: $(MAPS_DIR)/%/header.inc ; +$(MAPS_DIR)/%/connections.inc: $(MAPS_DIR)/%/events.inc ; + +$(MAPS_DIR)/groups.inc: $(MAPS_DIR)/map_groups.json + $(MAPJSON) groups $< +$(MAPS_DIR)/connections.inc: $(MAPS_DIR)/groups.inc ; +$(MAPS_DIR)/events.inc: $(MAPS_DIR)/connections.inc ; +$(MAPS_DIR)/headers.inc: $(MAPS_DIR)/events.inc ; +include/constants/map_groups.h: $(MAPS_DIR)/headers.inc ; + +$(LAYOUTS_DIR)/layouts.inc: $(LAYOUTS_DIR)/layouts.json + $(MAPJSON) layouts $< +$(LAYOUTS_DIR)/layouts_table.inc: $(LAYOUTS_DIR)/layouts.inc ; +include/constants/layouts.h: $(LAYOUTS_DIR)/layouts_table.inc ; diff --git a/src/battle_factory.c b/src/battle_factory.c index 5793c78e9..c025dc139 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -11,6 +11,7 @@ #include "constants/species.h" #include "constants/battle_ai.h" #include "constants/battle_frontier.h" +#include "constants/layouts.h" #include "constants/trainers.h" #include "constants/moves.h" @@ -662,7 +663,8 @@ static u8 GetStyleForMove(u16 move) bool8 sub_81A6BF4(void) { - return (gMapHeader.mapLayoutId == 347 || gMapHeader.mapLayoutId == 348); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM; } static void sub_81A6C1C(void) diff --git a/src/battle_pike.c b/src/battle_pike.c index c12038efb..bdf6e8027 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -16,6 +16,7 @@ #include "constants/event_objects.h" #include "constants/battle_frontier.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" #include "constants/species.h" @@ -1314,8 +1315,10 @@ static void sub_81A8090(void) bool8 InBattlePike(void) { - return (gMapHeader.mapLayoutId == 351 || gMapHeader.mapLayoutId == 352 - || gMapHeader.mapLayoutId == 358 || gMapHeader.mapLayoutId == 359); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 + || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; } static void sub_81A80DC(void) diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index c0ff1ecf5..ed911d8d9 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -30,6 +30,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/species.h" @@ -1380,9 +1381,9 @@ u8 GetPyramidRunMultiplier(void) u8 InBattlePyramid(void) { - if (gMapHeader.mapLayoutId == 361) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) return 1; - else if (gMapHeader.mapLayoutId == 378) + else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) return 2; else return FALSE; @@ -1390,7 +1391,8 @@ u8 InBattlePyramid(void) bool8 InBattlePyramid_(void) { - return (gMapHeader.mapLayoutId == 361 || gMapHeader.mapLayoutId == 378); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP; } void sub_81A9E90(void) diff --git a/src/battle_tent.c b/src/battle_tent.c index de4d9d374..cb8149253 100644 --- a/src/battle_tent.c +++ b/src/battle_tent.c @@ -12,6 +12,7 @@ #include "frontier_util.h" #include "string_util.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/region_map_sections.h" #include "constants/species.h" @@ -270,8 +271,8 @@ static void sub_81B9E88(void) bool8 sub_81B9E94(void) { - return (gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY - && ((gMapHeader.mapLayoutId == 385) | (gMapHeader.mapLayoutId == 386))); + return gMapHeader.regionMapSectionId == MAPSEC_SLATEPORT_CITY + && (gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_CORRIDOR || gMapHeader.mapLayoutId == LAYOUT_BATTLE_TENT_BATTLE_ROOM); } static void sub_81B9EC0(void) diff --git a/src/map_name_popup.c b/src/map_name_popup.c index c13747006..0d88815c0 100644 --- a/src/map_name_popup.c +++ b/src/map_name_popup.c @@ -1,6 +1,4 @@ #include "global.h" -#include "constants/region_map_sections.h" -#include "constants/weather.h" #include "bg.h" #include "event_data.h" #include "gpu_regs.h" @@ -14,6 +12,9 @@ #include "string_util.h" #include "task.h" #include "text.h" +#include "constants/layouts.h" +#include "constants/region_map_sections.h" +#include "constants/weather.h" // enums enum MapPopUp_Themes @@ -305,7 +306,7 @@ static void ShowMapNamePopUpWindow(void) if (InBattlePyramid()) { - if (gMapHeader.mapLayoutId == 0x17A) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) { withoutPrefixPtr = &(mapDisplayHeader[3]); mapDisplayHeaderSource = gBattlePyramid_MapHeaderStrings[7]; diff --git a/src/overworld.c b/src/overworld.c index a67b4b68f..8d4c24ff6 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -55,6 +55,7 @@ #include "wild_encounter.h" #include "frontier_util.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map_sections.h" @@ -886,7 +887,7 @@ static void mli0_load_map(u32 a1) LoadCurrentMapData(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA1D8(); else if (InTrainerHill()) sub_81D5DF8(); @@ -914,7 +915,7 @@ static void mli0_load_map(u32 a1) mapheader_run_script_with_tag_x3(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(0); else if (InTrainerHill()) InitTrainerHillMap(); @@ -1753,7 +1754,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA2F8(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); @@ -1763,7 +1764,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(1); else if (trainerHillMapId != 0) InitTrainerHillMap(); diff --git a/src/pokemon.c b/src/pokemon.c index cdb87f464..7f80e8d4e 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -37,6 +37,7 @@ #include "constants/battle_move_effects.h" #include "constants/hold_effects.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/moves.h" #include "constants/songs.h" #include "constants/species.h" @@ -6848,7 +6849,7 @@ void SetWildMonHeldItem(void) var1 = 20; var2 = 80; } - if (gMapHeader.mapLayoutId == 0x1A4) + if (gMapHeader.mapLayoutId == LAYOUT_ALTERING_CAVE) { s32 alteringCaveId = GetWildMonTableIdInAlteringCave(species); if (alteringCaveId != 0) diff --git a/src/trainer_hill.c b/src/trainer_hill.c index e0a236286..309ffdb1d 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -24,6 +24,7 @@ #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/moves.h" #include "constants/maps.h" #include "constants/species.h" @@ -324,7 +325,7 @@ void ResetTrainerHillResults(void) static u8 GetFloorId(void) { - return gMapHeader.mapLayoutId - 159; + return gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; } u8 GetTrainerHillOpponentClass(u16 trainerId) @@ -385,7 +386,7 @@ static void SetUpDataStruct(void) if (sHillData == NULL) { sHillData = AllocZeroed(sizeof(*sHillData)); - sHillData->floorId = gMapHeader.mapLayoutId - 159; + sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; CpuCopy32(sDataPerTag[gSaveBlock1Ptr->trainerHill.tag], &sHillData->tag, sizeof(sHillData->tag)); nullsub_2(); } @@ -803,10 +804,10 @@ bool32 InTrainerHill(void) { bool32 ret; - if (gMapHeader.mapLayoutId == 0x19F - || gMapHeader.mapLayoutId == 0x1A0 - || gMapHeader.mapLayoutId == 0x1A1 - || gMapHeader.mapLayoutId == 0x1A2) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F + || gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F) ret = TRUE; else ret = FALSE; @@ -818,17 +819,17 @@ u8 GetCurrentTrainerHillMapId(void) { u8 ret; - if (gMapHeader.mapLayoutId == 0x19F) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_1F) ret = 1; - else if (gMapHeader.mapLayoutId == 0x1A0) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_2F) ret = 2; - else if (gMapHeader.mapLayoutId == 0x1A1) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_3F) ret = 3; - else if (gMapHeader.mapLayoutId == 0x1A2) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_4F) ret = 4; - else if (gMapHeader.mapLayoutId == 0x1A3) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF) ret = 5; - else if (gMapHeader.mapLayoutId == 0x19E) + else if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ENTRANCE) ret = 6; else ret = 0; @@ -840,7 +841,7 @@ static bool32 sub_81D6100(void) { bool32 ret; - if (gMapHeader.mapLayoutId == 0x1A3) + if (gMapHeader.mapLayoutId == LAYOUT_TRAINER_HILL_ROOF) ret = TRUE; else ret = FALSE; diff --git a/src/tv.c b/src/tv.c index 5b640836f..ec3a3d0cb 100644 --- a/src/tv.c +++ b/src/tv.c @@ -38,6 +38,7 @@ #include "secret_base.h" #include "tv.h" #include "data2.h" +#include "constants/layouts.h" // Static type declarations @@ -6264,7 +6265,9 @@ static void DoTVShowTodaysRivalTrainer(void) case MAPSEC_DYNAMIC: switch (show->rivalTrainer.mapLayoutId) { - case 0x115 ... 0x117: + case LAYOUT_SS_TIDAL_CORRIDOR: + case LAYOUT_SS_TIDAL_LOWER_DECK: + case LAYOUT_SS_TIDAL_ROOMS: sTVShowState = 10; break; default: @@ -6463,7 +6466,9 @@ static void DoTVShowHoennTreasureInvestigators(void) { switch (show->treasureInvestigators.mapLayoutId) { - case 0x115 ... 0x117: + case LAYOUT_SS_TIDAL_CORRIDOR: + case LAYOUT_SS_TIDAL_LOWER_DECK: + case LAYOUT_SS_TIDAL_ROOMS: sTVShowState = 2; break; default: diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 2e6f1642a..e42bf8a23 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1,27 +1,27 @@ #include "global.h" #include "wild_encounter.h" #include "pokemon.h" -#include "constants/species.h" #include "metatile_behavior.h" #include "fieldmap.h" #include "random.h" -#include "constants/maps.h" #include "field_player_avatar.h" -#include "constants/abilities.h" #include "event_data.h" #include "safari_zone.h" #include "overworld.h" #include "pokeblock.h" #include "battle_setup.h" #include "roamer.h" -#include "constants/game_stat.h" #include "tv.h" #include "link.h" #include "script.h" #include "battle_pike.h" #include "battle_pyramid.h" +#include "constants/abilities.h" +#include "constants/game_stat.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" +#include "constants/species.h" extern const u8 EventScript_RepelWoreOff[]; @@ -413,7 +413,7 @@ static bool8 TryGenerateWildMon(const struct WildPokemonInfo *wildMonInfo, u8 ar level = ChooseWildMonLevel(&wildMonInfo->wildPokemon[wildMonIndex]); if (flags & WILD_CHECK_REPEL && !IsWildLevelAllowedByRepel(level)) return FALSE; - if (gMapHeader.mapLayoutId != 0x166 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) + if (gMapHeader.mapLayoutId != LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 && flags & WILD_CHECK_KEEN_EYE && !IsAbilityAllowingEncounter(level)) return FALSE; CreateWildMon(wildMonInfo->wildPokemon[wildMonIndex].species, level); @@ -474,7 +474,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility) { u32 ability = GetMonAbility(&gPlayerParty[0]); - if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == 0x169) + if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) encounterRate = encounterRate * 3 / 4; else if (ability == ABILITY_STENCH) encounterRate /= 2; @@ -522,7 +522,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == 0x166) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) { headerId = GetBattlePikeWildMonHeaderId(); if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -537,7 +537,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) { headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll()) @@ -665,7 +665,7 @@ bool8 SweetScentWildEncounter(void) headerId = GetCurrentMapWildMonHeaderId(); if (headerId == 0xFFFF) { - if (gMapHeader.mapLayoutId == 0x166) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3) { headerId = GetBattlePikeWildMonHeaderId(); if (TryGenerateWildMon(gBattlePikeWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) @@ -675,7 +675,7 @@ bool8 SweetScentWildEncounter(void) BattleSetup_StartBattlePikeWildBattle(); return TRUE; } - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) { headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum; if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE) diff --git a/tools/mapjson/mapjson.py b/tools/mapjson/mapjson.py new file mode 100755 index 000000000..28322a2de --- /dev/null +++ b/tools/mapjson/mapjson.py @@ -0,0 +1,389 @@ +# mapjson.py + +import os +import re +import sys +import json + + +def abort(message): + print message + sys.exit() + + +def write_text_file(filepath, text): + with open(filepath, 'w') as f: + f.write(text) + + +def generate_map_header_text(map_data, layouts_data): + matched_layouts = filter(lambda layout: layout['id'] == map_data['layout'], layouts_data['layouts']) + if len(matched_layouts) != 1: + abort('Failed to find matching layout for "%s"' % (map_data['layout'])) + layout = matched_layouts[0] + text = '%s:\n' % (map_data['name']) + text += '\t.4byte %s\n' % (layout['name']) + + if 'shared_events_map' in map_data: + text += '\t.4byte %s\n' % (map_data['shared_events_map'] + '_MapEvents') + else: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapEvents') + + if 'shared_scripts_map' in map_data: + text += '\t.4byte %s\n' % (map_data['shared_scripts_map'] + '_MapScripts') + else: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapScripts') + + if map_data['connections'] is not None and len(map_data['connections']) > 0: + text += '\t.4byte %s\n' % (map_data['name'] + '_MapConnections') + else: + text += '\t.4byte 0x0\n' + + text += '\t.2byte %s\n' % (map_data['music']) + text += '\t.2byte %s\n' % (layout['id']) + text += '\t.byte %s\n' % (map_data['region_map_section']) + text += '\t.byte %s\n' % (int(map_data['requires_flash'])) + text += '\t.byte %s\n' % (map_data['weather']) + text += '\t.byte %s\n' % (map_data['map_type']) + text += '\t.2byte 0\n' + text += '\tmap_header_flags allow_bike=%s, allow_escape_rope=%s, allow_run=%s, show_map_name=%s\n' % (int(map_data['allow_bike']), int(map_data['allow_escape_rope']), int(map_data['allow_running']), int(map_data['show_map_name'])) + text += '\t.byte %s\n\n' % (map_data['battle_scene']) + return text + + +def generate_map_connections_text(map_data): + if map_data['connections'] is None: + return '\n' + + label = '%s_MapConnectionsList' % (map_data['name']) + text = '%s:\n' % (label) + for connection in map_data['connections']: + text += '\tconnection %s, %s, %s\n' % (connection['direction'], connection['offset'], connection['map']) + + text += '\n%s_MapConnections:\n' % (map_data['name']) + text += '\t.4byte %s\n' % (len(map_data['connections'])) + text += '\t.4byte %s\n\n' % (label) + return text + + +def generate_map_events_text(map_data): + if 'shared_events_map' in map_data: + return '\n' + + text = '' + if len(map_data['object_events']) > 0: + objects_label = '%s_EventObjects' % (map_data['name']) + text += '%s:\n' % (objects_label) + for i, obj in enumerate(map_data['object_events']): + text += '\tobject_event %s, %s, 0, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s\n' % ( + i + 1, + obj['graphics_id'], + obj['x'], + obj['y'], + obj['elevation'], + obj['movement_type'], + obj['movement_range_x'], + obj['movement_range_y'], + obj['trainer_type'], + obj['trainer_sight_or_berry_tree_id'], + obj['script'], + obj['flag']) + text += '\n' + else: + objects_label = '0x0' + + if len(map_data['warp_events']) > 0: + warps_label = '%s_MapWarps' % (map_data['name']) + text += '%s:\n' % (warps_label) + for i, warp in enumerate(map_data['warp_events']): + text += '\twarp_def %s, %s, %s, %s, %s\n' % ( + warp['x'], + warp['y'], + warp['elevation'], + warp['dest_warp_id'], + warp['dest_map']) + text += '\n' + else: + warps_label = '0x0' + + if len(map_data['coord_events']) > 0: + coords_label = '%s_MapCoordEvents' % (map_data['name']) + text += '%s:\n' % (coords_label) + for i, event in enumerate(map_data['coord_events']): + if event['type'] == 'trigger': + text += '\tcoord_event %s, %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['var'], + event['var_value'], + event['script']) + elif event['type'] == 'weather': + text += '\tcoord_weather_event %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['weather']) + text += '\n' + else: + coords_label = '0x0' + + if len(map_data['bg_events']) > 0: + bgs_label = '%s_MapBGEvents' % (map_data['name']) + text += '%s:\n' % (bgs_label) + for i, event in enumerate(map_data['bg_events']): + if event['type'] == 'sign': + text += '\tbg_event %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['player_facing_dir'], + event['script']) + elif event['type'] == 'hidden_item': + text += '\tbg_hidden_item_event %s, %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['item'], + event['flag']) + elif event['type'] == 'secret_base': + text += '\tbg_secret_base_event %s, %s, %s, %s\n' % ( + event['x'], + event['y'], + event['elevation'], + event['secret_base_id']) + text += '\n' + else: + bgs_label = '0x0' + + text += '%s_MapEvents::\n' % (map_data['name']) + text += '\tmap_events %s, %s, %s, %s\n\n' % (objects_label, warps_label, coords_label, bgs_label) + return text + + +def process_map(map_filepath, layouts_filepath): + with open(map_filepath) as f: + map_data = json.load(f) + with open(layouts_filepath) as f: + layouts_data = json.load(f) + + header_text = generate_map_header_text(map_data, layouts_data) + events_text = generate_map_events_text(map_data) + connections_text = generate_map_connections_text(map_data) + + files_dir = os.path.dirname(map_filepath) + write_text_file(os.path.join(files_dir, 'header.inc'), header_text) + write_text_file(os.path.join(files_dir, 'events.inc'), events_text) + write_text_file(os.path.join(files_dir, 'connections.inc'), connections_text) + + +def generate_groups_text(groups_data): + text = '' + for group in groups_data['group_order']: + text += '%s::\n' % (group) + maps = groups_data[group] + for map_name in maps: + text += '\t.4byte %s\n' % (map_name) + text += '\n' + + text += '\t.align 2\n' + text += 'gMapGroups::\n' + for group in groups_data['group_order']: + text += '\t.4byte %s\n' % (group) + text += '\n' + return text + + +def index_of(in_list, value): + try: + index_value = in_list.index(value) + except ValueError: + index_value = sys.maxint + return index_value + + +def generate_connections_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + if 'connections_include_order' in groups_data: + map_names.sort(key=lambda x: index_of(groups_data['connections_include_order'], x)) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/connections.inc"\n' % (map_name) + + return text + + +def generate_headers_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/header.inc"\n' % (map_name) + + return text + + +def generate_events_text(groups_data): + map_names = [] + for group in groups_data['group_order']: + for map_name in groups_data[group]: + map_names.append(map_name) + + text = '' + for map_name in map_names: + text += '\t.include "data/maps/%s/events.inc"\n' % (map_name) + + return text + + +def generate_map_constants_text(groups_filepath, groups_data): + file_dir = os.path.dirname(groups_filepath) + text = '#ifndef GUARD_CONSTANTS_MAP_GROUPS_H\n' + text += '#define GUARD_CONSTANTS_MAP_GROUPS_H\n\n' + + for i, group in enumerate(groups_data['group_order']): + text += '// Map Group %s\n' % (i) + map_ids = [] + max_length = 0 + for map_name in groups_data[group]: + header_filepath = os.path.join(file_dir, map_name, 'map.json') + with open(header_filepath) as f: + map_data = json.load(f) + map_ids.append(map_data['id']) + if len(map_data['id']) > max_length: + max_length = len(map_data['id']) + + for j, map_id in enumerate(map_ids): + text += '#define %s%s(%s | (%s << 8))\n' % (map_id, " " * (max_length - len(map_id) + 1), j, i) + + text += '\n' + + text += '#define MAP_GROUPS_COUNT %s\n\n' % (len(groups_data['group_order'])) + text += '#endif // GUARD_CONSTANTS_MAP_GROUPS_H\n' + + return text + + +def process_groups(groups_filepath): + with open(groups_filepath) as f: + groups_data = json.load(f) + + groups_text = generate_groups_text(groups_data) + connections_text = generate_connections_text(groups_data) + headers_text = generate_headers_text(groups_data) + events_text = generate_events_text(groups_data) + map_header_text = generate_map_constants_text(groups_filepath, groups_data) + + file_dir = os.path.dirname(groups_filepath) + write_text_file(os.path.join(file_dir, 'groups.inc'), groups_text) + write_text_file(os.path.join(file_dir, 'connections.inc'), connections_text) + write_text_file(os.path.join(file_dir, 'headers.inc'), headers_text) + write_text_file(os.path.join(file_dir, 'events.inc'), events_text) + write_text_file(os.path.join(file_dir, '../../include/constants/map_groups.h'), map_header_text) + + +def generate_layout_headers_text(layouts_data): + text = '' + for layout in layouts_data['layouts']: + border_label = layout['name'] + '_Border' + blockdata_label = layout['name'] + '_Blockdata' + text += '%s::\n' % (border_label) + text += '\t.incbin "%s"\n\n' % (layout['border_filepath']) + text += '%s::\n' % (blockdata_label) + text += '\t.incbin "%s"\n\n' % (layout['blockdata_filepath']) + text += '\t.align 2\n' + text += '%s::\n' % (layout['name']) + text += '\t.4byte %s\n' % (layout['width']) + text += '\t.4byte %s\n' % (layout['height']) + text += '\t.4byte %s\n' % (border_label) + text += '\t.4byte %s\n' % (blockdata_label) + text += '\t.4byte %s\n' % (layout['primary_tileset']) + text += '\t.4byte %s\n\n' % (layout['secondary_tileset']) + + return text + + +def generate_layouts_table_text(layouts_data): + text = '\t.align 2\n' + text += '%s::\n' % (layouts_data['layouts_table_label']) + for layout in layouts_data['layouts']: + text += '\t.4byte %s\n' % (layout['name']) + + return text + + +def generate_layouts_constants_text(layouts_data): + text = '#ifndef GUARD_CONSTANTS_LAYOUTS_H\n' + text += '#define GUARD_CONSTANTS_LAYOUTS_H\n\n' + for i, layout in enumerate(layouts_data['layouts']): + text += '#define %s %s\n' % (layout['id'], i + 1) + text += '\n' + text += '#endif // GUARD_CONSTANTS_LAYOUTS_H\n' + return text + + +def process_layouts(layouts_filepath): + with open(layouts_filepath) as f: + layouts_data = json.load(f) + + layout_headers_text = generate_layout_headers_text(layouts_data) + layouts_table_text = generate_layouts_table_text(layouts_data) + layouts_constants_text = generate_layouts_constants_text(layouts_data) + + file_dir = os.path.dirname(layouts_filepath) + write_text_file(os.path.join(file_dir, 'layouts.inc'), layout_headers_text) + write_text_file(os.path.join(file_dir, 'layouts_table.inc'), layouts_table_text) + write_text_file(os.path.join(file_dir, '../../include/constants/layouts.h'), layouts_constants_text) + + +def main(): + if len(sys.argv) < 2: + abort('USAGE: python mapjson.py [options]') + + mode = sys.argv[1] + if mode not in ['layouts', 'map', 'groups']: + abort("ERROR: must be 'layouts', 'map', or 'groups'.") + + if mode == 'map': + if len(sys.argv) != 4: + abort('USAGE: python mapjson.py map ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Map file "%s" does not exist' % (filepath)) + + layouts_filepath = sys.argv[3] + if not os.path.exists(layouts_filepath): + abort('ERROR: Layouts file "%s" does not exist' % (layouts_filepath)) + + process_map(filepath, layouts_filepath) + elif mode == 'groups': + if len(sys.argv) != 3: + abort('USAGE: python mapjson.py groups ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Map file "%s" does not exist' % (filepath)) + + process_groups(filepath) + elif mode == 'layouts': + if len(sys.argv) != 3: + abort('USAGE: python mapjson.py layouts ') + + filepath = sys.argv[2] + if not os.path.exists(filepath): + abort('ERROR: Layouts file "%s" does not exist' % (filepath)) + + process_layouts(filepath) + + +if __name__ == '__main__': + main() -- cgit v1.2.3