From 931feeb9b720ea5151a781905967fedb170b67b1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:47:04 -0500 Subject: Move map events into respective data/maps/ directories --- data/layouts.inc | 332 +++++++++ data/layouts_table.inc | 334 +++++++++ data/map_events.s | 789 +++++++++++---------- data/maps.s | 6 +- data/maps/AbandonedShip_CaptainsOffice/events.inc | 10 + data/maps/AbandonedShip_Corridors_1F/events.inc | 20 + data/maps/AbandonedShip_Corridors_B1F/events.inc | 19 + data/maps/AbandonedShip_Deck/events.inc | 9 + .../AbandonedShip_HiddenFloorCorridors/events.inc | 16 + .../maps/AbandonedShip_HiddenFloorRooms/events.inc | 31 + data/maps/AbandonedShip_Room_B1F/events.inc | 9 + data/maps/AbandonedShip_Rooms2_1F/events.inc | 12 + data/maps/AbandonedShip_Rooms2_B1F/events.inc | 12 + data/maps/AbandonedShip_Rooms_1F/events.inc | 14 + data/maps/AbandonedShip_Rooms_B1F/events.inc | 11 + data/maps/AbandonedShip_Underwater1/events.inc | 6 + data/maps/AbandonedShip_Underwater2/events.inc | 5 + data/maps/AncientTomb/events.inc | 15 + data/maps/AquaHideout_1F/events.inc | 12 + data/maps/AquaHideout_B1F/events.inc | 39 + data/maps/AquaHideout_B2F/events.inc | 25 + data/maps/BattleTower_BattleRoom/events.inc | 10 + data/maps/BattleTower_Corridor/events.inc | 5 + data/maps/BattleTower_Elevator/events.inc | 5 + data/maps/BattleTower_Lobby/events.inc | 18 + data/maps/BattleTower_Outside/events.inc | 15 + data/maps/CaveOfOrigin_1F/events.inc | 11 + data/maps/CaveOfOrigin_B1F/events.inc | 11 + data/maps/CaveOfOrigin_B2F/events.inc | 11 + data/maps/CaveOfOrigin_B3F/events.inc | 14 + data/maps/CaveOfOrigin_B4F/events.inc | 13 + data/maps/CaveOfOrigin_Entrance/events.inc | 6 + data/maps/DesertRuins/events.inc | 15 + data/maps/DewfordTown/events.inc | 23 + data/maps/DewfordTown_Gym/events.inc | 19 + data/maps/DewfordTown_Hall/events.inc | 21 + data/maps/DewfordTown_House1/events.inc | 11 + data/maps/DewfordTown_House2/events.inc | 10 + data/maps/DewfordTown_PokemonCenter_1F/events.inc | 12 + data/maps/DewfordTown_PokemonCenter_2F/events.inc | 14 + data/maps/DoubleBattleColosseum/events.inc | 14 + data/maps/EverGrandeCity/events.inc | 28 + data/maps/EverGrandeCity_ChampionsRoom/events.inc | 11 + data/maps/EverGrandeCity_Corridor1/events.inc | 8 + data/maps/EverGrandeCity_Corridor2/events.inc | 8 + data/maps/EverGrandeCity_Corridor3/events.inc | 8 + data/maps/EverGrandeCity_Corridor4/events.inc | 6 + data/maps/EverGrandeCity_Corridor5/events.inc | 8 + data/maps/EverGrandeCity_DrakesRoom/events.inc | 9 + data/maps/EverGrandeCity_GlaciasRoom/events.inc | 9 + data/maps/EverGrandeCity_HallOfFame/events.inc | 8 + data/maps/EverGrandeCity_PhoebesRoom/events.inc | 9 + .../EverGrandeCity_PokemonCenter_1F/events.inc | 12 + .../EverGrandeCity_PokemonCenter_2F/events.inc | 14 + data/maps/EverGrandeCity_PokemonLeague/events.inc | 14 + data/maps/EverGrandeCity_SidneysRoom/events.inc | 9 + data/maps/FallarborTown/events.inc | 25 + data/maps/FallarborTown_ContestHall/events.inc | 15 + data/maps/FallarborTown_ContestLobby/events.inc | 21 + data/maps/FallarborTown_House1/events.inc | 10 + data/maps/FallarborTown_House2/events.inc | 9 + data/maps/FallarborTown_Mart/events.inc | 12 + .../maps/FallarborTown_PokemonCenter_1F/events.inc | 13 + .../maps/FallarborTown_PokemonCenter_2F/events.inc | 14 + data/maps/FieryPath/events.inc | 16 + data/maps/FortreeCity/events.inc | 30 + data/maps/FortreeCity_DecorationShop/events.inc | 12 + data/maps/FortreeCity_Gym/events.inc | 18 + data/maps/FortreeCity_House1/events.inc | 11 + data/maps/FortreeCity_House2/events.inc | 9 + data/maps/FortreeCity_House3/events.inc | 10 + data/maps/FortreeCity_House4/events.inc | 11 + data/maps/FortreeCity_House5/events.inc | 11 + data/maps/FortreeCity_Mart/events.inc | 12 + data/maps/FortreeCity_PokemonCenter_1F/events.inc | 13 + data/maps/FortreeCity_PokemonCenter_2F/events.inc | 14 + data/maps/GraniteCave_1F/events.inc | 12 + data/maps/GraniteCave_B1F/events.inc | 14 + data/maps/GraniteCave_B2F/events.inc | 24 + data/maps/GraniteCave_StevensRoom/events.inc | 8 + data/maps/InsideOfTruck/events.inc | 24 + data/maps/IslandCave/events.inc | 15 + data/maps/JaggedPass/events.inc | 25 + data/maps/LavaridgeTown/events.inc | 34 + data/maps/LavaridgeTown_Gym_1F/events.inc | 39 + data/maps/LavaridgeTown_Gym_B1F/events.inc | 24 + data/maps/LavaridgeTown_HerbShop/events.inc | 11 + data/maps/LavaridgeTown_House/events.inc | 10 + data/maps/LavaridgeTown_Mart/events.inc | 11 + .../maps/LavaridgeTown_PokemonCenter_1F/events.inc | 14 + .../maps/LavaridgeTown_PokemonCenter_2F/events.inc | 14 + data/maps/LilycoveCity/events.inc | 53 ++ data/maps/LilycoveCity_ContestHall/events.inc | 50 ++ data/maps/LilycoveCity_ContestLobby/events.inc | 32 + data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc | 13 + data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc | 13 + .../events.inc | 9 + .../LilycoveCity_DepartmentStoreRooftop/events.inc | 14 + .../LilycoveCity_DepartmentStore_1F/events.inc | 19 + .../LilycoveCity_DepartmentStore_2F/events.inc | 14 + .../LilycoveCity_DepartmentStore_3F/events.inc | 14 + .../LilycoveCity_DepartmentStore_4F/events.inc | 14 + .../LilycoveCity_DepartmentStore_5F/events.inc | 16 + data/maps/LilycoveCity_EmptyMap/events.inc | 5 + data/maps/LilycoveCity_Harbor/events.inc | 14 + data/maps/LilycoveCity_House1/events.inc | 10 + data/maps/LilycoveCity_House2/events.inc | 9 + data/maps/LilycoveCity_House3/events.inc | 14 + data/maps/LilycoveCity_House4/events.inc | 10 + .../maps/LilycoveCity_LilycoveMuseum_1F/events.inc | 37 + .../maps/LilycoveCity_LilycoveMuseum_2F/events.inc | 25 + .../maps/LilycoveCity_MoveDeletersHouse/events.inc | 9 + data/maps/LilycoveCity_PokemonCenter_1F/events.inc | 12 + data/maps/LilycoveCity_PokemonCenter_2F/events.inc | 14 + .../LilycoveCity_PokemonTrainerFanClub/events.inc | 16 + data/maps/LilycoveCity_UnusedMart/events.inc | 6 + data/maps/LinkContestRoom1/events.inc | 18 + data/maps/LinkContestRoom2/events.inc | 1 + data/maps/LinkContestRoom3/events.inc | 1 + data/maps/LinkContestRoom4/events.inc | 1 + data/maps/LinkContestRoom5/events.inc | 1 + data/maps/LinkContestRoom6/events.inc | 1 + data/maps/LittlerootTown/events.inc | 32 + .../LittlerootTown_BrendansHouse_1F/events.inc | 17 + .../LittlerootTown_BrendansHouse_2F/events.inc | 27 + data/maps/LittlerootTown_MaysHouse_1F/events.inc | 17 + data/maps/LittlerootTown_MaysHouse_2F/events.inc | 28 + .../LittlerootTown_ProfessorBirchsLab/events.inc | 28 + data/maps/MagmaHideout_1F/events.inc | 11 + data/maps/MagmaHideout_B1F/events.inc | 43 ++ data/maps/MagmaHideout_B2F/events.inc | 25 + data/maps/MauvilleCity/events.inc | 32 + data/maps/MauvilleCity_BikeShop/events.inc | 14 + data/maps/MauvilleCity_GameCorner/events.inc | 46 ++ data/maps/MauvilleCity_Gym/events.inc | 23 + data/maps/MauvilleCity_House1/events.inc | 9 + data/maps/MauvilleCity_House2/events.inc | 9 + data/maps/MauvilleCity_Mart/events.inc | 11 + data/maps/MauvilleCity_PokemonCenter_1F/events.inc | 14 + data/maps/MauvilleCity_PokemonCenter_2F/events.inc | 15 + data/maps/MeteorFalls_1F_1R/events.inc | 28 + data/maps/MeteorFalls_1F_2R/events.inc | 17 + data/maps/MeteorFalls_B1F_1R/events.inc | 10 + data/maps/MeteorFalls_B1F_2R/events.inc | 8 + data/maps/MossdeepCity/events.inc | 41 ++ data/maps/MossdeepCity_GameCorner_1F/events.inc | 13 + data/maps/MossdeepCity_GameCorner_B1F/events.inc | 8 + data/maps/MossdeepCity_Gym/events.inc | 28 + data/maps/MossdeepCity_House1/events.inc | 10 + data/maps/MossdeepCity_House2/events.inc | 11 + data/maps/MossdeepCity_House3/events.inc | 9 + data/maps/MossdeepCity_House4/events.inc | 11 + data/maps/MossdeepCity_Mart/events.inc | 12 + data/maps/MossdeepCity_PokemonCenter_1F/events.inc | 12 + data/maps/MossdeepCity_PokemonCenter_2F/events.inc | 15 + data/maps/MossdeepCity_SpaceCenter_1F/events.inc | 14 + data/maps/MossdeepCity_SpaceCenter_2F/events.inc | 10 + data/maps/MossdeepCity_StevensHouse/events.inc | 18 + data/maps/MtChimney/events.inc | 42 ++ data/maps/MtChimney_CableCarStation/events.inc | 10 + data/maps/MtPyre_1F/events.inc | 15 + data/maps/MtPyre_2F/events.inc | 17 + data/maps/MtPyre_3F/events.inc | 15 + data/maps/MtPyre_4F/events.inc | 14 + data/maps/MtPyre_5F/events.inc | 13 + data/maps/MtPyre_6F/events.inc | 10 + data/maps/MtPyre_Exterior/events.inc | 22 + data/maps/MtPyre_Summit/events.inc | 27 + data/maps/NewMauville_Entrance/events.inc | 9 + data/maps/NewMauville_Inside/events.inc | 37 + data/maps/OldaleTown/events.inc | 27 + data/maps/OldaleTown_House1/events.inc | 9 + data/maps/OldaleTown_House2/events.inc | 10 + data/maps/OldaleTown_Mart/events.inc | 11 + data/maps/OldaleTown_PokemonCenter_1F/events.inc | 13 + data/maps/OldaleTown_PokemonCenter_2F/events.inc | 14 + data/maps/PacifidlogTown/events.inc | 20 + data/maps/PacifidlogTown_House1/events.inc | 10 + data/maps/PacifidlogTown_House2/events.inc | 11 + data/maps/PacifidlogTown_House3/events.inc | 10 + data/maps/PacifidlogTown_House4/events.inc | 11 + data/maps/PacifidlogTown_House5/events.inc | 10 + .../PacifidlogTown_PokemonCenter_1F/events.inc | 13 + .../PacifidlogTown_PokemonCenter_2F/events.inc | 14 + data/maps/PetalburgCity/events.inc | 37 + data/maps/PetalburgCity_Gym/events.inc | 70 ++ data/maps/PetalburgCity_House1/events.inc | 10 + data/maps/PetalburgCity_House2/events.inc | 10 + data/maps/PetalburgCity_Mart/events.inc | 12 + .../maps/PetalburgCity_PokemonCenter_1F/events.inc | 14 + .../maps/PetalburgCity_PokemonCenter_2F/events.inc | 14 + data/maps/PetalburgCity_WallysHouse/events.inc | 10 + data/maps/PetalburgWoods/events.inc | 37 + data/maps/RecordCorner/events.inc | 17 + data/maps/Route101/events.inc | 24 + data/maps/Route102/events.inc | 17 + data/maps/Route103/events.inc | 22 + data/maps/Route104/events.inc | 58 ++ data/maps/Route104_MrBrineysHouse/events.inc | 10 + .../maps/Route104_PrettyPetalFlowerShop/events.inc | 11 + data/maps/Route104_Prototype/events.inc | 23 + .../events.inc | 9 + data/maps/Route105/events.inc | 16 + data/maps/Route106/events.inc | 18 + data/maps/Route107/events.inc | 10 + data/maps/Route108/events.inc | 14 + data/maps/Route109/events.inc | 37 + data/maps/Route109_SeashoreHouse/events.inc | 12 + data/maps/Route110/events.inc | 69 ++ .../events.inc | 15 + .../events.inc | 15 + data/maps/Route110_TrickHouseCorridor/events.inc | 8 + data/maps/Route110_TrickHouseEnd/events.inc | 15 + data/maps/Route110_TrickHouseEntrance/events.inc | 19 + data/maps/Route110_TrickHousePuzzle1/events.inc | 31 + data/maps/Route110_TrickHousePuzzle2/events.inc | 23 + data/maps/Route110_TrickHousePuzzle3/events.inc | 32 + data/maps/Route110_TrickHousePuzzle4/events.inc | 27 + data/maps/Route110_TrickHousePuzzle5/events.inc | 33 + data/maps/Route110_TrickHousePuzzle6/events.inc | 16 + data/maps/Route110_TrickHousePuzzle7/events.inc | 24 + data/maps/Route110_TrickHousePuzzle8/events.inc | 16 + data/maps/Route111/events.inc | 100 +++ data/maps/Route111_OldLadysRestStop/events.inc | 9 + .../maps/Route111_WinstrateFamilysHouse/events.inc | 12 + data/maps/Route112/events.inc | 29 + data/maps/Route112_CableCarStation/events.inc | 10 + data/maps/Route113/events.inc | 48 ++ data/maps/Route113_GlassWorkshop/events.inc | 10 + data/maps/Route114/events.inc | 46 ++ data/maps/Route114_FossilManiacsHouse/events.inc | 16 + data/maps/Route114_FossilManiacsTunnel/events.inc | 9 + data/maps/Route114_LanettesHouse/events.inc | 14 + data/maps/Route115/events.inc | 39 + data/maps/Route116/events.inc | 47 ++ data/maps/Route116_TunnelersRestHouse/events.inc | 11 + data/maps/Route117/events.inc | 34 + data/maps/Route117_PokemonDayCare/events.inc | 9 + data/maps/Route118/events.inc | 40 ++ data/maps/Route119/events.inc | 94 +++ data/maps/Route119_House/events.inc | 15 + data/maps/Route119_WeatherInstitute_1F/events.inc | 20 + data/maps/Route119_WeatherInstitute_2F/events.inc | 13 + data/maps/Route120/events.inc | 86 +++ data/maps/Route121/events.inc | 46 ++ data/maps/Route121_SafariZoneEntrance/events.inc | 19 + data/maps/Route122/events.inc | 5 + data/maps/Route123/events.inc | 76 ++ data/maps/Route123_BerryMastersHouse/events.inc | 10 + data/maps/Route124/events.inc | 20 + .../Route124_DivingTreasureHuntersHouse/events.inc | 12 + data/maps/Route125/events.inc | 20 + data/maps/Route126/events.inc | 9 + data/maps/Route127/events.inc | 20 + data/maps/Route128/events.inc | 17 + data/maps/Route129/events.inc | 8 + data/maps/Route130/events.inc | 7 + data/maps/Route131/events.inc | 13 + data/maps/Route132/events.inc | 9 + data/maps/Route133/events.inc | 11 + data/maps/Route134/events.inc | 9 + data/maps/RustboroCity/events.inc | 59 ++ data/maps/RustboroCity_CuttersHouse/events.inc | 10 + data/maps/RustboroCity_DevonCorp_1F/events.inc | 12 + data/maps/RustboroCity_DevonCorp_2F/events.inc | 13 + data/maps/RustboroCity_DevonCorp_3F/events.inc | 14 + data/maps/RustboroCity_Flat1_1F/events.inc | 11 + data/maps/RustboroCity_Flat1_2F/events.inc | 8 + data/maps/RustboroCity_Flat2_1F/events.inc | 11 + data/maps/RustboroCity_Flat2_2F/events.inc | 10 + data/maps/RustboroCity_Flat2_3F/events.inc | 9 + data/maps/RustboroCity_Gym/events.inc | 16 + data/maps/RustboroCity_House1/events.inc | 10 + data/maps/RustboroCity_House2/events.inc | 10 + data/maps/RustboroCity_House3/events.inc | 11 + data/maps/RustboroCity_Mart/events.inc | 12 + data/maps/RustboroCity_PokemonCenter_1F/events.inc | 13 + data/maps/RustboroCity_PokemonCenter_2F/events.inc | 14 + data/maps/RustboroCity_PokemonSchool/events.inc | 21 + data/maps/RusturfTunnel/events.inc | 26 + data/maps/SSTidalCorridor/events.inc | 33 + data/maps/SSTidalLowerDeck/events.inc | 12 + data/maps/SSTidalRooms/events.inc | 30 + data/maps/SafariZone_Northeast/events.inc | 13 + data/maps/SafariZone_Northwest/events.inc | 6 + data/maps/SafariZone_RestHouse/events.inc | 11 + data/maps/SafariZone_Southeast/events.inc | 11 + data/maps/SafariZone_Southwest/events.inc | 12 + data/maps/ScorchedSlab/events.inc | 8 + data/maps/SeafloorCavern_Entrance/events.inc | 6 + data/maps/SeafloorCavern_Room1/events.inc | 14 + data/maps/SeafloorCavern_Room2/events.inc | 19 + data/maps/SeafloorCavern_Room3/events.inc | 19 + data/maps/SeafloorCavern_Room4/events.inc | 11 + data/maps/SeafloorCavern_Room5/events.inc | 15 + data/maps/SeafloorCavern_Room6/events.inc | 7 + data/maps/SeafloorCavern_Room7/events.inc | 6 + data/maps/SeafloorCavern_Room8/events.inc | 20 + data/maps/SeafloorCavern_Room9/events.inc | 17 + data/maps/SealedChamber_InnerRoom/events.inc | 16 + data/maps/SealedChamber_OuterRoom/events.inc | 36 + data/maps/SecretBase_BlueCave1/events.inc | 22 + data/maps/SecretBase_BlueCave2/events.inc | 22 + data/maps/SecretBase_BlueCave3/events.inc | 22 + data/maps/SecretBase_BlueCave4/events.inc | 22 + data/maps/SecretBase_BrownCave1/events.inc | 22 + data/maps/SecretBase_BrownCave2/events.inc | 22 + data/maps/SecretBase_BrownCave3/events.inc | 22 + data/maps/SecretBase_BrownCave4/events.inc | 22 + data/maps/SecretBase_RedCave1/events.inc | 22 + data/maps/SecretBase_RedCave2/events.inc | 22 + data/maps/SecretBase_RedCave3/events.inc | 22 + data/maps/SecretBase_RedCave4/events.inc | 22 + data/maps/SecretBase_Shrub1/events.inc | 22 + data/maps/SecretBase_Shrub2/events.inc | 22 + data/maps/SecretBase_Shrub3/events.inc | 22 + data/maps/SecretBase_Shrub4/events.inc | 22 + data/maps/SecretBase_Tree1/events.inc | 22 + data/maps/SecretBase_Tree2/events.inc | 22 + data/maps/SecretBase_Tree3/events.inc | 22 + data/maps/SecretBase_Tree4/events.inc | 22 + data/maps/SecretBase_YellowCave1/events.inc | 22 + data/maps/SecretBase_YellowCave2/events.inc | 22 + data/maps/SecretBase_YellowCave3/events.inc | 22 + data/maps/SecretBase_YellowCave4/events.inc | 22 + .../maps/ShoalCave_HighTideEntranceRoom/events.inc | 2 + data/maps/ShoalCave_HighTideInnerRoom/events.inc | 2 + data/maps/ShoalCave_LowTideEntranceRoom/events.inc | 12 + data/maps/ShoalCave_LowTideIceRoom/events.inc | 9 + data/maps/ShoalCave_LowTideInnerRoom/events.inc | 23 + data/maps/ShoalCave_LowTideLowerRoom/events.inc | 15 + data/maps/ShoalCave_LowTideStairsRoom/events.inc | 12 + data/maps/SingleBattleColosseum/events.inc | 13 + data/maps/SkyPillar_1F/events.inc | 7 + data/maps/SkyPillar_2F/events.inc | 6 + data/maps/SkyPillar_3F/events.inc | 7 + data/maps/SkyPillar_4F/events.inc | 7 + data/maps/SkyPillar_5F/events.inc | 6 + data/maps/SkyPillar_Entrance/events.inc | 6 + data/maps/SkyPillar_Outside/events.inc | 6 + data/maps/SkyPillar_Top/events.inc | 8 + data/maps/SlateportCity/events.inc | 62 ++ data/maps/SlateportCity_ContestHall/events.inc | 25 + data/maps/SlateportCity_ContestLobby/events.inc | 23 + data/maps/SlateportCity_Harbor/events.inc | 24 + data/maps/SlateportCity_House1/events.inc | 9 + data/maps/SlateportCity_House2/events.inc | 10 + data/maps/SlateportCity_Mart/events.inc | 11 + .../maps/SlateportCity_OceanicMuseum_1F/events.inc | 42 ++ .../maps/SlateportCity_OceanicMuseum_2F/events.inc | 37 + .../maps/SlateportCity_PokemonCenter_1F/events.inc | 12 + .../maps/SlateportCity_PokemonCenter_2F/events.inc | 14 + data/maps/SlateportCity_PokemonFanClub/events.inc | 16 + .../SlateportCity_SternsShipyard_1F/events.inc | 13 + .../SlateportCity_SternsShipyard_2F/events.inc | 10 + data/maps/SootopolisCity/events.inc | 40 ++ data/maps/SootopolisCity_Gym_1F/events.inc | 15 + data/maps/SootopolisCity_Gym_B1F/events.inc | 15 + data/maps/SootopolisCity_House1/events.inc | 10 + data/maps/SootopolisCity_House2/events.inc | 9 + data/maps/SootopolisCity_House3/events.inc | 10 + data/maps/SootopolisCity_House4/events.inc | 11 + data/maps/SootopolisCity_House5/events.inc | 10 + data/maps/SootopolisCity_House6/events.inc | 9 + data/maps/SootopolisCity_House7/events.inc | 10 + data/maps/SootopolisCity_House8/events.inc | 14 + data/maps/SootopolisCity_Mart/events.inc | 11 + .../SootopolisCity_PokemonCenter_1F/events.inc | 12 + .../SootopolisCity_PokemonCenter_2F/events.inc | 14 + data/maps/SouthernIsland_Exterior/events.inc | 13 + data/maps/SouthernIsland_Interior/events.inc | 13 + data/maps/TradeCenter/events.inc | 13 + data/maps/Underwater1/events.inc | 11 + data/maps/Underwater2/events.inc | 15 + data/maps/Underwater3/events.inc | 8 + data/maps/Underwater4/events.inc | 9 + data/maps/Underwater_Route134/events.inc | 5 + data/maps/Underwater_SeafloorCavern/events.inc | 11 + data/maps/Underwater_SealedChamber/events.inc | 8 + data/maps/Underwater_SootopolisCity/events.inc | 6 + data/maps/UnknownMap_25_29/events.inc | 1 + data/maps/UnknownMap_25_30/events.inc | 1 + data/maps/UnknownMap_25_31/events.inc | 1 + data/maps/UnknownMap_25_32/events.inc | 1 + data/maps/UnknownMap_25_33/events.inc | 1 + data/maps/UnknownMap_25_34/events.inc | 2 + data/maps/VerdanturfTown/events.inc | 27 + data/maps/VerdanturfTown_ContestHall/events.inc | 15 + data/maps/VerdanturfTown_ContestLobby/events.inc | 21 + .../events.inc | 10 + data/maps/VerdanturfTown_House/events.inc | 10 + data/maps/VerdanturfTown_Mart/events.inc | 12 + .../VerdanturfTown_PokemonCenter_1F/events.inc | 12 + .../VerdanturfTown_PokemonCenter_2F/events.inc | 14 + data/maps/VerdanturfTown_WandasHouse/events.inc | 13 + data/maps/VictoryRoad_1F/events.inc | 26 + data/maps/VictoryRoad_B1F/events.inc | 32 + data/maps/VictoryRoad_B2F/events.inc | 19 + data/maps/_assets.inc | 332 --------- data/maps/_groups.inc | 532 -------------- data/maps/attributes_table.inc | 334 --------- data/maps/events/AbandonedShip_CaptainsOffice.inc | 10 - data/maps/events/AbandonedShip_Corridors_1F.inc | 20 - data/maps/events/AbandonedShip_Corridors_B1F.inc | 19 - data/maps/events/AbandonedShip_Deck.inc | 9 - .../events/AbandonedShip_HiddenFloorCorridors.inc | 16 - .../maps/events/AbandonedShip_HiddenFloorRooms.inc | 31 - data/maps/events/AbandonedShip_Room_B1F.inc | 9 - data/maps/events/AbandonedShip_Rooms2_1F.inc | 12 - data/maps/events/AbandonedShip_Rooms2_B1F.inc | 12 - data/maps/events/AbandonedShip_Rooms_1F.inc | 14 - data/maps/events/AbandonedShip_Rooms_B1F.inc | 11 - data/maps/events/AbandonedShip_Underwater1.inc | 6 - data/maps/events/AbandonedShip_Underwater2.inc | 5 - data/maps/events/AncientTomb.inc | 15 - data/maps/events/AquaHideout_1F.inc | 12 - data/maps/events/AquaHideout_B1F.inc | 39 - data/maps/events/AquaHideout_B2F.inc | 25 - data/maps/events/BattleTower_BattleRoom.inc | 10 - data/maps/events/BattleTower_Corridor.inc | 5 - data/maps/events/BattleTower_Elevator.inc | 5 - data/maps/events/BattleTower_Lobby.inc | 18 - data/maps/events/BattleTower_Outside.inc | 15 - data/maps/events/CaveOfOrigin_1F.inc | 11 - data/maps/events/CaveOfOrigin_B1F.inc | 11 - data/maps/events/CaveOfOrigin_B2F.inc | 11 - data/maps/events/CaveOfOrigin_B3F.inc | 14 - data/maps/events/CaveOfOrigin_B4F.inc | 13 - data/maps/events/CaveOfOrigin_Entrance.inc | 6 - data/maps/events/DesertRuins.inc | 15 - data/maps/events/DewfordTown.inc | 23 - data/maps/events/DewfordTown_Gym.inc | 19 - data/maps/events/DewfordTown_Hall.inc | 21 - data/maps/events/DewfordTown_House1.inc | 11 - data/maps/events/DewfordTown_House2.inc | 10 - data/maps/events/DewfordTown_PokemonCenter_1F.inc | 12 - data/maps/events/DewfordTown_PokemonCenter_2F.inc | 14 - data/maps/events/DoubleBattleColosseum.inc | 14 - data/maps/events/EverGrandeCity.inc | 28 - data/maps/events/EverGrandeCity_ChampionsRoom.inc | 11 - data/maps/events/EverGrandeCity_Corridor1.inc | 8 - data/maps/events/EverGrandeCity_Corridor2.inc | 8 - data/maps/events/EverGrandeCity_Corridor3.inc | 8 - data/maps/events/EverGrandeCity_Corridor4.inc | 6 - data/maps/events/EverGrandeCity_Corridor5.inc | 8 - data/maps/events/EverGrandeCity_DrakesRoom.inc | 9 - data/maps/events/EverGrandeCity_GlaciasRoom.inc | 9 - data/maps/events/EverGrandeCity_HallOfFame.inc | 8 - data/maps/events/EverGrandeCity_PhoebesRoom.inc | 9 - .../events/EverGrandeCity_PokemonCenter_1F.inc | 12 - .../events/EverGrandeCity_PokemonCenter_2F.inc | 14 - data/maps/events/EverGrandeCity_PokemonLeague.inc | 14 - data/maps/events/EverGrandeCity_SidneysRoom.inc | 9 - data/maps/events/FallarborTown.inc | 25 - data/maps/events/FallarborTown_ContestHall.inc | 15 - data/maps/events/FallarborTown_ContestLobby.inc | 21 - data/maps/events/FallarborTown_House1.inc | 10 - data/maps/events/FallarborTown_House2.inc | 9 - data/maps/events/FallarborTown_Mart.inc | 12 - .../maps/events/FallarborTown_PokemonCenter_1F.inc | 13 - .../maps/events/FallarborTown_PokemonCenter_2F.inc | 14 - data/maps/events/FieryPath.inc | 16 - data/maps/events/FortreeCity.inc | 30 - data/maps/events/FortreeCity_DecorationShop.inc | 12 - data/maps/events/FortreeCity_Gym.inc | 18 - data/maps/events/FortreeCity_House1.inc | 11 - data/maps/events/FortreeCity_House2.inc | 9 - data/maps/events/FortreeCity_House3.inc | 10 - data/maps/events/FortreeCity_House4.inc | 11 - data/maps/events/FortreeCity_House5.inc | 11 - data/maps/events/FortreeCity_Mart.inc | 12 - data/maps/events/FortreeCity_PokemonCenter_1F.inc | 13 - data/maps/events/FortreeCity_PokemonCenter_2F.inc | 14 - data/maps/events/GraniteCave_1F.inc | 12 - data/maps/events/GraniteCave_B1F.inc | 14 - data/maps/events/GraniteCave_B2F.inc | 24 - data/maps/events/GraniteCave_StevensRoom.inc | 8 - data/maps/events/InsideOfTruck.inc | 24 - data/maps/events/IslandCave.inc | 15 - data/maps/events/JaggedPass.inc | 25 - data/maps/events/LavaridgeTown.inc | 34 - data/maps/events/LavaridgeTown_Gym_1F.inc | 39 - data/maps/events/LavaridgeTown_Gym_B1F.inc | 24 - data/maps/events/LavaridgeTown_HerbShop.inc | 11 - data/maps/events/LavaridgeTown_House.inc | 10 - data/maps/events/LavaridgeTown_Mart.inc | 11 - .../maps/events/LavaridgeTown_PokemonCenter_1F.inc | 14 - .../maps/events/LavaridgeTown_PokemonCenter_2F.inc | 14 - data/maps/events/LilycoveCity.inc | 53 -- data/maps/events/LilycoveCity_ContestHall.inc | 50 -- data/maps/events/LilycoveCity_ContestLobby.inc | 32 - data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc | 13 - data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc | 13 - .../LilycoveCity_DepartmentStoreElevator.inc | 9 - .../events/LilycoveCity_DepartmentStoreRooftop.inc | 14 - .../events/LilycoveCity_DepartmentStore_1F.inc | 19 - .../events/LilycoveCity_DepartmentStore_2F.inc | 14 - .../events/LilycoveCity_DepartmentStore_3F.inc | 14 - .../events/LilycoveCity_DepartmentStore_4F.inc | 14 - .../events/LilycoveCity_DepartmentStore_5F.inc | 16 - data/maps/events/LilycoveCity_EmptyMap.inc | 5 - data/maps/events/LilycoveCity_Harbor.inc | 14 - data/maps/events/LilycoveCity_House1.inc | 10 - data/maps/events/LilycoveCity_House2.inc | 9 - data/maps/events/LilycoveCity_House3.inc | 14 - data/maps/events/LilycoveCity_House4.inc | 10 - .../maps/events/LilycoveCity_LilycoveMuseum_1F.inc | 37 - .../maps/events/LilycoveCity_LilycoveMuseum_2F.inc | 25 - .../maps/events/LilycoveCity_MoveDeletersHouse.inc | 9 - data/maps/events/LilycoveCity_PokemonCenter_1F.inc | 12 - data/maps/events/LilycoveCity_PokemonCenter_2F.inc | 14 - .../events/LilycoveCity_PokemonTrainerFanClub.inc | 16 - data/maps/events/LilycoveCity_UnusedMart.inc | 6 - data/maps/events/LinkContestRoom1.inc | 18 - data/maps/events/LinkContestRoom2.inc | 1 - data/maps/events/LinkContestRoom3.inc | 1 - data/maps/events/LinkContestRoom4.inc | 1 - data/maps/events/LinkContestRoom5.inc | 1 - data/maps/events/LinkContestRoom6.inc | 1 - data/maps/events/LittlerootTown.inc | 32 - .../events/LittlerootTown_BrendansHouse_1F.inc | 17 - .../events/LittlerootTown_BrendansHouse_2F.inc | 27 - data/maps/events/LittlerootTown_MaysHouse_1F.inc | 17 - data/maps/events/LittlerootTown_MaysHouse_2F.inc | 28 - .../events/LittlerootTown_ProfessorBirchsLab.inc | 28 - data/maps/events/MagmaHideout_1F.inc | 11 - data/maps/events/MagmaHideout_B1F.inc | 43 -- data/maps/events/MagmaHideout_B2F.inc | 25 - data/maps/events/MauvilleCity.inc | 32 - data/maps/events/MauvilleCity_BikeShop.inc | 14 - data/maps/events/MauvilleCity_GameCorner.inc | 46 -- data/maps/events/MauvilleCity_Gym.inc | 23 - data/maps/events/MauvilleCity_House1.inc | 9 - data/maps/events/MauvilleCity_House2.inc | 9 - data/maps/events/MauvilleCity_Mart.inc | 11 - data/maps/events/MauvilleCity_PokemonCenter_1F.inc | 14 - data/maps/events/MauvilleCity_PokemonCenter_2F.inc | 15 - data/maps/events/MeteorFalls_1F_1R.inc | 28 - data/maps/events/MeteorFalls_1F_2R.inc | 17 - data/maps/events/MeteorFalls_B1F_1R.inc | 10 - data/maps/events/MeteorFalls_B1F_2R.inc | 8 - data/maps/events/MossdeepCity.inc | 41 -- data/maps/events/MossdeepCity_GameCorner_1F.inc | 13 - data/maps/events/MossdeepCity_GameCorner_B1F.inc | 8 - data/maps/events/MossdeepCity_Gym.inc | 28 - data/maps/events/MossdeepCity_House1.inc | 10 - data/maps/events/MossdeepCity_House2.inc | 11 - data/maps/events/MossdeepCity_House3.inc | 9 - data/maps/events/MossdeepCity_House4.inc | 11 - data/maps/events/MossdeepCity_Mart.inc | 12 - data/maps/events/MossdeepCity_PokemonCenter_1F.inc | 12 - data/maps/events/MossdeepCity_PokemonCenter_2F.inc | 15 - data/maps/events/MossdeepCity_SpaceCenter_1F.inc | 14 - data/maps/events/MossdeepCity_SpaceCenter_2F.inc | 10 - data/maps/events/MossdeepCity_StevensHouse.inc | 18 - data/maps/events/MtChimney.inc | 42 -- data/maps/events/MtChimney_CableCarStation.inc | 10 - data/maps/events/MtPyre_1F.inc | 15 - data/maps/events/MtPyre_2F.inc | 17 - data/maps/events/MtPyre_3F.inc | 15 - data/maps/events/MtPyre_4F.inc | 14 - data/maps/events/MtPyre_5F.inc | 13 - data/maps/events/MtPyre_6F.inc | 10 - data/maps/events/MtPyre_Exterior.inc | 22 - data/maps/events/MtPyre_Summit.inc | 27 - data/maps/events/NewMauville_Entrance.inc | 9 - data/maps/events/NewMauville_Inside.inc | 37 - data/maps/events/OldaleTown.inc | 27 - data/maps/events/OldaleTown_House1.inc | 9 - data/maps/events/OldaleTown_House2.inc | 10 - data/maps/events/OldaleTown_Mart.inc | 11 - data/maps/events/OldaleTown_PokemonCenter_1F.inc | 13 - data/maps/events/OldaleTown_PokemonCenter_2F.inc | 14 - data/maps/events/PacifidlogTown.inc | 20 - data/maps/events/PacifidlogTown_House1.inc | 10 - data/maps/events/PacifidlogTown_House2.inc | 11 - data/maps/events/PacifidlogTown_House3.inc | 10 - data/maps/events/PacifidlogTown_House4.inc | 11 - data/maps/events/PacifidlogTown_House5.inc | 10 - .../events/PacifidlogTown_PokemonCenter_1F.inc | 13 - .../events/PacifidlogTown_PokemonCenter_2F.inc | 14 - data/maps/events/PetalburgCity.inc | 37 - data/maps/events/PetalburgCity_Gym.inc | 70 -- data/maps/events/PetalburgCity_House1.inc | 10 - data/maps/events/PetalburgCity_House2.inc | 10 - data/maps/events/PetalburgCity_Mart.inc | 12 - .../maps/events/PetalburgCity_PokemonCenter_1F.inc | 14 - .../maps/events/PetalburgCity_PokemonCenter_2F.inc | 14 - data/maps/events/PetalburgCity_WallysHouse.inc | 10 - data/maps/events/PetalburgWoods.inc | 37 - data/maps/events/RecordCorner.inc | 17 - data/maps/events/Route101.inc | 24 - data/maps/events/Route102.inc | 17 - data/maps/events/Route103.inc | 22 - data/maps/events/Route104.inc | 58 -- data/maps/events/Route104_MrBrineysHouse.inc | 10 - .../maps/events/Route104_PrettyPetalFlowerShop.inc | 11 - data/maps/events/Route104_Prototype.inc | 23 - .../Route104_PrototypePrettyPetalFlowerShop.inc | 9 - data/maps/events/Route105.inc | 16 - data/maps/events/Route106.inc | 18 - data/maps/events/Route107.inc | 10 - data/maps/events/Route108.inc | 14 - data/maps/events/Route109.inc | 37 - data/maps/events/Route109_SeashoreHouse.inc | 12 - data/maps/events/Route110.inc | 69 -- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 15 - .../Route110_SeasideCyclingRoadSouthEntrance.inc | 15 - data/maps/events/Route110_TrickHouseCorridor.inc | 8 - data/maps/events/Route110_TrickHouseEnd.inc | 15 - data/maps/events/Route110_TrickHouseEntrance.inc | 19 - data/maps/events/Route110_TrickHousePuzzle1.inc | 31 - data/maps/events/Route110_TrickHousePuzzle2.inc | 23 - data/maps/events/Route110_TrickHousePuzzle3.inc | 32 - data/maps/events/Route110_TrickHousePuzzle4.inc | 27 - data/maps/events/Route110_TrickHousePuzzle5.inc | 33 - data/maps/events/Route110_TrickHousePuzzle6.inc | 16 - data/maps/events/Route110_TrickHousePuzzle7.inc | 24 - data/maps/events/Route110_TrickHousePuzzle8.inc | 16 - data/maps/events/Route111.inc | 100 --- data/maps/events/Route111_OldLadysRestStop.inc | 9 - .../maps/events/Route111_WinstrateFamilysHouse.inc | 12 - data/maps/events/Route112.inc | 29 - data/maps/events/Route112_CableCarStation.inc | 10 - data/maps/events/Route113.inc | 48 -- data/maps/events/Route113_GlassWorkshop.inc | 10 - data/maps/events/Route114.inc | 46 -- data/maps/events/Route114_FossilManiacsHouse.inc | 16 - data/maps/events/Route114_FossilManiacsTunnel.inc | 9 - data/maps/events/Route114_LanettesHouse.inc | 14 - data/maps/events/Route115.inc | 39 - data/maps/events/Route116.inc | 47 -- data/maps/events/Route116_TunnelersRestHouse.inc | 11 - data/maps/events/Route117.inc | 34 - data/maps/events/Route117_PokemonDayCare.inc | 9 - data/maps/events/Route118.inc | 40 -- data/maps/events/Route119.inc | 94 --- data/maps/events/Route119_House.inc | 15 - data/maps/events/Route119_WeatherInstitute_1F.inc | 20 - data/maps/events/Route119_WeatherInstitute_2F.inc | 13 - data/maps/events/Route120.inc | 86 --- data/maps/events/Route121.inc | 46 -- data/maps/events/Route121_SafariZoneEntrance.inc | 19 - data/maps/events/Route122.inc | 5 - data/maps/events/Route123.inc | 76 -- data/maps/events/Route123_BerryMastersHouse.inc | 10 - data/maps/events/Route124.inc | 20 - .../events/Route124_DivingTreasureHuntersHouse.inc | 12 - data/maps/events/Route125.inc | 20 - data/maps/events/Route126.inc | 9 - data/maps/events/Route127.inc | 20 - data/maps/events/Route128.inc | 17 - data/maps/events/Route129.inc | 8 - data/maps/events/Route130.inc | 7 - data/maps/events/Route131.inc | 13 - data/maps/events/Route132.inc | 9 - data/maps/events/Route133.inc | 11 - data/maps/events/Route134.inc | 9 - data/maps/events/RustboroCity.inc | 59 -- data/maps/events/RustboroCity_CuttersHouse.inc | 10 - data/maps/events/RustboroCity_DevonCorp_1F.inc | 12 - data/maps/events/RustboroCity_DevonCorp_2F.inc | 13 - data/maps/events/RustboroCity_DevonCorp_3F.inc | 14 - data/maps/events/RustboroCity_Flat1_1F.inc | 11 - data/maps/events/RustboroCity_Flat1_2F.inc | 8 - data/maps/events/RustboroCity_Flat2_1F.inc | 11 - data/maps/events/RustboroCity_Flat2_2F.inc | 10 - data/maps/events/RustboroCity_Flat2_3F.inc | 9 - data/maps/events/RustboroCity_Gym.inc | 16 - data/maps/events/RustboroCity_House1.inc | 10 - data/maps/events/RustboroCity_House2.inc | 10 - data/maps/events/RustboroCity_House3.inc | 11 - data/maps/events/RustboroCity_Mart.inc | 12 - data/maps/events/RustboroCity_PokemonCenter_1F.inc | 13 - data/maps/events/RustboroCity_PokemonCenter_2F.inc | 14 - data/maps/events/RustboroCity_PokemonSchool.inc | 21 - data/maps/events/RusturfTunnel.inc | 26 - data/maps/events/SSTidalCorridor.inc | 33 - data/maps/events/SSTidalLowerDeck.inc | 12 - data/maps/events/SSTidalRooms.inc | 30 - data/maps/events/SafariZone_Northeast.inc | 13 - data/maps/events/SafariZone_Northwest.inc | 6 - data/maps/events/SafariZone_RestHouse.inc | 11 - data/maps/events/SafariZone_Southeast.inc | 11 - data/maps/events/SafariZone_Southwest.inc | 12 - data/maps/events/ScorchedSlab.inc | 8 - data/maps/events/SeafloorCavern_Entrance.inc | 6 - data/maps/events/SeafloorCavern_Room1.inc | 14 - data/maps/events/SeafloorCavern_Room2.inc | 19 - data/maps/events/SeafloorCavern_Room3.inc | 19 - data/maps/events/SeafloorCavern_Room4.inc | 11 - data/maps/events/SeafloorCavern_Room5.inc | 15 - data/maps/events/SeafloorCavern_Room6.inc | 7 - data/maps/events/SeafloorCavern_Room7.inc | 6 - data/maps/events/SeafloorCavern_Room8.inc | 20 - data/maps/events/SeafloorCavern_Room9.inc | 17 - data/maps/events/SealedChamber_InnerRoom.inc | 16 - data/maps/events/SealedChamber_OuterRoom.inc | 36 - data/maps/events/SecretBase_BlueCave1.inc | 22 - data/maps/events/SecretBase_BlueCave2.inc | 22 - data/maps/events/SecretBase_BlueCave3.inc | 22 - data/maps/events/SecretBase_BlueCave4.inc | 22 - data/maps/events/SecretBase_BrownCave1.inc | 22 - data/maps/events/SecretBase_BrownCave2.inc | 22 - data/maps/events/SecretBase_BrownCave3.inc | 22 - data/maps/events/SecretBase_BrownCave4.inc | 22 - data/maps/events/SecretBase_RedCave1.inc | 22 - data/maps/events/SecretBase_RedCave2.inc | 22 - data/maps/events/SecretBase_RedCave3.inc | 22 - data/maps/events/SecretBase_RedCave4.inc | 22 - data/maps/events/SecretBase_Shrub1.inc | 22 - data/maps/events/SecretBase_Shrub2.inc | 22 - data/maps/events/SecretBase_Shrub3.inc | 22 - data/maps/events/SecretBase_Shrub4.inc | 22 - data/maps/events/SecretBase_Tree1.inc | 22 - data/maps/events/SecretBase_Tree2.inc | 22 - data/maps/events/SecretBase_Tree3.inc | 22 - data/maps/events/SecretBase_Tree4.inc | 22 - data/maps/events/SecretBase_YellowCave1.inc | 22 - data/maps/events/SecretBase_YellowCave2.inc | 22 - data/maps/events/SecretBase_YellowCave3.inc | 22 - data/maps/events/SecretBase_YellowCave4.inc | 22 - .../maps/events/ShoalCave_HighTideEntranceRoom.inc | 2 - data/maps/events/ShoalCave_HighTideInnerRoom.inc | 2 - data/maps/events/ShoalCave_LowTideEntranceRoom.inc | 12 - data/maps/events/ShoalCave_LowTideIceRoom.inc | 9 - data/maps/events/ShoalCave_LowTideInnerRoom.inc | 23 - data/maps/events/ShoalCave_LowTideLowerRoom.inc | 15 - data/maps/events/ShoalCave_LowTideStairsRoom.inc | 12 - data/maps/events/SingleBattleColosseum.inc | 13 - data/maps/events/SkyPillar_1F.inc | 7 - data/maps/events/SkyPillar_2F.inc | 6 - data/maps/events/SkyPillar_3F.inc | 7 - data/maps/events/SkyPillar_4F.inc | 7 - data/maps/events/SkyPillar_5F.inc | 6 - data/maps/events/SkyPillar_Entrance.inc | 6 - data/maps/events/SkyPillar_Outside.inc | 6 - data/maps/events/SkyPillar_Top.inc | 8 - data/maps/events/SlateportCity.inc | 62 -- data/maps/events/SlateportCity_ContestHall.inc | 25 - data/maps/events/SlateportCity_ContestLobby.inc | 23 - data/maps/events/SlateportCity_Harbor.inc | 24 - data/maps/events/SlateportCity_House1.inc | 9 - data/maps/events/SlateportCity_House2.inc | 10 - data/maps/events/SlateportCity_Mart.inc | 11 - .../maps/events/SlateportCity_OceanicMuseum_1F.inc | 42 -- .../maps/events/SlateportCity_OceanicMuseum_2F.inc | 37 - .../maps/events/SlateportCity_PokemonCenter_1F.inc | 12 - .../maps/events/SlateportCity_PokemonCenter_2F.inc | 14 - data/maps/events/SlateportCity_PokemonFanClub.inc | 16 - .../events/SlateportCity_SternsShipyard_1F.inc | 13 - .../events/SlateportCity_SternsShipyard_2F.inc | 10 - data/maps/events/SootopolisCity.inc | 40 -- data/maps/events/SootopolisCity_Gym_1F.inc | 15 - data/maps/events/SootopolisCity_Gym_B1F.inc | 15 - data/maps/events/SootopolisCity_House1.inc | 10 - data/maps/events/SootopolisCity_House2.inc | 9 - data/maps/events/SootopolisCity_House3.inc | 10 - data/maps/events/SootopolisCity_House4.inc | 11 - data/maps/events/SootopolisCity_House5.inc | 10 - data/maps/events/SootopolisCity_House6.inc | 9 - data/maps/events/SootopolisCity_House7.inc | 10 - data/maps/events/SootopolisCity_House8.inc | 14 - data/maps/events/SootopolisCity_Mart.inc | 11 - .../events/SootopolisCity_PokemonCenter_1F.inc | 12 - .../events/SootopolisCity_PokemonCenter_2F.inc | 14 - data/maps/events/SouthernIsland_Exterior.inc | 13 - data/maps/events/SouthernIsland_Interior.inc | 13 - data/maps/events/TradeCenter.inc | 13 - data/maps/events/Underwater1.inc | 11 - data/maps/events/Underwater2.inc | 15 - data/maps/events/Underwater3.inc | 8 - data/maps/events/Underwater4.inc | 9 - data/maps/events/Underwater_Route134.inc | 5 - data/maps/events/Underwater_SeafloorCavern.inc | 11 - data/maps/events/Underwater_SealedChamber.inc | 8 - data/maps/events/Underwater_SootopolisCity.inc | 6 - data/maps/events/UnknownMap_25_29.inc | 1 - data/maps/events/UnknownMap_25_30.inc | 1 - data/maps/events/UnknownMap_25_31.inc | 1 - data/maps/events/UnknownMap_25_32.inc | 1 - data/maps/events/UnknownMap_25_33.inc | 1 - data/maps/events/UnknownMap_25_34.inc | 2 - data/maps/events/VerdanturfTown.inc | 27 - data/maps/events/VerdanturfTown_ContestHall.inc | 15 - data/maps/events/VerdanturfTown_ContestLobby.inc | 21 - .../VerdanturfTown_FriendshipRatersHouse.inc | 10 - data/maps/events/VerdanturfTown_House.inc | 10 - data/maps/events/VerdanturfTown_Mart.inc | 12 - .../events/VerdanturfTown_PokemonCenter_1F.inc | 12 - .../events/VerdanturfTown_PokemonCenter_2F.inc | 14 - data/maps/events/VerdanturfTown_WandasHouse.inc | 13 - data/maps/events/VictoryRoad_1F.inc | 26 - data/maps/events/VictoryRoad_B1F.inc | 32 - data/maps/events/VictoryRoad_B2F.inc | 19 - data/maps/groups.inc | 532 ++++++++++++++ 796 files changed, 8386 insertions(+), 8385 deletions(-) create mode 100644 data/layouts.inc create mode 100644 data/layouts_table.inc create mode 100644 data/maps/AbandonedShip_CaptainsOffice/events.inc create mode 100644 data/maps/AbandonedShip_Corridors_1F/events.inc create mode 100644 data/maps/AbandonedShip_Corridors_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Deck/events.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorCorridors/events.inc create mode 100644 data/maps/AbandonedShip_HiddenFloorRooms/events.inc create mode 100644 data/maps/AbandonedShip_Room_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms2_1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms2_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms_1F/events.inc create mode 100644 data/maps/AbandonedShip_Rooms_B1F/events.inc create mode 100644 data/maps/AbandonedShip_Underwater1/events.inc create mode 100644 data/maps/AbandonedShip_Underwater2/events.inc create mode 100644 data/maps/AncientTomb/events.inc create mode 100644 data/maps/AquaHideout_1F/events.inc create mode 100644 data/maps/AquaHideout_B1F/events.inc create mode 100644 data/maps/AquaHideout_B2F/events.inc create mode 100644 data/maps/BattleTower_BattleRoom/events.inc create mode 100644 data/maps/BattleTower_Corridor/events.inc create mode 100644 data/maps/BattleTower_Elevator/events.inc create mode 100644 data/maps/BattleTower_Lobby/events.inc create mode 100644 data/maps/BattleTower_Outside/events.inc create mode 100644 data/maps/CaveOfOrigin_1F/events.inc create mode 100644 data/maps/CaveOfOrigin_B1F/events.inc create mode 100644 data/maps/CaveOfOrigin_B2F/events.inc create mode 100644 data/maps/CaveOfOrigin_B3F/events.inc create mode 100644 data/maps/CaveOfOrigin_B4F/events.inc create mode 100644 data/maps/CaveOfOrigin_Entrance/events.inc create mode 100644 data/maps/DesertRuins/events.inc create mode 100644 data/maps/DewfordTown/events.inc create mode 100644 data/maps/DewfordTown_Gym/events.inc create mode 100644 data/maps/DewfordTown_Hall/events.inc create mode 100644 data/maps/DewfordTown_House1/events.inc create mode 100644 data/maps/DewfordTown_House2/events.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/DewfordTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/DoubleBattleColosseum/events.inc create mode 100644 data/maps/EverGrandeCity/events.inc create mode 100644 data/maps/EverGrandeCity_ChampionsRoom/events.inc create mode 100644 data/maps/EverGrandeCity_Corridor1/events.inc create mode 100644 data/maps/EverGrandeCity_Corridor2/events.inc create mode 100644 data/maps/EverGrandeCity_Corridor3/events.inc create mode 100644 data/maps/EverGrandeCity_Corridor4/events.inc create mode 100644 data/maps/EverGrandeCity_Corridor5/events.inc create mode 100644 data/maps/EverGrandeCity_DrakesRoom/events.inc create mode 100644 data/maps/EverGrandeCity_GlaciasRoom/events.inc create mode 100644 data/maps/EverGrandeCity_HallOfFame/events.inc create mode 100644 data/maps/EverGrandeCity_PhoebesRoom/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/EverGrandeCity_PokemonLeague/events.inc create mode 100644 data/maps/EverGrandeCity_SidneysRoom/events.inc create mode 100644 data/maps/FallarborTown/events.inc create mode 100644 data/maps/FallarborTown_ContestHall/events.inc create mode 100644 data/maps/FallarborTown_ContestLobby/events.inc create mode 100644 data/maps/FallarborTown_House1/events.inc create mode 100644 data/maps/FallarborTown_House2/events.inc create mode 100644 data/maps/FallarborTown_Mart/events.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/FallarborTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/FieryPath/events.inc create mode 100644 data/maps/FortreeCity/events.inc create mode 100644 data/maps/FortreeCity_DecorationShop/events.inc create mode 100644 data/maps/FortreeCity_Gym/events.inc create mode 100644 data/maps/FortreeCity_House1/events.inc create mode 100644 data/maps/FortreeCity_House2/events.inc create mode 100644 data/maps/FortreeCity_House3/events.inc create mode 100644 data/maps/FortreeCity_House4/events.inc create mode 100644 data/maps/FortreeCity_House5/events.inc create mode 100644 data/maps/FortreeCity_Mart/events.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/FortreeCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/GraniteCave_1F/events.inc create mode 100644 data/maps/GraniteCave_B1F/events.inc create mode 100644 data/maps/GraniteCave_B2F/events.inc create mode 100644 data/maps/GraniteCave_StevensRoom/events.inc create mode 100644 data/maps/InsideOfTruck/events.inc create mode 100644 data/maps/IslandCave/events.inc create mode 100644 data/maps/JaggedPass/events.inc create mode 100644 data/maps/LavaridgeTown/events.inc create mode 100644 data/maps/LavaridgeTown_Gym_1F/events.inc create mode 100644 data/maps/LavaridgeTown_Gym_B1F/events.inc create mode 100644 data/maps/LavaridgeTown_HerbShop/events.inc create mode 100644 data/maps/LavaridgeTown_House/events.inc create mode 100644 data/maps/LavaridgeTown_Mart/events.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/LavaridgeTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/LilycoveCity/events.inc create mode 100644 data/maps/LilycoveCity_ContestHall/events.inc create mode 100644 data/maps/LilycoveCity_ContestLobby/events.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc create mode 100644 data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreElevator/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_1F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_2F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_3F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_4F/events.inc create mode 100644 data/maps/LilycoveCity_DepartmentStore_5F/events.inc create mode 100644 data/maps/LilycoveCity_EmptyMap/events.inc create mode 100644 data/maps/LilycoveCity_Harbor/events.inc create mode 100644 data/maps/LilycoveCity_House1/events.inc create mode 100644 data/maps/LilycoveCity_House2/events.inc create mode 100644 data/maps/LilycoveCity_House3/events.inc create mode 100644 data/maps/LilycoveCity_House4/events.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc create mode 100644 data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc create mode 100644 data/maps/LilycoveCity_MoveDeletersHouse/events.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/LilycoveCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc create mode 100644 data/maps/LilycoveCity_UnusedMart/events.inc create mode 100644 data/maps/LinkContestRoom1/events.inc create mode 100644 data/maps/LinkContestRoom2/events.inc create mode 100644 data/maps/LinkContestRoom3/events.inc create mode 100644 data/maps/LinkContestRoom4/events.inc create mode 100644 data/maps/LinkContestRoom5/events.inc create mode 100644 data/maps/LinkContestRoom6/events.inc create mode 100644 data/maps/LittlerootTown/events.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_1F/events.inc create mode 100644 data/maps/LittlerootTown_BrendansHouse_2F/events.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_1F/events.inc create mode 100644 data/maps/LittlerootTown_MaysHouse_2F/events.inc create mode 100644 data/maps/LittlerootTown_ProfessorBirchsLab/events.inc create mode 100644 data/maps/MagmaHideout_1F/events.inc create mode 100644 data/maps/MagmaHideout_B1F/events.inc create mode 100644 data/maps/MagmaHideout_B2F/events.inc create mode 100644 data/maps/MauvilleCity/events.inc create mode 100644 data/maps/MauvilleCity_BikeShop/events.inc create mode 100644 data/maps/MauvilleCity_GameCorner/events.inc create mode 100644 data/maps/MauvilleCity_Gym/events.inc create mode 100644 data/maps/MauvilleCity_House1/events.inc create mode 100644 data/maps/MauvilleCity_House2/events.inc create mode 100644 data/maps/MauvilleCity_Mart/events.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/MauvilleCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/MeteorFalls_1F_1R/events.inc create mode 100644 data/maps/MeteorFalls_1F_2R/events.inc create mode 100644 data/maps/MeteorFalls_B1F_1R/events.inc create mode 100644 data/maps/MeteorFalls_B1F_2R/events.inc create mode 100644 data/maps/MossdeepCity/events.inc create mode 100644 data/maps/MossdeepCity_GameCorner_1F/events.inc create mode 100644 data/maps/MossdeepCity_GameCorner_B1F/events.inc create mode 100644 data/maps/MossdeepCity_Gym/events.inc create mode 100644 data/maps/MossdeepCity_House1/events.inc create mode 100644 data/maps/MossdeepCity_House2/events.inc create mode 100644 data/maps/MossdeepCity_House3/events.inc create mode 100644 data/maps/MossdeepCity_House4/events.inc create mode 100644 data/maps/MossdeepCity_Mart/events.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/MossdeepCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_1F/events.inc create mode 100644 data/maps/MossdeepCity_SpaceCenter_2F/events.inc create mode 100644 data/maps/MossdeepCity_StevensHouse/events.inc create mode 100644 data/maps/MtChimney/events.inc create mode 100644 data/maps/MtChimney_CableCarStation/events.inc create mode 100644 data/maps/MtPyre_1F/events.inc create mode 100644 data/maps/MtPyre_2F/events.inc create mode 100644 data/maps/MtPyre_3F/events.inc create mode 100644 data/maps/MtPyre_4F/events.inc create mode 100644 data/maps/MtPyre_5F/events.inc create mode 100644 data/maps/MtPyre_6F/events.inc create mode 100644 data/maps/MtPyre_Exterior/events.inc create mode 100644 data/maps/MtPyre_Summit/events.inc create mode 100644 data/maps/NewMauville_Entrance/events.inc create mode 100644 data/maps/NewMauville_Inside/events.inc create mode 100644 data/maps/OldaleTown/events.inc create mode 100644 data/maps/OldaleTown_House1/events.inc create mode 100644 data/maps/OldaleTown_House2/events.inc create mode 100644 data/maps/OldaleTown_Mart/events.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/OldaleTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/PacifidlogTown/events.inc create mode 100644 data/maps/PacifidlogTown_House1/events.inc create mode 100644 data/maps/PacifidlogTown_House2/events.inc create mode 100644 data/maps/PacifidlogTown_House3/events.inc create mode 100644 data/maps/PacifidlogTown_House4/events.inc create mode 100644 data/maps/PacifidlogTown_House5/events.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/PacifidlogTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/PetalburgCity/events.inc create mode 100644 data/maps/PetalburgCity_Gym/events.inc create mode 100644 data/maps/PetalburgCity_House1/events.inc create mode 100644 data/maps/PetalburgCity_House2/events.inc create mode 100644 data/maps/PetalburgCity_Mart/events.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/PetalburgCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/PetalburgCity_WallysHouse/events.inc create mode 100644 data/maps/PetalburgWoods/events.inc create mode 100644 data/maps/RecordCorner/events.inc create mode 100644 data/maps/Route101/events.inc create mode 100644 data/maps/Route102/events.inc create mode 100644 data/maps/Route103/events.inc create mode 100644 data/maps/Route104/events.inc create mode 100644 data/maps/Route104_MrBrineysHouse/events.inc create mode 100644 data/maps/Route104_PrettyPetalFlowerShop/events.inc create mode 100644 data/maps/Route104_Prototype/events.inc create mode 100644 data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc create mode 100644 data/maps/Route105/events.inc create mode 100644 data/maps/Route106/events.inc create mode 100644 data/maps/Route107/events.inc create mode 100644 data/maps/Route108/events.inc create mode 100644 data/maps/Route109/events.inc create mode 100644 data/maps/Route109_SeashoreHouse/events.inc create mode 100644 data/maps/Route110/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc create mode 100644 data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc create mode 100644 data/maps/Route110_TrickHouseCorridor/events.inc create mode 100644 data/maps/Route110_TrickHouseEnd/events.inc create mode 100644 data/maps/Route110_TrickHouseEntrance/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle1/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle2/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle3/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle4/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle5/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle6/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle7/events.inc create mode 100644 data/maps/Route110_TrickHousePuzzle8/events.inc create mode 100644 data/maps/Route111/events.inc create mode 100644 data/maps/Route111_OldLadysRestStop/events.inc create mode 100644 data/maps/Route111_WinstrateFamilysHouse/events.inc create mode 100644 data/maps/Route112/events.inc create mode 100644 data/maps/Route112_CableCarStation/events.inc create mode 100644 data/maps/Route113/events.inc create mode 100644 data/maps/Route113_GlassWorkshop/events.inc create mode 100644 data/maps/Route114/events.inc create mode 100644 data/maps/Route114_FossilManiacsHouse/events.inc create mode 100644 data/maps/Route114_FossilManiacsTunnel/events.inc create mode 100644 data/maps/Route114_LanettesHouse/events.inc create mode 100644 data/maps/Route115/events.inc create mode 100644 data/maps/Route116/events.inc create mode 100644 data/maps/Route116_TunnelersRestHouse/events.inc create mode 100644 data/maps/Route117/events.inc create mode 100644 data/maps/Route117_PokemonDayCare/events.inc create mode 100644 data/maps/Route118/events.inc create mode 100644 data/maps/Route119/events.inc create mode 100644 data/maps/Route119_House/events.inc create mode 100644 data/maps/Route119_WeatherInstitute_1F/events.inc create mode 100644 data/maps/Route119_WeatherInstitute_2F/events.inc create mode 100644 data/maps/Route120/events.inc create mode 100644 data/maps/Route121/events.inc create mode 100644 data/maps/Route121_SafariZoneEntrance/events.inc create mode 100644 data/maps/Route122/events.inc create mode 100644 data/maps/Route123/events.inc create mode 100644 data/maps/Route123_BerryMastersHouse/events.inc create mode 100644 data/maps/Route124/events.inc create mode 100644 data/maps/Route124_DivingTreasureHuntersHouse/events.inc create mode 100644 data/maps/Route125/events.inc create mode 100644 data/maps/Route126/events.inc create mode 100644 data/maps/Route127/events.inc create mode 100644 data/maps/Route128/events.inc create mode 100644 data/maps/Route129/events.inc create mode 100644 data/maps/Route130/events.inc create mode 100644 data/maps/Route131/events.inc create mode 100644 data/maps/Route132/events.inc create mode 100644 data/maps/Route133/events.inc create mode 100644 data/maps/Route134/events.inc create mode 100644 data/maps/RustboroCity/events.inc create mode 100644 data/maps/RustboroCity_CuttersHouse/events.inc create mode 100644 data/maps/RustboroCity_DevonCorp_1F/events.inc create mode 100644 data/maps/RustboroCity_DevonCorp_2F/events.inc create mode 100644 data/maps/RustboroCity_DevonCorp_3F/events.inc create mode 100644 data/maps/RustboroCity_Flat1_1F/events.inc create mode 100644 data/maps/RustboroCity_Flat1_2F/events.inc create mode 100644 data/maps/RustboroCity_Flat2_1F/events.inc create mode 100644 data/maps/RustboroCity_Flat2_2F/events.inc create mode 100644 data/maps/RustboroCity_Flat2_3F/events.inc create mode 100644 data/maps/RustboroCity_Gym/events.inc create mode 100644 data/maps/RustboroCity_House1/events.inc create mode 100644 data/maps/RustboroCity_House2/events.inc create mode 100644 data/maps/RustboroCity_House3/events.inc create mode 100644 data/maps/RustboroCity_Mart/events.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/RustboroCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/RustboroCity_PokemonSchool/events.inc create mode 100644 data/maps/RusturfTunnel/events.inc create mode 100644 data/maps/SSTidalCorridor/events.inc create mode 100644 data/maps/SSTidalLowerDeck/events.inc create mode 100644 data/maps/SSTidalRooms/events.inc create mode 100644 data/maps/SafariZone_Northeast/events.inc create mode 100644 data/maps/SafariZone_Northwest/events.inc create mode 100644 data/maps/SafariZone_RestHouse/events.inc create mode 100644 data/maps/SafariZone_Southeast/events.inc create mode 100644 data/maps/SafariZone_Southwest/events.inc create mode 100644 data/maps/ScorchedSlab/events.inc create mode 100644 data/maps/SeafloorCavern_Entrance/events.inc create mode 100644 data/maps/SeafloorCavern_Room1/events.inc create mode 100644 data/maps/SeafloorCavern_Room2/events.inc create mode 100644 data/maps/SeafloorCavern_Room3/events.inc create mode 100644 data/maps/SeafloorCavern_Room4/events.inc create mode 100644 data/maps/SeafloorCavern_Room5/events.inc create mode 100644 data/maps/SeafloorCavern_Room6/events.inc create mode 100644 data/maps/SeafloorCavern_Room7/events.inc create mode 100644 data/maps/SeafloorCavern_Room8/events.inc create mode 100644 data/maps/SeafloorCavern_Room9/events.inc create mode 100644 data/maps/SealedChamber_InnerRoom/events.inc create mode 100644 data/maps/SealedChamber_OuterRoom/events.inc create mode 100644 data/maps/SecretBase_BlueCave1/events.inc create mode 100644 data/maps/SecretBase_BlueCave2/events.inc create mode 100644 data/maps/SecretBase_BlueCave3/events.inc create mode 100644 data/maps/SecretBase_BlueCave4/events.inc create mode 100644 data/maps/SecretBase_BrownCave1/events.inc create mode 100644 data/maps/SecretBase_BrownCave2/events.inc create mode 100644 data/maps/SecretBase_BrownCave3/events.inc create mode 100644 data/maps/SecretBase_BrownCave4/events.inc create mode 100644 data/maps/SecretBase_RedCave1/events.inc create mode 100644 data/maps/SecretBase_RedCave2/events.inc create mode 100644 data/maps/SecretBase_RedCave3/events.inc create mode 100644 data/maps/SecretBase_RedCave4/events.inc create mode 100644 data/maps/SecretBase_Shrub1/events.inc create mode 100644 data/maps/SecretBase_Shrub2/events.inc create mode 100644 data/maps/SecretBase_Shrub3/events.inc create mode 100644 data/maps/SecretBase_Shrub4/events.inc create mode 100644 data/maps/SecretBase_Tree1/events.inc create mode 100644 data/maps/SecretBase_Tree2/events.inc create mode 100644 data/maps/SecretBase_Tree3/events.inc create mode 100644 data/maps/SecretBase_Tree4/events.inc create mode 100644 data/maps/SecretBase_YellowCave1/events.inc create mode 100644 data/maps/SecretBase_YellowCave2/events.inc create mode 100644 data/maps/SecretBase_YellowCave3/events.inc create mode 100644 data/maps/SecretBase_YellowCave4/events.inc create mode 100644 data/maps/ShoalCave_HighTideEntranceRoom/events.inc create mode 100644 data/maps/ShoalCave_HighTideInnerRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideEntranceRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideIceRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideInnerRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideLowerRoom/events.inc create mode 100644 data/maps/ShoalCave_LowTideStairsRoom/events.inc create mode 100644 data/maps/SingleBattleColosseum/events.inc create mode 100644 data/maps/SkyPillar_1F/events.inc create mode 100644 data/maps/SkyPillar_2F/events.inc create mode 100644 data/maps/SkyPillar_3F/events.inc create mode 100644 data/maps/SkyPillar_4F/events.inc create mode 100644 data/maps/SkyPillar_5F/events.inc create mode 100644 data/maps/SkyPillar_Entrance/events.inc create mode 100644 data/maps/SkyPillar_Outside/events.inc create mode 100644 data/maps/SkyPillar_Top/events.inc create mode 100644 data/maps/SlateportCity/events.inc create mode 100644 data/maps/SlateportCity_ContestHall/events.inc create mode 100644 data/maps/SlateportCity_ContestLobby/events.inc create mode 100644 data/maps/SlateportCity_Harbor/events.inc create mode 100644 data/maps/SlateportCity_House1/events.inc create mode 100644 data/maps/SlateportCity_House2/events.inc create mode 100644 data/maps/SlateportCity_Mart/events.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_1F/events.inc create mode 100644 data/maps/SlateportCity_OceanicMuseum_2F/events.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/SlateportCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/SlateportCity_PokemonFanClub/events.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_1F/events.inc create mode 100644 data/maps/SlateportCity_SternsShipyard_2F/events.inc create mode 100644 data/maps/SootopolisCity/events.inc create mode 100644 data/maps/SootopolisCity_Gym_1F/events.inc create mode 100644 data/maps/SootopolisCity_Gym_B1F/events.inc create mode 100644 data/maps/SootopolisCity_House1/events.inc create mode 100644 data/maps/SootopolisCity_House2/events.inc create mode 100644 data/maps/SootopolisCity_House3/events.inc create mode 100644 data/maps/SootopolisCity_House4/events.inc create mode 100644 data/maps/SootopolisCity_House5/events.inc create mode 100644 data/maps/SootopolisCity_House6/events.inc create mode 100644 data/maps/SootopolisCity_House7/events.inc create mode 100644 data/maps/SootopolisCity_House8/events.inc create mode 100644 data/maps/SootopolisCity_Mart/events.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_1F/events.inc create mode 100644 data/maps/SootopolisCity_PokemonCenter_2F/events.inc create mode 100644 data/maps/SouthernIsland_Exterior/events.inc create mode 100644 data/maps/SouthernIsland_Interior/events.inc create mode 100644 data/maps/TradeCenter/events.inc create mode 100644 data/maps/Underwater1/events.inc create mode 100644 data/maps/Underwater2/events.inc create mode 100644 data/maps/Underwater3/events.inc create mode 100644 data/maps/Underwater4/events.inc create mode 100644 data/maps/Underwater_Route134/events.inc create mode 100644 data/maps/Underwater_SeafloorCavern/events.inc create mode 100644 data/maps/Underwater_SealedChamber/events.inc create mode 100644 data/maps/Underwater_SootopolisCity/events.inc create mode 100644 data/maps/UnknownMap_25_29/events.inc create mode 100644 data/maps/UnknownMap_25_30/events.inc create mode 100644 data/maps/UnknownMap_25_31/events.inc create mode 100644 data/maps/UnknownMap_25_32/events.inc create mode 100644 data/maps/UnknownMap_25_33/events.inc create mode 100644 data/maps/UnknownMap_25_34/events.inc create mode 100644 data/maps/VerdanturfTown/events.inc create mode 100644 data/maps/VerdanturfTown_ContestHall/events.inc create mode 100644 data/maps/VerdanturfTown_ContestLobby/events.inc create mode 100644 data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc create mode 100644 data/maps/VerdanturfTown_House/events.inc create mode 100644 data/maps/VerdanturfTown_Mart/events.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_1F/events.inc create mode 100644 data/maps/VerdanturfTown_PokemonCenter_2F/events.inc create mode 100644 data/maps/VerdanturfTown_WandasHouse/events.inc create mode 100644 data/maps/VictoryRoad_1F/events.inc create mode 100644 data/maps/VictoryRoad_B1F/events.inc create mode 100644 data/maps/VictoryRoad_B2F/events.inc delete mode 100644 data/maps/_assets.inc delete mode 100644 data/maps/_groups.inc delete mode 100644 data/maps/attributes_table.inc delete mode 100644 data/maps/events/AbandonedShip_CaptainsOffice.inc delete mode 100644 data/maps/events/AbandonedShip_Corridors_1F.inc delete mode 100644 data/maps/events/AbandonedShip_Corridors_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Deck.inc delete mode 100644 data/maps/events/AbandonedShip_HiddenFloorCorridors.inc delete mode 100644 data/maps/events/AbandonedShip_HiddenFloorRooms.inc delete mode 100644 data/maps/events/AbandonedShip_Room_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms2_1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms2_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms_1F.inc delete mode 100644 data/maps/events/AbandonedShip_Rooms_B1F.inc delete mode 100644 data/maps/events/AbandonedShip_Underwater1.inc delete mode 100644 data/maps/events/AbandonedShip_Underwater2.inc delete mode 100644 data/maps/events/AncientTomb.inc delete mode 100644 data/maps/events/AquaHideout_1F.inc delete mode 100644 data/maps/events/AquaHideout_B1F.inc delete mode 100644 data/maps/events/AquaHideout_B2F.inc delete mode 100644 data/maps/events/BattleTower_BattleRoom.inc delete mode 100644 data/maps/events/BattleTower_Corridor.inc delete mode 100644 data/maps/events/BattleTower_Elevator.inc delete mode 100644 data/maps/events/BattleTower_Lobby.inc delete mode 100644 data/maps/events/BattleTower_Outside.inc delete mode 100644 data/maps/events/CaveOfOrigin_1F.inc delete mode 100644 data/maps/events/CaveOfOrigin_B1F.inc delete mode 100644 data/maps/events/CaveOfOrigin_B2F.inc delete mode 100644 data/maps/events/CaveOfOrigin_B3F.inc delete mode 100644 data/maps/events/CaveOfOrigin_B4F.inc delete mode 100644 data/maps/events/CaveOfOrigin_Entrance.inc delete mode 100644 data/maps/events/DesertRuins.inc delete mode 100644 data/maps/events/DewfordTown.inc delete mode 100644 data/maps/events/DewfordTown_Gym.inc delete mode 100644 data/maps/events/DewfordTown_Hall.inc delete mode 100644 data/maps/events/DewfordTown_House1.inc delete mode 100644 data/maps/events/DewfordTown_House2.inc delete mode 100644 data/maps/events/DewfordTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/DewfordTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/DoubleBattleColosseum.inc delete mode 100644 data/maps/events/EverGrandeCity.inc delete mode 100644 data/maps/events/EverGrandeCity_ChampionsRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_Corridor1.inc delete mode 100644 data/maps/events/EverGrandeCity_Corridor2.inc delete mode 100644 data/maps/events/EverGrandeCity_Corridor3.inc delete mode 100644 data/maps/events/EverGrandeCity_Corridor4.inc delete mode 100644 data/maps/events/EverGrandeCity_Corridor5.inc delete mode 100644 data/maps/events/EverGrandeCity_DrakesRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_GlaciasRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_HallOfFame.inc delete mode 100644 data/maps/events/EverGrandeCity_PhoebesRoom.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/EverGrandeCity_PokemonLeague.inc delete mode 100644 data/maps/events/EverGrandeCity_SidneysRoom.inc delete mode 100644 data/maps/events/FallarborTown.inc delete mode 100644 data/maps/events/FallarborTown_ContestHall.inc delete mode 100644 data/maps/events/FallarborTown_ContestLobby.inc delete mode 100644 data/maps/events/FallarborTown_House1.inc delete mode 100644 data/maps/events/FallarborTown_House2.inc delete mode 100644 data/maps/events/FallarborTown_Mart.inc delete mode 100644 data/maps/events/FallarborTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/FallarborTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/FieryPath.inc delete mode 100644 data/maps/events/FortreeCity.inc delete mode 100644 data/maps/events/FortreeCity_DecorationShop.inc delete mode 100644 data/maps/events/FortreeCity_Gym.inc delete mode 100644 data/maps/events/FortreeCity_House1.inc delete mode 100644 data/maps/events/FortreeCity_House2.inc delete mode 100644 data/maps/events/FortreeCity_House3.inc delete mode 100644 data/maps/events/FortreeCity_House4.inc delete mode 100644 data/maps/events/FortreeCity_House5.inc delete mode 100644 data/maps/events/FortreeCity_Mart.inc delete mode 100644 data/maps/events/FortreeCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/FortreeCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/GraniteCave_1F.inc delete mode 100644 data/maps/events/GraniteCave_B1F.inc delete mode 100644 data/maps/events/GraniteCave_B2F.inc delete mode 100644 data/maps/events/GraniteCave_StevensRoom.inc delete mode 100644 data/maps/events/InsideOfTruck.inc delete mode 100644 data/maps/events/IslandCave.inc delete mode 100644 data/maps/events/JaggedPass.inc delete mode 100644 data/maps/events/LavaridgeTown.inc delete mode 100644 data/maps/events/LavaridgeTown_Gym_1F.inc delete mode 100644 data/maps/events/LavaridgeTown_Gym_B1F.inc delete mode 100644 data/maps/events/LavaridgeTown_HerbShop.inc delete mode 100644 data/maps/events/LavaridgeTown_House.inc delete mode 100644 data/maps/events/LavaridgeTown_Mart.inc delete mode 100644 data/maps/events/LavaridgeTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/LavaridgeTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/LilycoveCity.inc delete mode 100644 data/maps/events/LilycoveCity_ContestHall.inc delete mode 100644 data/maps/events/LilycoveCity_ContestLobby.inc delete mode 100644 data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc delete mode 100644 data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStoreElevator.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_1F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_2F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_3F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_4F.inc delete mode 100644 data/maps/events/LilycoveCity_DepartmentStore_5F.inc delete mode 100644 data/maps/events/LilycoveCity_EmptyMap.inc delete mode 100644 data/maps/events/LilycoveCity_Harbor.inc delete mode 100644 data/maps/events/LilycoveCity_House1.inc delete mode 100644 data/maps/events/LilycoveCity_House2.inc delete mode 100644 data/maps/events/LilycoveCity_House3.inc delete mode 100644 data/maps/events/LilycoveCity_House4.inc delete mode 100644 data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc delete mode 100644 data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc delete mode 100644 data/maps/events/LilycoveCity_MoveDeletersHouse.inc delete mode 100644 data/maps/events/LilycoveCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/LilycoveCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc delete mode 100644 data/maps/events/LilycoveCity_UnusedMart.inc delete mode 100644 data/maps/events/LinkContestRoom1.inc delete mode 100644 data/maps/events/LinkContestRoom2.inc delete mode 100644 data/maps/events/LinkContestRoom3.inc delete mode 100644 data/maps/events/LinkContestRoom4.inc delete mode 100644 data/maps/events/LinkContestRoom5.inc delete mode 100644 data/maps/events/LinkContestRoom6.inc delete mode 100644 data/maps/events/LittlerootTown.inc delete mode 100644 data/maps/events/LittlerootTown_BrendansHouse_1F.inc delete mode 100644 data/maps/events/LittlerootTown_BrendansHouse_2F.inc delete mode 100644 data/maps/events/LittlerootTown_MaysHouse_1F.inc delete mode 100644 data/maps/events/LittlerootTown_MaysHouse_2F.inc delete mode 100644 data/maps/events/LittlerootTown_ProfessorBirchsLab.inc delete mode 100644 data/maps/events/MagmaHideout_1F.inc delete mode 100644 data/maps/events/MagmaHideout_B1F.inc delete mode 100644 data/maps/events/MagmaHideout_B2F.inc delete mode 100644 data/maps/events/MauvilleCity.inc delete mode 100644 data/maps/events/MauvilleCity_BikeShop.inc delete mode 100644 data/maps/events/MauvilleCity_GameCorner.inc delete mode 100644 data/maps/events/MauvilleCity_Gym.inc delete mode 100644 data/maps/events/MauvilleCity_House1.inc delete mode 100644 data/maps/events/MauvilleCity_House2.inc delete mode 100644 data/maps/events/MauvilleCity_Mart.inc delete mode 100644 data/maps/events/MauvilleCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/MauvilleCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/MeteorFalls_1F_1R.inc delete mode 100644 data/maps/events/MeteorFalls_1F_2R.inc delete mode 100644 data/maps/events/MeteorFalls_B1F_1R.inc delete mode 100644 data/maps/events/MeteorFalls_B1F_2R.inc delete mode 100644 data/maps/events/MossdeepCity.inc delete mode 100644 data/maps/events/MossdeepCity_GameCorner_1F.inc delete mode 100644 data/maps/events/MossdeepCity_GameCorner_B1F.inc delete mode 100644 data/maps/events/MossdeepCity_Gym.inc delete mode 100644 data/maps/events/MossdeepCity_House1.inc delete mode 100644 data/maps/events/MossdeepCity_House2.inc delete mode 100644 data/maps/events/MossdeepCity_House3.inc delete mode 100644 data/maps/events/MossdeepCity_House4.inc delete mode 100644 data/maps/events/MossdeepCity_Mart.inc delete mode 100644 data/maps/events/MossdeepCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/MossdeepCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/MossdeepCity_SpaceCenter_1F.inc delete mode 100644 data/maps/events/MossdeepCity_SpaceCenter_2F.inc delete mode 100644 data/maps/events/MossdeepCity_StevensHouse.inc delete mode 100644 data/maps/events/MtChimney.inc delete mode 100644 data/maps/events/MtChimney_CableCarStation.inc delete mode 100644 data/maps/events/MtPyre_1F.inc delete mode 100644 data/maps/events/MtPyre_2F.inc delete mode 100644 data/maps/events/MtPyre_3F.inc delete mode 100644 data/maps/events/MtPyre_4F.inc delete mode 100644 data/maps/events/MtPyre_5F.inc delete mode 100644 data/maps/events/MtPyre_6F.inc delete mode 100644 data/maps/events/MtPyre_Exterior.inc delete mode 100644 data/maps/events/MtPyre_Summit.inc delete mode 100644 data/maps/events/NewMauville_Entrance.inc delete mode 100644 data/maps/events/NewMauville_Inside.inc delete mode 100644 data/maps/events/OldaleTown.inc delete mode 100644 data/maps/events/OldaleTown_House1.inc delete mode 100644 data/maps/events/OldaleTown_House2.inc delete mode 100644 data/maps/events/OldaleTown_Mart.inc delete mode 100644 data/maps/events/OldaleTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/OldaleTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/PacifidlogTown.inc delete mode 100644 data/maps/events/PacifidlogTown_House1.inc delete mode 100644 data/maps/events/PacifidlogTown_House2.inc delete mode 100644 data/maps/events/PacifidlogTown_House3.inc delete mode 100644 data/maps/events/PacifidlogTown_House4.inc delete mode 100644 data/maps/events/PacifidlogTown_House5.inc delete mode 100644 data/maps/events/PacifidlogTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/PacifidlogTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/PetalburgCity.inc delete mode 100644 data/maps/events/PetalburgCity_Gym.inc delete mode 100644 data/maps/events/PetalburgCity_House1.inc delete mode 100644 data/maps/events/PetalburgCity_House2.inc delete mode 100644 data/maps/events/PetalburgCity_Mart.inc delete mode 100644 data/maps/events/PetalburgCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/PetalburgCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/PetalburgCity_WallysHouse.inc delete mode 100644 data/maps/events/PetalburgWoods.inc delete mode 100644 data/maps/events/RecordCorner.inc delete mode 100644 data/maps/events/Route101.inc delete mode 100644 data/maps/events/Route102.inc delete mode 100644 data/maps/events/Route103.inc delete mode 100644 data/maps/events/Route104.inc delete mode 100644 data/maps/events/Route104_MrBrineysHouse.inc delete mode 100644 data/maps/events/Route104_PrettyPetalFlowerShop.inc delete mode 100644 data/maps/events/Route104_Prototype.inc delete mode 100644 data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc delete mode 100644 data/maps/events/Route105.inc delete mode 100644 data/maps/events/Route106.inc delete mode 100644 data/maps/events/Route107.inc delete mode 100644 data/maps/events/Route108.inc delete mode 100644 data/maps/events/Route109.inc delete mode 100644 data/maps/events/Route109_SeashoreHouse.inc delete mode 100644 data/maps/events/Route110.inc delete mode 100644 data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc delete mode 100644 data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc delete mode 100644 data/maps/events/Route110_TrickHouseCorridor.inc delete mode 100644 data/maps/events/Route110_TrickHouseEnd.inc delete mode 100644 data/maps/events/Route110_TrickHouseEntrance.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle1.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle2.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle3.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle4.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle5.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle6.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle7.inc delete mode 100644 data/maps/events/Route110_TrickHousePuzzle8.inc delete mode 100644 data/maps/events/Route111.inc delete mode 100644 data/maps/events/Route111_OldLadysRestStop.inc delete mode 100644 data/maps/events/Route111_WinstrateFamilysHouse.inc delete mode 100644 data/maps/events/Route112.inc delete mode 100644 data/maps/events/Route112_CableCarStation.inc delete mode 100644 data/maps/events/Route113.inc delete mode 100644 data/maps/events/Route113_GlassWorkshop.inc delete mode 100644 data/maps/events/Route114.inc delete mode 100644 data/maps/events/Route114_FossilManiacsHouse.inc delete mode 100644 data/maps/events/Route114_FossilManiacsTunnel.inc delete mode 100644 data/maps/events/Route114_LanettesHouse.inc delete mode 100644 data/maps/events/Route115.inc delete mode 100644 data/maps/events/Route116.inc delete mode 100644 data/maps/events/Route116_TunnelersRestHouse.inc delete mode 100644 data/maps/events/Route117.inc delete mode 100644 data/maps/events/Route117_PokemonDayCare.inc delete mode 100644 data/maps/events/Route118.inc delete mode 100644 data/maps/events/Route119.inc delete mode 100644 data/maps/events/Route119_House.inc delete mode 100644 data/maps/events/Route119_WeatherInstitute_1F.inc delete mode 100644 data/maps/events/Route119_WeatherInstitute_2F.inc delete mode 100644 data/maps/events/Route120.inc delete mode 100644 data/maps/events/Route121.inc delete mode 100644 data/maps/events/Route121_SafariZoneEntrance.inc delete mode 100644 data/maps/events/Route122.inc delete mode 100644 data/maps/events/Route123.inc delete mode 100644 data/maps/events/Route123_BerryMastersHouse.inc delete mode 100644 data/maps/events/Route124.inc delete mode 100644 data/maps/events/Route124_DivingTreasureHuntersHouse.inc delete mode 100644 data/maps/events/Route125.inc delete mode 100644 data/maps/events/Route126.inc delete mode 100644 data/maps/events/Route127.inc delete mode 100644 data/maps/events/Route128.inc delete mode 100644 data/maps/events/Route129.inc delete mode 100644 data/maps/events/Route130.inc delete mode 100644 data/maps/events/Route131.inc delete mode 100644 data/maps/events/Route132.inc delete mode 100644 data/maps/events/Route133.inc delete mode 100644 data/maps/events/Route134.inc delete mode 100644 data/maps/events/RustboroCity.inc delete mode 100644 data/maps/events/RustboroCity_CuttersHouse.inc delete mode 100644 data/maps/events/RustboroCity_DevonCorp_1F.inc delete mode 100644 data/maps/events/RustboroCity_DevonCorp_2F.inc delete mode 100644 data/maps/events/RustboroCity_DevonCorp_3F.inc delete mode 100644 data/maps/events/RustboroCity_Flat1_1F.inc delete mode 100644 data/maps/events/RustboroCity_Flat1_2F.inc delete mode 100644 data/maps/events/RustboroCity_Flat2_1F.inc delete mode 100644 data/maps/events/RustboroCity_Flat2_2F.inc delete mode 100644 data/maps/events/RustboroCity_Flat2_3F.inc delete mode 100644 data/maps/events/RustboroCity_Gym.inc delete mode 100644 data/maps/events/RustboroCity_House1.inc delete mode 100644 data/maps/events/RustboroCity_House2.inc delete mode 100644 data/maps/events/RustboroCity_House3.inc delete mode 100644 data/maps/events/RustboroCity_Mart.inc delete mode 100644 data/maps/events/RustboroCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/RustboroCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/RustboroCity_PokemonSchool.inc delete mode 100644 data/maps/events/RusturfTunnel.inc delete mode 100644 data/maps/events/SSTidalCorridor.inc delete mode 100644 data/maps/events/SSTidalLowerDeck.inc delete mode 100644 data/maps/events/SSTidalRooms.inc delete mode 100644 data/maps/events/SafariZone_Northeast.inc delete mode 100644 data/maps/events/SafariZone_Northwest.inc delete mode 100644 data/maps/events/SafariZone_RestHouse.inc delete mode 100644 data/maps/events/SafariZone_Southeast.inc delete mode 100644 data/maps/events/SafariZone_Southwest.inc delete mode 100644 data/maps/events/ScorchedSlab.inc delete mode 100644 data/maps/events/SeafloorCavern_Entrance.inc delete mode 100644 data/maps/events/SeafloorCavern_Room1.inc delete mode 100644 data/maps/events/SeafloorCavern_Room2.inc delete mode 100644 data/maps/events/SeafloorCavern_Room3.inc delete mode 100644 data/maps/events/SeafloorCavern_Room4.inc delete mode 100644 data/maps/events/SeafloorCavern_Room5.inc delete mode 100644 data/maps/events/SeafloorCavern_Room6.inc delete mode 100644 data/maps/events/SeafloorCavern_Room7.inc delete mode 100644 data/maps/events/SeafloorCavern_Room8.inc delete mode 100644 data/maps/events/SeafloorCavern_Room9.inc delete mode 100644 data/maps/events/SealedChamber_InnerRoom.inc delete mode 100644 data/maps/events/SealedChamber_OuterRoom.inc delete mode 100644 data/maps/events/SecretBase_BlueCave1.inc delete mode 100644 data/maps/events/SecretBase_BlueCave2.inc delete mode 100644 data/maps/events/SecretBase_BlueCave3.inc delete mode 100644 data/maps/events/SecretBase_BlueCave4.inc delete mode 100644 data/maps/events/SecretBase_BrownCave1.inc delete mode 100644 data/maps/events/SecretBase_BrownCave2.inc delete mode 100644 data/maps/events/SecretBase_BrownCave3.inc delete mode 100644 data/maps/events/SecretBase_BrownCave4.inc delete mode 100644 data/maps/events/SecretBase_RedCave1.inc delete mode 100644 data/maps/events/SecretBase_RedCave2.inc delete mode 100644 data/maps/events/SecretBase_RedCave3.inc delete mode 100644 data/maps/events/SecretBase_RedCave4.inc delete mode 100644 data/maps/events/SecretBase_Shrub1.inc delete mode 100644 data/maps/events/SecretBase_Shrub2.inc delete mode 100644 data/maps/events/SecretBase_Shrub3.inc delete mode 100644 data/maps/events/SecretBase_Shrub4.inc delete mode 100644 data/maps/events/SecretBase_Tree1.inc delete mode 100644 data/maps/events/SecretBase_Tree2.inc delete mode 100644 data/maps/events/SecretBase_Tree3.inc delete mode 100644 data/maps/events/SecretBase_Tree4.inc delete mode 100644 data/maps/events/SecretBase_YellowCave1.inc delete mode 100644 data/maps/events/SecretBase_YellowCave2.inc delete mode 100644 data/maps/events/SecretBase_YellowCave3.inc delete mode 100644 data/maps/events/SecretBase_YellowCave4.inc delete mode 100644 data/maps/events/ShoalCave_HighTideEntranceRoom.inc delete mode 100644 data/maps/events/ShoalCave_HighTideInnerRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideEntranceRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideIceRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideInnerRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideLowerRoom.inc delete mode 100644 data/maps/events/ShoalCave_LowTideStairsRoom.inc delete mode 100644 data/maps/events/SingleBattleColosseum.inc delete mode 100644 data/maps/events/SkyPillar_1F.inc delete mode 100644 data/maps/events/SkyPillar_2F.inc delete mode 100644 data/maps/events/SkyPillar_3F.inc delete mode 100644 data/maps/events/SkyPillar_4F.inc delete mode 100644 data/maps/events/SkyPillar_5F.inc delete mode 100644 data/maps/events/SkyPillar_Entrance.inc delete mode 100644 data/maps/events/SkyPillar_Outside.inc delete mode 100644 data/maps/events/SkyPillar_Top.inc delete mode 100644 data/maps/events/SlateportCity.inc delete mode 100644 data/maps/events/SlateportCity_ContestHall.inc delete mode 100644 data/maps/events/SlateportCity_ContestLobby.inc delete mode 100644 data/maps/events/SlateportCity_Harbor.inc delete mode 100644 data/maps/events/SlateportCity_House1.inc delete mode 100644 data/maps/events/SlateportCity_House2.inc delete mode 100644 data/maps/events/SlateportCity_Mart.inc delete mode 100644 data/maps/events/SlateportCity_OceanicMuseum_1F.inc delete mode 100644 data/maps/events/SlateportCity_OceanicMuseum_2F.inc delete mode 100644 data/maps/events/SlateportCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/SlateportCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/SlateportCity_PokemonFanClub.inc delete mode 100644 data/maps/events/SlateportCity_SternsShipyard_1F.inc delete mode 100644 data/maps/events/SlateportCity_SternsShipyard_2F.inc delete mode 100644 data/maps/events/SootopolisCity.inc delete mode 100644 data/maps/events/SootopolisCity_Gym_1F.inc delete mode 100644 data/maps/events/SootopolisCity_Gym_B1F.inc delete mode 100644 data/maps/events/SootopolisCity_House1.inc delete mode 100644 data/maps/events/SootopolisCity_House2.inc delete mode 100644 data/maps/events/SootopolisCity_House3.inc delete mode 100644 data/maps/events/SootopolisCity_House4.inc delete mode 100644 data/maps/events/SootopolisCity_House5.inc delete mode 100644 data/maps/events/SootopolisCity_House6.inc delete mode 100644 data/maps/events/SootopolisCity_House7.inc delete mode 100644 data/maps/events/SootopolisCity_House8.inc delete mode 100644 data/maps/events/SootopolisCity_Mart.inc delete mode 100644 data/maps/events/SootopolisCity_PokemonCenter_1F.inc delete mode 100644 data/maps/events/SootopolisCity_PokemonCenter_2F.inc delete mode 100644 data/maps/events/SouthernIsland_Exterior.inc delete mode 100644 data/maps/events/SouthernIsland_Interior.inc delete mode 100644 data/maps/events/TradeCenter.inc delete mode 100644 data/maps/events/Underwater1.inc delete mode 100644 data/maps/events/Underwater2.inc delete mode 100644 data/maps/events/Underwater3.inc delete mode 100644 data/maps/events/Underwater4.inc delete mode 100644 data/maps/events/Underwater_Route134.inc delete mode 100644 data/maps/events/Underwater_SeafloorCavern.inc delete mode 100644 data/maps/events/Underwater_SealedChamber.inc delete mode 100644 data/maps/events/Underwater_SootopolisCity.inc delete mode 100644 data/maps/events/UnknownMap_25_29.inc delete mode 100644 data/maps/events/UnknownMap_25_30.inc delete mode 100644 data/maps/events/UnknownMap_25_31.inc delete mode 100644 data/maps/events/UnknownMap_25_32.inc delete mode 100644 data/maps/events/UnknownMap_25_33.inc delete mode 100644 data/maps/events/UnknownMap_25_34.inc delete mode 100644 data/maps/events/VerdanturfTown.inc delete mode 100644 data/maps/events/VerdanturfTown_ContestHall.inc delete mode 100644 data/maps/events/VerdanturfTown_ContestLobby.inc delete mode 100644 data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc delete mode 100644 data/maps/events/VerdanturfTown_House.inc delete mode 100644 data/maps/events/VerdanturfTown_Mart.inc delete mode 100644 data/maps/events/VerdanturfTown_PokemonCenter_1F.inc delete mode 100644 data/maps/events/VerdanturfTown_PokemonCenter_2F.inc delete mode 100644 data/maps/events/VerdanturfTown_WandasHouse.inc delete mode 100644 data/maps/events/VictoryRoad_1F.inc delete mode 100644 data/maps/events/VictoryRoad_B1F.inc delete mode 100644 data/maps/events/VictoryRoad_B2F.inc create mode 100644 data/maps/groups.inc (limited to 'data') diff --git a/data/layouts.inc b/data/layouts.inc new file mode 100644 index 000000000..aec54aaab --- /dev/null +++ b/data/layouts.inc @@ -0,0 +1,332 @@ + .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/UnreferencedMap/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/PokeMart/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/ContestLobby/layout.inc" + .include "data/layouts/ContestHall/layout.inc" + .include "data/layouts/LilycoveCity_House2/layout.inc" + .include "data/layouts/UnknownMap_082CF564/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_082D05D8/layout.inc" + .include "data/layouts/UnknownMap_082D05FC/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/LilycoveCity_EmptyMap/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_ShortCorridor/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_B1F/layout.inc" + .include "data/layouts/CaveOfOrigin_B2F/layout.inc" + .include "data/layouts/CaveOfOrigin_B3F/layout.inc" + .include "data/layouts/CaveOfOrigin_B4F/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_082E55C8/layout.inc" + .include "data/layouts/UnknownMap_082E55EC/layout.inc" + .include "data/layouts/UnknownMap_082E5610/layout.inc" + .include "data/layouts/UnknownMap_082E5634/layout.inc" + .include "data/layouts/UnknownMap_082E5658/layout.inc" + .include "data/layouts/UnknownMap_082E567C/layout.inc" + .include "data/layouts/UnknownMap_082E56A0/layout.inc" + .include "data/layouts/UnknownMap_082E56C4/layout.inc" + .include "data/layouts/UnknownMap_082E56E8/layout.inc" + .include "data/layouts/UnknownMap_082E570C/layout.inc" + .include "data/layouts/UnknownMap_082E5730/layout.inc" + .include "data/layouts/UnknownMap_082E5754/layout.inc" + .include "data/layouts/UnknownMap_082E5778/layout.inc" + .include "data/layouts/UnknownMap_082E579C/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_Northeast/layout.inc" + .include "data/layouts/SafariZone_Southwest/layout.inc" + .include "data/layouts/SafariZone_Southeast/layout.inc" + .include "data/layouts/UnknownMap_082EDF30/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_SeasideCyclingRoadEntrace/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/BattleTower_Lobby/layout.inc" + .include "data/layouts/BattleTower_Outside/layout.inc" + .include "data/layouts/BattleTower_Elevator/layout.inc" + .include "data/layouts/BattleTower_Corridor/layout.inc" + .include "data/layouts/BattleTower_BattleRoom/layout.inc" + .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" + .include "data/layouts/EverGrandeCity_PokemonLeague/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_House8/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_082FF894/layout.inc" + .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" + .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" + .include "data/layouts/EverGrandeCity_Corridor4/layout.inc" + .include "data/layouts/MagmaHideout_1F/layout.inc" + .include "data/layouts/MagmaHideout_B1F/layout.inc" + .include "data/layouts/MagmaHideout_B2F/layout.inc" + .include "data/layouts/UnknownMap_08302970/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_083041B4/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" diff --git a/data/layouts_table.inc b/data/layouts_table.inc new file mode 100644 index 000000000..b1a15d7ef --- /dev/null +++ b/data/layouts_table.inc @@ -0,0 +1,334 @@ + .align 2 +gMapAttributes:: @ 8304F18 + .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 UnreferencedMap_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 PokeMart_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 ContestLobby_Layout + .4byte ContestHall_Layout + .4byte LilycoveCity_House2_Layout + .4byte UnknownMap_082CF564_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_082D05D8_Layout + .4byte UnknownMap_082D05FC_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 LilycoveCity_EmptyMap_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_ShortCorridor_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_B1F_Layout + .4byte CaveOfOrigin_B2F_Layout + .4byte CaveOfOrigin_B3F_Layout + .4byte CaveOfOrigin_B4F_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_082E55C8_Layout @ unused maps + .4byte UnknownMap_082E55EC_Layout + .4byte UnknownMap_082E5610_Layout + .4byte UnknownMap_082E5634_Layout + .4byte UnknownMap_082E5658_Layout + .4byte UnknownMap_082E567C_Layout + .4byte UnknownMap_082E56A0_Layout + .4byte UnknownMap_082E56C4_Layout + .4byte UnknownMap_082E56E8_Layout + .4byte UnknownMap_082E570C_Layout + .4byte UnknownMap_082E5730_Layout + .4byte UnknownMap_082E5754_Layout + .4byte UnknownMap_082E5778_Layout + .4byte UnknownMap_082E579C_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_Northeast_Layout + .4byte SafariZone_Southwest_Layout + .4byte SafariZone_Southeast_Layout + .4byte UnknownMap_082EDF30_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_SeasideCyclingRoadEntrace_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 BattleTower_Lobby_Layout + .4byte BattleTower_Outside_Layout + .4byte BattleTower_Elevator_Layout + .4byte BattleTower_Corridor_Layout + .4byte BattleTower_BattleRoom_Layout + .4byte RustboroCity_DevonCorp_3F_Layout + .4byte EverGrandeCity_PokemonLeague_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_House8_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_082FF894_Layout + .4byte RustboroCity_Flat1_1F_Layout + .4byte RustboroCity_Flat1_2F_Layout + .4byte EverGrandeCity_Corridor4_Layout + .4byte MagmaHideout_1F_Layout + .4byte MagmaHideout_B1F_Layout + .4byte MagmaHideout_B2F_Layout + .4byte UnknownMap_08302970_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_083041B4_Layout + .4byte MossdeepCity_StevensHouse_Layout + .4byte ShoalCave_LowTideIceRoom_Layout + .4byte SafariZone_RestHouse_Layout + .4byte SkyPillar_5F_Layout + .4byte SkyPillar_Top_Layout diff --git a/data/map_events.s b/data/map_events.s index 02050c401..e6fe363f8 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -5,402 +5,403 @@ #include "constants/secret_bases.h" #include "constants/vars.h" #include "constants/weather.h" + .include "include/macros.inc" .include "constants/constants.inc" .section .rodata - .include "data/maps/events/PetalburgCity.inc" - .include "data/maps/events/SlateportCity.inc" - .include "data/maps/events/MauvilleCity.inc" - .include "data/maps/events/RustboroCity.inc" - .include "data/maps/events/FortreeCity.inc" - .include "data/maps/events/LilycoveCity.inc" - .include "data/maps/events/MossdeepCity.inc" - .include "data/maps/events/SootopolisCity.inc" - .include "data/maps/events/EverGrandeCity.inc" - .include "data/maps/events/LittlerootTown.inc" - .include "data/maps/events/OldaleTown.inc" - .include "data/maps/events/DewfordTown.inc" - .include "data/maps/events/LavaridgeTown.inc" - .include "data/maps/events/FallarborTown.inc" - .include "data/maps/events/VerdanturfTown.inc" - .include "data/maps/events/PacifidlogTown.inc" - .include "data/maps/events/Route101.inc" - .include "data/maps/events/Route102.inc" - .include "data/maps/events/Route103.inc" - .include "data/maps/events/Route104.inc" - .include "data/maps/events/Route105.inc" - .include "data/maps/events/Route106.inc" - .include "data/maps/events/Route107.inc" - .include "data/maps/events/Route108.inc" - .include "data/maps/events/Route109.inc" - .include "data/maps/events/Route110.inc" - .include "data/maps/events/Route111.inc" - .include "data/maps/events/Route112.inc" - .include "data/maps/events/Route113.inc" - .include "data/maps/events/Route114.inc" - .include "data/maps/events/Route115.inc" - .include "data/maps/events/Route116.inc" - .include "data/maps/events/Route117.inc" - .include "data/maps/events/Route118.inc" - .include "data/maps/events/Route119.inc" - .include "data/maps/events/Route120.inc" - .include "data/maps/events/Route121.inc" - .include "data/maps/events/Route122.inc" - .include "data/maps/events/Route123.inc" - .include "data/maps/events/Route124.inc" - .include "data/maps/events/Route125.inc" - .include "data/maps/events/Route126.inc" - .include "data/maps/events/Route127.inc" - .include "data/maps/events/Route128.inc" - .include "data/maps/events/Route129.inc" - .include "data/maps/events/Route130.inc" - .include "data/maps/events/Route131.inc" - .include "data/maps/events/Route132.inc" - .include "data/maps/events/Route133.inc" - .include "data/maps/events/Route134.inc" - .include "data/maps/events/Underwater1.inc" - .include "data/maps/events/Underwater2.inc" - .include "data/maps/events/Underwater3.inc" - .include "data/maps/events/Underwater4.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc" - .include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_1F.inc" - .include "data/maps/events/LittlerootTown_MaysHouse_2F.inc" - .include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc" - .include "data/maps/events/OldaleTown_House1.inc" - .include "data/maps/events/OldaleTown_House2.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_1F.inc" - .include "data/maps/events/OldaleTown_PokemonCenter_2F.inc" - .include "data/maps/events/OldaleTown_Mart.inc" - .include "data/maps/events/DewfordTown_House1.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_1F.inc" - .include "data/maps/events/DewfordTown_PokemonCenter_2F.inc" - .include "data/maps/events/DewfordTown_Gym.inc" - .include "data/maps/events/DewfordTown_Hall.inc" - .include "data/maps/events/DewfordTown_House2.inc" - .include "data/maps/events/LavaridgeTown_HerbShop.inc" - .include "data/maps/events/LavaridgeTown_Gym_1F.inc" - .include "data/maps/events/LavaridgeTown_Gym_B1F.inc" - .include "data/maps/events/LavaridgeTown_House.inc" - .include "data/maps/events/LavaridgeTown_Mart.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc" - .include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_Mart.inc" - .include "data/maps/events/FallarborTown_ContestLobby.inc" - .include "data/maps/events/FallarborTown_ContestHall.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_1F.inc" - .include "data/maps/events/FallarborTown_PokemonCenter_2F.inc" - .include "data/maps/events/FallarborTown_House1.inc" - .include "data/maps/events/FallarborTown_House2.inc" - .include "data/maps/events/VerdanturfTown_ContestLobby.inc" - .include "data/maps/events/VerdanturfTown_ContestHall.inc" - .include "data/maps/events/VerdanturfTown_Mart.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc" - .include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc" - .include "data/maps/events/VerdanturfTown_WandasHouse.inc" - .include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc" - .include "data/maps/events/VerdanturfTown_House.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc" - .include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc" - .include "data/maps/events/PacifidlogTown_House1.inc" - .include "data/maps/events/PacifidlogTown_House2.inc" - .include "data/maps/events/PacifidlogTown_House3.inc" - .include "data/maps/events/PacifidlogTown_House4.inc" - .include "data/maps/events/PacifidlogTown_House5.inc" - .include "data/maps/events/PetalburgCity_WallysHouse.inc" - .include "data/maps/events/PetalburgCity_Gym.inc" - .include "data/maps/events/PetalburgCity_House1.inc" - .include "data/maps/events/PetalburgCity_House2.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc" - .include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc" - .include "data/maps/events/PetalburgCity_Mart.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_1F.inc" - .include "data/maps/events/SlateportCity_SternsShipyard_2F.inc" - .include "data/maps/events/SlateportCity_ContestLobby.inc" - .include "data/maps/events/SlateportCity_ContestHall.inc" - .include "data/maps/events/SlateportCity_House1.inc" - .include "data/maps/events/SlateportCity_PokemonFanClub.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc" - .include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc" - .include "data/maps/events/SlateportCity_Harbor.inc" - .include "data/maps/events/SlateportCity_House2.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_1F.inc" - .include "data/maps/events/SlateportCity_PokemonCenter_2F.inc" - .include "data/maps/events/SlateportCity_Mart.inc" - .include "data/maps/events/MauvilleCity_Gym.inc" - .include "data/maps/events/MauvilleCity_BikeShop.inc" - .include "data/maps/events/MauvilleCity_House1.inc" - .include "data/maps/events/MauvilleCity_GameCorner.inc" - .include "data/maps/events/MauvilleCity_House2.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc" - .include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc" - .include "data/maps/events/MauvilleCity_Mart.inc" - .include "data/maps/events/RustboroCity_DevonCorp_1F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_2F.inc" - .include "data/maps/events/RustboroCity_DevonCorp_3F.inc" - .include "data/maps/events/RustboroCity_Gym.inc" - .include "data/maps/events/RustboroCity_PokemonSchool.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_1F.inc" - .include "data/maps/events/RustboroCity_PokemonCenter_2F.inc" - .include "data/maps/events/RustboroCity_Mart.inc" - .include "data/maps/events/RustboroCity_Flat1_1F.inc" - .include "data/maps/events/RustboroCity_Flat1_2F.inc" - .include "data/maps/events/RustboroCity_House1.inc" - .include "data/maps/events/RustboroCity_CuttersHouse.inc" - .include "data/maps/events/RustboroCity_House2.inc" - .include "data/maps/events/RustboroCity_Flat2_1F.inc" - .include "data/maps/events/RustboroCity_Flat2_2F.inc" - .include "data/maps/events/RustboroCity_Flat2_3F.inc" - .include "data/maps/events/RustboroCity_House3.inc" - .include "data/maps/events/FortreeCity_House1.inc" - .include "data/maps/events/FortreeCity_Gym.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_1F.inc" - .include "data/maps/events/FortreeCity_PokemonCenter_2F.inc" - .include "data/maps/events/FortreeCity_Mart.inc" - .include "data/maps/events/FortreeCity_House2.inc" - .include "data/maps/events/FortreeCity_House3.inc" - .include "data/maps/events/FortreeCity_House4.inc" - .include "data/maps/events/FortreeCity_House5.inc" - .include "data/maps/events/FortreeCity_DecorationShop.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc" - .include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc" - .include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc" - .include "data/maps/events/LilycoveCity_ContestLobby.inc" - .include "data/maps/events/LilycoveCity_ContestHall.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc" - .include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc" - .include "data/maps/events/LilycoveCity_UnusedMart.inc" - .include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc" - .include "data/maps/events/LilycoveCity_Harbor.inc" - .include "data/maps/events/LilycoveCity_EmptyMap.inc" - .include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc" - .include "data/maps/events/LilycoveCity_House1.inc" - .include "data/maps/events/LilycoveCity_House2.inc" - .include "data/maps/events/LilycoveCity_House3.inc" - .include "data/maps/events/LilycoveCity_House4.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc" - .include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc" - .include "data/maps/events/MossdeepCity_Gym.inc" - .include "data/maps/events/MossdeepCity_House1.inc" - .include "data/maps/events/MossdeepCity_House2.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc" - .include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc" - .include "data/maps/events/MossdeepCity_Mart.inc" - .include "data/maps/events/MossdeepCity_House3.inc" - .include "data/maps/events/MossdeepCity_StevensHouse.inc" - .include "data/maps/events/MossdeepCity_House4.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc" - .include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_1F.inc" - .include "data/maps/events/MossdeepCity_GameCorner_B1F.inc" - .include "data/maps/events/SootopolisCity_Gym_1F.inc" - .include "data/maps/events/SootopolisCity_Gym_B1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc" - .include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc" - .include "data/maps/events/SootopolisCity_Mart.inc" - .include "data/maps/events/SootopolisCity_House1.inc" - .include "data/maps/events/SootopolisCity_House2.inc" - .include "data/maps/events/SootopolisCity_House3.inc" - .include "data/maps/events/SootopolisCity_House4.inc" - .include "data/maps/events/SootopolisCity_House5.inc" - .include "data/maps/events/SootopolisCity_House6.inc" - .include "data/maps/events/SootopolisCity_House7.inc" - .include "data/maps/events/SootopolisCity_House8.inc" - .include "data/maps/events/EverGrandeCity_SidneysRoom.inc" - .include "data/maps/events/EverGrandeCity_PhoebesRoom.inc" - .include "data/maps/events/EverGrandeCity_GlaciasRoom.inc" - .include "data/maps/events/EverGrandeCity_DrakesRoom.inc" - .include "data/maps/events/EverGrandeCity_ChampionsRoom.inc" - .include "data/maps/events/EverGrandeCity_Corridor1.inc" - .include "data/maps/events/EverGrandeCity_Corridor2.inc" - .include "data/maps/events/EverGrandeCity_Corridor3.inc" - .include "data/maps/events/EverGrandeCity_Corridor4.inc" - .include "data/maps/events/EverGrandeCity_Corridor5.inc" - .include "data/maps/events/EverGrandeCity_PokemonLeague.inc" - .include "data/maps/events/EverGrandeCity_HallOfFame.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc" - .include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc" - .include "data/maps/events/Route104_MrBrineysHouse.inc" - .include "data/maps/events/Route104_PrettyPetalFlowerShop.inc" - .include "data/maps/events/Route111_WinstrateFamilysHouse.inc" - .include "data/maps/events/Route111_OldLadysRestStop.inc" - .include "data/maps/events/Route112_CableCarStation.inc" - .include "data/maps/events/MtChimney_CableCarStation.inc" - .include "data/maps/events/Route114_FossilManiacsHouse.inc" - .include "data/maps/events/Route114_FossilManiacsTunnel.inc" - .include "data/maps/events/Route114_LanettesHouse.inc" - .include "data/maps/events/Route116_TunnelersRestHouse.inc" - .include "data/maps/events/Route117_PokemonDayCare.inc" - .include "data/maps/events/Route121_SafariZoneEntrance.inc" - .include "data/maps/events/MeteorFalls_1F_1R.inc" - .include "data/maps/events/MeteorFalls_1F_2R.inc" - .include "data/maps/events/MeteorFalls_B1F_1R.inc" - .include "data/maps/events/MeteorFalls_B1F_2R.inc" - .include "data/maps/events/RusturfTunnel.inc" - .include "data/maps/events/Underwater_SootopolisCity.inc" - .include "data/maps/events/DesertRuins.inc" - .include "data/maps/events/GraniteCave_1F.inc" - .include "data/maps/events/GraniteCave_B1F.inc" - .include "data/maps/events/GraniteCave_B2F.inc" - .include "data/maps/events/GraniteCave_StevensRoom.inc" - .include "data/maps/events/PetalburgWoods.inc" - .include "data/maps/events/MtChimney.inc" - .include "data/maps/events/JaggedPass.inc" - .include "data/maps/events/FieryPath.inc" - .include "data/maps/events/MtPyre_1F.inc" - .include "data/maps/events/MtPyre_2F.inc" - .include "data/maps/events/MtPyre_3F.inc" - .include "data/maps/events/MtPyre_4F.inc" - .include "data/maps/events/MtPyre_5F.inc" - .include "data/maps/events/MtPyre_6F.inc" - .include "data/maps/events/MtPyre_Exterior.inc" - .include "data/maps/events/MtPyre_Summit.inc" - .include "data/maps/events/AquaHideout_1F.inc" - .include "data/maps/events/AquaHideout_B1F.inc" - .include "data/maps/events/AquaHideout_B2F.inc" - .include "data/maps/events/Underwater_SeafloorCavern.inc" - .include "data/maps/events/SeafloorCavern_Entrance.inc" - .include "data/maps/events/SeafloorCavern_Room1.inc" - .include "data/maps/events/SeafloorCavern_Room2.inc" - .include "data/maps/events/SeafloorCavern_Room3.inc" - .include "data/maps/events/SeafloorCavern_Room4.inc" - .include "data/maps/events/SeafloorCavern_Room5.inc" - .include "data/maps/events/SeafloorCavern_Room6.inc" - .include "data/maps/events/SeafloorCavern_Room7.inc" - .include "data/maps/events/SeafloorCavern_Room8.inc" - .include "data/maps/events/SeafloorCavern_Room9.inc" - .include "data/maps/events/CaveOfOrigin_Entrance.inc" - .include "data/maps/events/CaveOfOrigin_1F.inc" - .include "data/maps/events/CaveOfOrigin_B1F.inc" - .include "data/maps/events/CaveOfOrigin_B2F.inc" - .include "data/maps/events/CaveOfOrigin_B3F.inc" - .include "data/maps/events/CaveOfOrigin_B4F.inc" - .include "data/maps/events/VictoryRoad_1F.inc" - .include "data/maps/events/VictoryRoad_B1F.inc" - .include "data/maps/events/VictoryRoad_B2F.inc" - .include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_LowTideInnerRoom.inc" - .include "data/maps/events/ShoalCave_LowTideStairsRoom.inc" - .include "data/maps/events/ShoalCave_LowTideLowerRoom.inc" - .include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc" - .include "data/maps/events/ShoalCave_HighTideInnerRoom.inc" - .include "data/maps/events/NewMauville_Entrance.inc" - .include "data/maps/events/NewMauville_Inside.inc" - .include "data/maps/events/AbandonedShip_Deck.inc" - .include "data/maps/events/AbandonedShip_Corridors_1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_1F.inc" - .include "data/maps/events/AbandonedShip_Corridors_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_B1F.inc" - .include "data/maps/events/AbandonedShip_Underwater1.inc" - .include "data/maps/events/AbandonedShip_Room_B1F.inc" - .include "data/maps/events/AbandonedShip_Rooms2_1F.inc" - .include "data/maps/events/AbandonedShip_CaptainsOffice.inc" - .include "data/maps/events/AbandonedShip_Underwater2.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc" - .include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc" - .include "data/maps/events/IslandCave.inc" - .include "data/maps/events/AncientTomb.inc" - .include "data/maps/events/Underwater_Route134.inc" - .include "data/maps/events/Underwater_SealedChamber.inc" - .include "data/maps/events/SealedChamber_OuterRoom.inc" - .include "data/maps/events/SealedChamber_InnerRoom.inc" - .include "data/maps/events/ScorchedSlab.inc" - .include "data/maps/events/MagmaHideout_1F.inc" - .include "data/maps/events/MagmaHideout_B1F.inc" - .include "data/maps/events/MagmaHideout_B2F.inc" - .include "data/maps/events/SkyPillar_Entrance.inc" - .include "data/maps/events/SkyPillar_Outside.inc" - .include "data/maps/events/SkyPillar_1F.inc" - .include "data/maps/events/SkyPillar_2F.inc" - .include "data/maps/events/SkyPillar_3F.inc" - .include "data/maps/events/SkyPillar_4F.inc" - .include "data/maps/events/ShoalCave_LowTideIceRoom.inc" - .include "data/maps/events/SkyPillar_5F.inc" - .include "data/maps/events/SkyPillar_Top.inc" - .include "data/maps/events/SecretBase_RedCave1.inc" - .include "data/maps/events/SecretBase_BrownCave1.inc" - .include "data/maps/events/SecretBase_BlueCave1.inc" - .include "data/maps/events/SecretBase_YellowCave1.inc" - .include "data/maps/events/SecretBase_Tree1.inc" - .include "data/maps/events/SecretBase_Shrub1.inc" - .include "data/maps/events/SecretBase_RedCave2.inc" - .include "data/maps/events/SecretBase_BrownCave2.inc" - .include "data/maps/events/SecretBase_BlueCave2.inc" - .include "data/maps/events/SecretBase_YellowCave2.inc" - .include "data/maps/events/SecretBase_Tree2.inc" - .include "data/maps/events/SecretBase_Shrub2.inc" - .include "data/maps/events/SecretBase_RedCave3.inc" - .include "data/maps/events/SecretBase_BrownCave3.inc" - .include "data/maps/events/SecretBase_BlueCave3.inc" - .include "data/maps/events/SecretBase_YellowCave3.inc" - .include "data/maps/events/SecretBase_Tree3.inc" - .include "data/maps/events/SecretBase_Shrub3.inc" - .include "data/maps/events/SecretBase_RedCave4.inc" - .include "data/maps/events/SecretBase_BrownCave4.inc" - .include "data/maps/events/SecretBase_BlueCave4.inc" - .include "data/maps/events/SecretBase_YellowCave4.inc" - .include "data/maps/events/SecretBase_Tree4.inc" - .include "data/maps/events/SecretBase_Shrub4.inc" - .include "data/maps/events/SingleBattleColosseum.inc" - .include "data/maps/events/TradeCenter.inc" - .include "data/maps/events/RecordCorner.inc" - .include "data/maps/events/DoubleBattleColosseum.inc" - .include "data/maps/events/LinkContestRoom1.inc" - .include "data/maps/events/LinkContestRoom2.inc" - .include "data/maps/events/LinkContestRoom3.inc" - .include "data/maps/events/LinkContestRoom4.inc" - .include "data/maps/events/LinkContestRoom5.inc" - .include "data/maps/events/LinkContestRoom6.inc" - .include "data/maps/events/UnknownMap_25_29.inc" - .include "data/maps/events/UnknownMap_25_30.inc" - .include "data/maps/events/UnknownMap_25_31.inc" - .include "data/maps/events/UnknownMap_25_32.inc" - .include "data/maps/events/UnknownMap_25_33.inc" - .include "data/maps/events/UnknownMap_25_34.inc" - .include "data/maps/events/InsideOfTruck.inc" - .include "data/maps/events/SSTidalCorridor.inc" - .include "data/maps/events/SSTidalLowerDeck.inc" - .include "data/maps/events/SSTidalRooms.inc" - .include "data/maps/events/SafariZone_Northwest.inc" - .include "data/maps/events/SafariZone_Northeast.inc" - .include "data/maps/events/SafariZone_Southwest.inc" - .include "data/maps/events/SafariZone_Southeast.inc" - .include "data/maps/events/BattleTower_Outside.inc" - .include "data/maps/events/BattleTower_Lobby.inc" - .include "data/maps/events/BattleTower_Elevator.inc" - .include "data/maps/events/BattleTower_Corridor.inc" - .include "data/maps/events/BattleTower_BattleRoom.inc" - .include "data/maps/events/SouthernIsland_Exterior.inc" - .include "data/maps/events/SouthernIsland_Interior.inc" - .include "data/maps/events/SafariZone_RestHouse.inc" - .include "data/maps/events/Route104_Prototype.inc" - .include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc" - .include "data/maps/events/Route109_SeashoreHouse.inc" - .include "data/maps/events/Route110_TrickHouseEntrance.inc" - .include "data/maps/events/Route110_TrickHouseEnd.inc" - .include "data/maps/events/Route110_TrickHouseCorridor.inc" - .include "data/maps/events/Route110_TrickHousePuzzle1.inc" - .include "data/maps/events/Route110_TrickHousePuzzle2.inc" - .include "data/maps/events/Route110_TrickHousePuzzle3.inc" - .include "data/maps/events/Route110_TrickHousePuzzle4.inc" - .include "data/maps/events/Route110_TrickHousePuzzle5.inc" - .include "data/maps/events/Route110_TrickHousePuzzle6.inc" - .include "data/maps/events/Route110_TrickHousePuzzle7.inc" - .include "data/maps/events/Route110_TrickHousePuzzle8.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc" - .include "data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc" - .include "data/maps/events/Route113_GlassWorkshop.inc" - .include "data/maps/events/Route123_BerryMastersHouse.inc" - .include "data/maps/events/Route119_WeatherInstitute_1F.inc" - .include "data/maps/events/Route119_WeatherInstitute_2F.inc" - .include "data/maps/events/Route119_House.inc" - .include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc" + .include "data/maps/PetalburgCity/events.inc" + .include "data/maps/SlateportCity/events.inc" + .include "data/maps/MauvilleCity/events.inc" + .include "data/maps/RustboroCity/events.inc" + .include "data/maps/FortreeCity/events.inc" + .include "data/maps/LilycoveCity/events.inc" + .include "data/maps/MossdeepCity/events.inc" + .include "data/maps/SootopolisCity/events.inc" + .include "data/maps/EverGrandeCity/events.inc" + .include "data/maps/LittlerootTown/events.inc" + .include "data/maps/OldaleTown/events.inc" + .include "data/maps/DewfordTown/events.inc" + .include "data/maps/LavaridgeTown/events.inc" + .include "data/maps/FallarborTown/events.inc" + .include "data/maps/VerdanturfTown/events.inc" + .include "data/maps/PacifidlogTown/events.inc" + .include "data/maps/Route101/events.inc" + .include "data/maps/Route102/events.inc" + .include "data/maps/Route103/events.inc" + .include "data/maps/Route104/events.inc" + .include "data/maps/Route105/events.inc" + .include "data/maps/Route106/events.inc" + .include "data/maps/Route107/events.inc" + .include "data/maps/Route108/events.inc" + .include "data/maps/Route109/events.inc" + .include "data/maps/Route110/events.inc" + .include "data/maps/Route111/events.inc" + .include "data/maps/Route112/events.inc" + .include "data/maps/Route113/events.inc" + .include "data/maps/Route114/events.inc" + .include "data/maps/Route115/events.inc" + .include "data/maps/Route116/events.inc" + .include "data/maps/Route117/events.inc" + .include "data/maps/Route118/events.inc" + .include "data/maps/Route119/events.inc" + .include "data/maps/Route120/events.inc" + .include "data/maps/Route121/events.inc" + .include "data/maps/Route122/events.inc" + .include "data/maps/Route123/events.inc" + .include "data/maps/Route124/events.inc" + .include "data/maps/Route125/events.inc" + .include "data/maps/Route126/events.inc" + .include "data/maps/Route127/events.inc" + .include "data/maps/Route128/events.inc" + .include "data/maps/Route129/events.inc" + .include "data/maps/Route130/events.inc" + .include "data/maps/Route131/events.inc" + .include "data/maps/Route132/events.inc" + .include "data/maps/Route133/events.inc" + .include "data/maps/Route134/events.inc" + .include "data/maps/Underwater1/events.inc" + .include "data/maps/Underwater2/events.inc" + .include "data/maps/Underwater3/events.inc" + .include "data/maps/Underwater4/events.inc" + .include "data/maps/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_ContestLobby/events.inc" + .include "data/maps/FallarborTown_ContestHall/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_ContestLobby/events.inc" + .include "data/maps/VerdanturfTown_ContestHall/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_ContestLobby/events.inc" + .include "data/maps/SlateportCity_ContestHall/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_EmptyMap/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_House8/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_Corridor1/events.inc" + .include "data/maps/EverGrandeCity_Corridor2/events.inc" + .include "data/maps/EverGrandeCity_Corridor3/events.inc" + .include "data/maps/EverGrandeCity_Corridor4/events.inc" + .include "data/maps/EverGrandeCity_Corridor5/events.inc" + .include "data/maps/EverGrandeCity_PokemonLeague/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/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_B1F/events.inc" + .include "data/maps/CaveOfOrigin_B2F/events.inc" + .include "data/maps/CaveOfOrigin_B3F/events.inc" + .include "data/maps/CaveOfOrigin_B4F/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/MagmaHideout_1F/events.inc" + .include "data/maps/MagmaHideout_B1F/events.inc" + .include "data/maps/MagmaHideout_B2F/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/SecretBase_RedCave1/events.inc" + .include "data/maps/SecretBase_BrownCave1/events.inc" + .include "data/maps/SecretBase_BlueCave1/events.inc" + .include "data/maps/SecretBase_YellowCave1/events.inc" + .include "data/maps/SecretBase_Tree1/events.inc" + .include "data/maps/SecretBase_Shrub1/events.inc" + .include "data/maps/SecretBase_RedCave2/events.inc" + .include "data/maps/SecretBase_BrownCave2/events.inc" + .include "data/maps/SecretBase_BlueCave2/events.inc" + .include "data/maps/SecretBase_YellowCave2/events.inc" + .include "data/maps/SecretBase_Tree2/events.inc" + .include "data/maps/SecretBase_Shrub2/events.inc" + .include "data/maps/SecretBase_RedCave3/events.inc" + .include "data/maps/SecretBase_BrownCave3/events.inc" + .include "data/maps/SecretBase_BlueCave3/events.inc" + .include "data/maps/SecretBase_YellowCave3/events.inc" + .include "data/maps/SecretBase_Tree3/events.inc" + .include "data/maps/SecretBase_Shrub3/events.inc" + .include "data/maps/SecretBase_RedCave4/events.inc" + .include "data/maps/SecretBase_BrownCave4/events.inc" + .include "data/maps/SecretBase_BlueCave4/events.inc" + .include "data/maps/SecretBase_YellowCave4/events.inc" + .include "data/maps/SecretBase_Tree4/events.inc" + .include "data/maps/SecretBase_Shrub4/events.inc" + .include "data/maps/SingleBattleColosseum/events.inc" + .include "data/maps/TradeCenter/events.inc" + .include "data/maps/RecordCorner/events.inc" + .include "data/maps/DoubleBattleColosseum/events.inc" + .include "data/maps/LinkContestRoom1/events.inc" + .include "data/maps/LinkContestRoom2/events.inc" + .include "data/maps/LinkContestRoom3/events.inc" + .include "data/maps/LinkContestRoom4/events.inc" + .include "data/maps/LinkContestRoom5/events.inc" + .include "data/maps/LinkContestRoom6/events.inc" + .include "data/maps/UnknownMap_25_29/events.inc" + .include "data/maps/UnknownMap_25_30/events.inc" + .include "data/maps/UnknownMap_25_31/events.inc" + .include "data/maps/UnknownMap_25_32/events.inc" + .include "data/maps/UnknownMap_25_33/events.inc" + .include "data/maps/UnknownMap_25_34/events.inc" + .include "data/maps/InsideOfTruck/events.inc" + .include "data/maps/SSTidalCorridor/events.inc" + .include "data/maps/SSTidalLowerDeck/events.inc" + .include "data/maps/SSTidalRooms/events.inc" + .include "data/maps/SafariZone_Northwest/events.inc" + .include "data/maps/SafariZone_Northeast/events.inc" + .include "data/maps/SafariZone_Southwest/events.inc" + .include "data/maps/SafariZone_Southeast/events.inc" + .include "data/maps/BattleTower_Outside/events.inc" + .include "data/maps/BattleTower_Lobby/events.inc" + .include "data/maps/BattleTower_Elevator/events.inc" + .include "data/maps/BattleTower_Corridor/events.inc" + .include "data/maps/BattleTower_BattleRoom/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/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_SeasideCyclingRoadSouthEntrance/events.inc" + .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc" + .include "data/maps/Route113_GlassWorkshop/events.inc" + .include "data/maps/Route123_BerryMastersHouse/events.inc" + .include "data/maps/Route119_WeatherInstitute_1F/events.inc" + .include "data/maps/Route119_WeatherInstitute_2F/events.inc" + .include "data/maps/Route119_House/events.inc" + .include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc" diff --git a/data/maps.s b/data/maps.s index 727a48d0f..f8be7f31f 100644 --- a/data/maps.s +++ b/data/maps.s @@ -5,8 +5,8 @@ .section .rodata - .include "data/maps/_assets.inc" - .include "data/maps/attributes_table.inc" + .include "data/layouts.inc" + .include "data/layouts_table.inc" .include "data/maps/headers.inc" - .include "data/maps/_groups.inc" + .include "data/maps/groups.inc" .include "data/maps/connections.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc new file mode 100644 index 000000000..791ab9754 --- /dev/null +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -0,0 +1,10 @@ +AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 + +AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C + warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK + +AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C + map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc new file mode 100644 index 000000000..82af88bce --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -0,0 +1,20 @@ +AbandonedShip_Corridors_1F_EventObjects:: @ 838E120 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0 + +AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 + 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:: @ 838E1B0 + map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc new file mode 100644 index 000000000..35dc34437 --- /dev/null +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -0,0 +1,19 @@ +AbandonedShip_Corridors_B1F_EventObjects:: @ 838E238 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0 + +AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 + 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:: @ 838E2A8 + bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 + +AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 + map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc new file mode 100644 index 000000000..15f54114b --- /dev/null +++ b/data/maps/AbandonedShip_Deck/events.inc @@ -0,0 +1,9 @@ +AbandonedShip_Deck_MapWarps:: @ 838E0E4 + 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:: @ 838E10C + map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc new file mode 100644 index 000000000..97bdf37c5 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -0,0 +1,16 @@ +AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC + 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:: @ 838E4FC + bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 + bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A + bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 + bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 + +AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C + map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc new file mode 100644 index 000000000..7c8135e89 --- /dev/null +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -0,0 +1,31 @@ +AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 + +AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 + 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:: @ 838E5E8 + bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_1F + bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20 + bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21 + bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22 + bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + +AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 + map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc new file mode 100644 index 000000000..e828890a5 --- /dev/null +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -0,0 +1,9 @@ +AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 + +AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 + 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:: @ 838E3D4 + map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc new file mode 100644 index 000000000..e29bd3b42 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -0,0 +1,12 @@ +AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 + +AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 + 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:: @ 838E448 + map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc new file mode 100644 index 000000000..aa6eb759a --- /dev/null +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -0,0 +1,12 @@ +AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 + +AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 + 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:: @ 838E374 + map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc new file mode 100644 index 000000000..6ffe06615 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -0,0 +1,14 @@ +AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 + +AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 + 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:: @ 838E224 + map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc new file mode 100644 index 000000000..405506b44 --- /dev/null +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -0,0 +1,11 @@ +AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 + +AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 + 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:: @ 838E310 + map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc new file mode 100644 index 000000000..17a89c2aa --- /dev/null +++ b/data/maps/AbandonedShip_Underwater1/events.inc @@ -0,0 +1,6 @@ +AbandonedShip_Underwater1_MapWarps:: @ 838E388 + warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 + +AbandonedShip_Underwater1_MapEvents:: @ 838E398 + map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc new file mode 100644 index 000000000..6eb94059c --- /dev/null +++ b/data/maps/AbandonedShip_Underwater2/events.inc @@ -0,0 +1,5 @@ +AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 + warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 + +AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 + map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc new file mode 100644 index 000000000..2699b9036 --- /dev/null +++ b/data/maps/AncientTomb/events.inc @@ -0,0 +1,15 @@ +AncientTomb_EventObjects:: @ 838E6DC + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL + +AncientTomb_MapWarps:: @ 838E6F4 + 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:: @ 838E70C + bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 + bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + +AncientTomb_MapEvents:: @ 838E730 + map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc new file mode 100644 index 000000000..3c87be0d7 --- /dev/null +++ b/data/maps/AquaHideout_1F/events.inc @@ -0,0 +1,12 @@ +AquaHideout_1F_EventObjects:: @ 838CD0C + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS + +AquaHideout_1F_MapWarps:: @ 838CD54 + 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:: @ 838CD6C + map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc new file mode 100644 index 000000000..0a53d4cf9 --- /dev/null +++ b/data/maps/AquaHideout_B1F/events.inc @@ -0,0 +1,39 @@ +AquaHideout_B1F_EventObjects:: @ 838CD80 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, 24, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, 27, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT + +AquaHideout_B1F_MapWarps:: @ 838CE40 + 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:: @ 838CF08 + map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc new file mode 100644 index 000000000..6eee30658 --- /dev/null +++ b/data/maps/AquaHideout_B2F/events.inc @@ -0,0 +1,25 @@ +AquaHideout_B2F_EventObjects:: @ 838CF1C + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, 7, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS + +AquaHideout_B2F_MapWarps:: @ 838CF94 + 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:: @ 838CFE4 + coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + +AquaHideout_B2F_MapEvents:: @ 838D004 + map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/BattleTower_BattleRoom/events.inc b/data/maps/BattleTower_BattleRoom/events.inc new file mode 100644 index 000000000..a4bbe9849 --- /dev/null +++ b/data/maps/BattleTower_BattleRoom/events.inc @@ -0,0 +1,10 @@ +BattleTower_BattleRoom_EventObjects:: @ 8391DAC + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 + +BattleTower_BattleRoom_MapWarps:: @ 8391DDC + warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY + warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY + +BattleTower_BattleRoom_MapEvents:: @ 8391DEC + map_events BattleTower_BattleRoom_EventObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleTower_Corridor/events.inc b/data/maps/BattleTower_Corridor/events.inc new file mode 100644 index 000000000..1233ff32c --- /dev/null +++ b/data/maps/BattleTower_Corridor/events.inc @@ -0,0 +1,5 @@ +BattleTower_Corridor_EventObjects:: @ 8391D80 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 + +BattleTower_Corridor_MapEvents:: @ 8391D98 + map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleTower_Elevator/events.inc b/data/maps/BattleTower_Elevator/events.inc new file mode 100644 index 000000000..57434d3ac --- /dev/null +++ b/data/maps/BattleTower_Elevator/events.inc @@ -0,0 +1,5 @@ +BattleTower_Elevator_EventObjects:: @ 8391D54 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 + +BattleTower_Elevator_MapEvents:: @ 8391D6C + map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleTower_Lobby/events.inc b/data/maps/BattleTower_Lobby/events.inc new file mode 100644 index 000000000..ca33bdf95 --- /dev/null +++ b/data/maps/BattleTower_Lobby/events.inc @@ -0,0 +1,18 @@ +BattleTower_Lobby_EventObjects:: @ 8391C8C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, 1, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, 9, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + +BattleTower_Lobby_MapWarps:: @ 8391D1C + warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE + warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM + +BattleTower_Lobby_MapBGEvents:: @ 8391D34 + bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 + +BattleTower_Lobby_MapEvents:: @ 8391D40 + map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents diff --git a/data/maps/BattleTower_Outside/events.inc b/data/maps/BattleTower_Outside/events.inc new file mode 100644 index 000000000..2e02fcc1c --- /dev/null +++ b/data/maps/BattleTower_Outside/events.inc @@ -0,0 +1,15 @@ +BattleTower_Outside_EventObjects:: @ 8391BEC + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0 + object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, 10, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, 7, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0 + +BattleTower_Outside_MapWarps:: @ 8391C64 + warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY + +BattleTower_Outside_MapBGEvents:: @ 8391C6C + bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A + +BattleTower_Outside_MapEvents:: @ 8391C78 + map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc new file mode 100644 index 000000000..b0d77795c --- /dev/null +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -0,0 +1,11 @@ +CaveOfOrigin_1F_MapWarps:: @ 838D718 + warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE + warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F + +CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 + coord_event 7, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + +CaveOfOrigin_1F_MapEvents:: @ 838D758 + map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc new file mode 100644 index 000000000..a91ee50e4 --- /dev/null +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -0,0 +1,11 @@ +CaveOfOrigin_B1F_MapWarps:: @ 838D76C + warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F + warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F + +CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C + coord_event 12, 15, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + +CaveOfOrigin_B1F_MapEvents:: @ 838D7AC + map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B2F/events.inc b/data/maps/CaveOfOrigin_B2F/events.inc new file mode 100644 index 000000000..5d03aaaa2 --- /dev/null +++ b/data/maps/CaveOfOrigin_B2F/events.inc @@ -0,0 +1,11 @@ +CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 + warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_B1F + warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F + +CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 + coord_event 10, 6, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB + +CaveOfOrigin_B2F_MapEvents:: @ 838D800 + map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B3F/events.inc b/data/maps/CaveOfOrigin_B3F/events.inc new file mode 100644 index 000000000..dcf831a76 --- /dev/null +++ b/data/maps/CaveOfOrigin_B3F/events.inc @@ -0,0 +1,14 @@ +CaveOfOrigin_B3F_EventObjects:: @ 838D814 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, 1, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 + +CaveOfOrigin_B3F_MapWarps:: @ 838D82C + warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F + warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F + +CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C + coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + +CaveOfOrigin_B3F_MapEvents:: @ 838D86C + map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B4F/events.inc b/data/maps/CaveOfOrigin_B4F/events.inc new file mode 100644 index 000000000..faa146570 --- /dev/null +++ b/data/maps/CaveOfOrigin_B4F/events.inc @@ -0,0 +1,13 @@ +CaveOfOrigin_B4F_EventObjects:: @ 838D880 + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN + +CaveOfOrigin_B4F_MapWarps:: @ 838D898 + warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F + +CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 + coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + +CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 + map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc new file mode 100644 index 000000000..cab14e4d7 --- /dev/null +++ b/data/maps/CaveOfOrigin_Entrance/events.inc @@ -0,0 +1,6 @@ +CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 + warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY + warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F + +CaveOfOrigin_Entrance_MapEvents:: @ 838D704 + map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc new file mode 100644 index 000000000..b1d8690c1 --- /dev/null +++ b/data/maps/DesertRuins/events.inc @@ -0,0 +1,15 @@ +DesertRuins_EventObjects:: @ 838BEBC + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK + +DesertRuins_MapWarps:: @ 838BED4 + 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:: @ 838BEEC + bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 + bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + +DesertRuins_MapEvents:: @ 838BF10 + map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc new file mode 100644 index 000000000..5cfb552ee --- /dev/null +++ b/data/maps/DewfordTown/events.inc @@ -0,0 +1,23 @@ +DewfordTown_EventObjects:: @ 8380B88 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0 + +DewfordTown_MapWarps:: @ 8380C00 + 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:: @ 8380C28 + bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB + bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4 + bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA + bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA + bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD + +DewfordTown_MapEvents:: @ 8380C64 + map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc new file mode 100644 index 000000000..237748602 --- /dev/null +++ b/data/maps/DewfordTown_Gym/events.inc @@ -0,0 +1,19 @@ +DewfordTown_Gym_EventObjects:: @ 8385FBC + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0 + +DewfordTown_Gym_MapWarps:: @ 8386034 + warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN + warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN + +DewfordTown_Gym_MapBGEvents:: @ 8386044 + bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E + bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E + bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + +DewfordTown_Gym_MapEvents:: @ 8386074 + map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc new file mode 100644 index 000000000..3eb9818fe --- /dev/null +++ b/data/maps/DewfordTown_Hall/events.inc @@ -0,0 +1,21 @@ +DewfordTown_Hall_EventObjects:: @ 8386088 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL + +DewfordTown_Hall_MapWarps:: @ 8386160 + warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN + warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN + +DewfordTown_Hall_MapBGEvents:: @ 8386170 + bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 + bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363 + +DewfordTown_Hall_MapEvents:: @ 8386188 + map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc new file mode 100644 index 000000000..69fd54d9c --- /dev/null +++ b/data/maps/DewfordTown_House1/events.inc @@ -0,0 +1,11 @@ +DewfordTown_House1_EventObjects:: @ 8385E58 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0 + +DewfordTown_House1_MapWarps:: @ 8385EA0 + warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN + warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN + +DewfordTown_House1_MapEvents:: @ 8385EB0 + map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc new file mode 100644 index 000000000..f6858b846 --- /dev/null +++ b/data/maps/DewfordTown_House2/events.inc @@ -0,0 +1,10 @@ +DewfordTown_House2_EventObjects:: @ 838619C + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0 + +DewfordTown_House2_MapWarps:: @ 83861CC + warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN + warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN + +DewfordTown_House2_MapEvents:: @ 83861DC + map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..97b0e761a --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +DewfordTown_PokemonCenter_1F_EventObjects:: @ 8385EC4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0 + +DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C + 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:: @ 8385F24 + map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..333823536 --- /dev/null +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +DewfordTown_PokemonCenter_2F_EventObjects:: @ 8385F38 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0 + +DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 + warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 + map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc new file mode 100644 index 000000000..a04c7a3a9 --- /dev/null +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -0,0 +1,14 @@ +DoubleBattleColosseum_MapWarps:: @ 8391428 + 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:: @ 8391448 + coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 + +DoubleBattleColosseum_MapEvents:: @ 8391488 + map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc new file mode 100644 index 000000000..0a619b93d --- /dev/null +++ b/data/maps/EverGrandeCity/events.inc @@ -0,0 +1,28 @@ +EverGrandeCity_MapWarps:: @ 83807DC + warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + 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:: @ 83807FC + coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + +EverGrandeCity_MapBGEvents:: @ 83808AC + bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 + bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_14D4EE + bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_14D4F7 + bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + +EverGrandeCity_MapEvents:: @ 83808E8 + map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc new file mode 100644 index 000000000..832ddf206 --- /dev/null +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -0,0 +1,11 @@ +EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM + +EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C + warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME + +EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C + map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Corridor1/events.inc b/data/maps/EverGrandeCity_Corridor1/events.inc new file mode 100644 index 000000000..f3ec6727e --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor1/events.inc @@ -0,0 +1,8 @@ +EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 + 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_Corridor1_MapEvents:: @ 838B3C0 + map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Corridor2/events.inc b/data/maps/EverGrandeCity_Corridor2/events.inc new file mode 100644 index 000000000..e9a9cdc4c --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor2/events.inc @@ -0,0 +1,8 @@ +EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 + 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_Corridor2_MapEvents:: @ 838B3F4 + map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Corridor3/events.inc b/data/maps/EverGrandeCity_Corridor3/events.inc new file mode 100644 index 000000000..98d5f7b81 --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor3/events.inc @@ -0,0 +1,8 @@ +EverGrandeCity_Corridor3_MapWarps:: @ 838B408 + 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_Corridor3_MapEvents:: @ 838B428 + map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Corridor4/events.inc b/data/maps/EverGrandeCity_Corridor4/events.inc new file mode 100644 index 000000000..cbcf9f77e --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor4/events.inc @@ -0,0 +1,6 @@ +EverGrandeCity_Corridor4_MapWarps:: @ 838B43C + 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_Corridor4_MapEvents:: @ 838B44C + map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Corridor5/events.inc b/data/maps/EverGrandeCity_Corridor5/events.inc new file mode 100644 index 000000000..5b77148ca --- /dev/null +++ b/data/maps/EverGrandeCity_Corridor5/events.inc @@ -0,0 +1,8 @@ +EverGrandeCity_Corridor5_MapWarps:: @ 838B460 + warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM + warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE + +EverGrandeCity_Corridor5_MapEvents:: @ 838B480 + map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc new file mode 100644 index 000000000..6b69d45da --- /dev/null +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_DrakesRoom_EventObjects:: @ 838B2F8 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0 + +EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 + +EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 + map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc new file mode 100644 index 000000000..8dba287fe --- /dev/null +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_GlaciasRoom_EventObjects:: @ 838B2BC + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0 + +EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 + +EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 + map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc new file mode 100644 index 000000000..f5a3f9137 --- /dev/null +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -0,0 +1,8 @@ +EverGrandeCity_HallOfFame_EventObjects:: @ 838B528 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 + +EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 + warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM + +EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 + map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc new file mode 100644 index 000000000..aa67e5912 --- /dev/null +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_PhoebesRoom_EventObjects:: @ 838B280 + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0 + +EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 + +EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 + map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..ea1045d22 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +EverGrandeCity_PokemonCenter_1F_EventObjects:: @ 838B55C + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0 + +EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 + 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:: @ 838B5BC + map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..36dfa01f7 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PokemonCenter_2F_EventObjects:: @ 838B5D0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0 + +EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 + warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 + map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague/events.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc new file mode 100644 index 000000000..89c6973a5 --- /dev/null +++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc @@ -0,0 +1,14 @@ +EverGrandeCity_PokemonLeague_EventObjects:: @ 838B494 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 + +EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 + 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_CORRIDOR5 + warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 + +EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 + map_events EverGrandeCity_PokemonLeague_EventObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc new file mode 100644 index 000000000..552981282 --- /dev/null +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -0,0 +1,9 @@ +EverGrandeCity_SidneysRoom_EventObjects:: @ 838B244 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0 + +EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C + warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 + warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 + +EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C + map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc new file mode 100644 index 000000000..37308b07c --- /dev/null +++ b/data/maps/FallarborTown/events.inc @@ -0,0 +1,25 @@ +FallarborTown_EventObjects:: @ 8380E04 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR + +FallarborTown_MapWarps:: @ 8380E64 + warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART + warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_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:: @ 8380E8C + bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 + bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA + bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839 + bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA + bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 + bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 + bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B + bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C + +FallarborTown_MapEvents:: @ 8380EEC + map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown_ContestHall/events.inc b/data/maps/FallarborTown_ContestHall/events.inc new file mode 100644 index 000000000..9479c8db1 --- /dev/null +++ b/data/maps/FallarborTown_ContestHall/events.inc @@ -0,0 +1,15 @@ +FallarborTown_ContestHall_EventObjects:: @ 83867DC + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, 2, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, 2, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, 2, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0 + +FallarborTown_ContestHall_MapWarps:: @ 8386824 + warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY + +FallarborTown_ContestHall_MapBGEvents:: @ 8386834 + bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + +FallarborTown_ContestHall_MapEvents:: @ 838684C + map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents diff --git a/data/maps/FallarborTown_ContestLobby/events.inc b/data/maps/FallarborTown_ContestLobby/events.inc new file mode 100644 index 000000000..47144a554 --- /dev/null +++ b/data/maps/FallarborTown_ContestLobby/events.inc @@ -0,0 +1,21 @@ +FallarborTown_ContestLobby_EventObjects:: @ 83866F0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, 5, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0 + +FallarborTown_ContestLobby_MapWarps:: @ 8386780 + warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN + warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL + +FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 + bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 + bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604 + bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB + bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2 + +FallarborTown_ContestLobby_MapEvents:: @ 83867C8 + map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc new file mode 100644 index 000000000..fefaadc51 --- /dev/null +++ b/data/maps/FallarborTown_House1/events.inc @@ -0,0 +1,10 @@ +FallarborTown_House1_EventObjects:: @ 8386970 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0 + +FallarborTown_House1_MapWarps:: @ 83869A0 + warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN + warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN + +FallarborTown_House1_MapEvents:: @ 83869B0 + map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc new file mode 100644 index 000000000..b873f95c8 --- /dev/null +++ b/data/maps/FallarborTown_House2/events.inc @@ -0,0 +1,9 @@ +FallarborTown_House2_EventObjects:: @ 83869C4 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0 + +FallarborTown_House2_MapWarps:: @ 83869DC + warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN + +FallarborTown_House2_MapEvents:: @ 83869EC + map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc new file mode 100644 index 000000000..bf3195eea --- /dev/null +++ b/data/maps/FallarborTown_Mart/events.inc @@ -0,0 +1,12 @@ +FallarborTown_Mart_EventObjects:: @ 838666C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0 + +FallarborTown_Mart_MapWarps:: @ 83866CC + warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN + warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN + +FallarborTown_Mart_MapEvents:: @ 83866DC + map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..06f8068c6 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR + +FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 + 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:: @ 83868D8 + map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..381051d01 --- /dev/null +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 + +FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 + warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 3, 0, MAP_TRADE_CENTER + warp_def 11, 1, 3, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C + map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc new file mode 100644 index 000000000..faf6d5011 --- /dev/null +++ b/data/maps/FieryPath/events.inc @@ -0,0 +1,16 @@ +FieryPath_EventObjects:: @ 838C718 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2 + +FieryPath_MapWarps:: @ 838C7D8 + warp_def 26, 36, 3, 4, MAP_ROUTE112 + warp_def 26, 4, 3, 5, MAP_ROUTE112 + +FieryPath_MapEvents:: @ 838C7E8 + map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc new file mode 100644 index 000000000..485fd836f --- /dev/null +++ b/data/maps/FortreeCity/events.inc @@ -0,0 +1,30 @@ +FortreeCity_EventObjects:: @ 8380020 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE + +FortreeCity_MapWarps:: @ 83800C8 + 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:: @ 8380110 + bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 + bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA + bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA + bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA + bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + +FortreeCity_MapEvents:: @ 8380158 + map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc new file mode 100644 index 000000000..47e635fa8 --- /dev/null +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -0,0 +1,12 @@ +FortreeCity_DecorationShop_EventObjects:: @ 83893E0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0 + +FortreeCity_DecorationShop_MapWarps:: @ 8389440 + warp_def 3, 5, 0, 8, MAP_FORTREE_CITY + warp_def 4, 5, 0, 8, MAP_FORTREE_CITY + +FortreeCity_DecorationShop_MapEvents:: @ 8389450 + map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc new file mode 100644 index 000000000..9ff31951b --- /dev/null +++ b/data/maps/FortreeCity_Gym/events.inc @@ -0,0 +1,18 @@ +FortreeCity_Gym_EventObjects:: @ 8389018 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, 7, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, 9, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, 8, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0 + +FortreeCity_Gym_MapWarps:: @ 83890A8 + warp_def 2, 24, 0, 2, MAP_FORTREE_CITY + warp_def 3, 24, 0, 2, MAP_FORTREE_CITY + +FortreeCity_Gym_MapBGEvents:: @ 83890B8 + bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD + bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED + +FortreeCity_Gym_MapEvents:: @ 83890D0 + map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc new file mode 100644 index 000000000..5e91f873e --- /dev/null +++ b/data/maps/FortreeCity_House1/events.inc @@ -0,0 +1,11 @@ +FortreeCity_House1_EventObjects:: @ 8388FAC + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0 + +FortreeCity_House1_MapWarps:: @ 8388FF4 + warp_def 3, 5, 0, 1, MAP_FORTREE_CITY + warp_def 4, 5, 0, 1, MAP_FORTREE_CITY + +FortreeCity_House1_MapEvents:: @ 8389004 + map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc new file mode 100644 index 000000000..41d8962fe --- /dev/null +++ b/data/maps/FortreeCity_House2/events.inc @@ -0,0 +1,9 @@ +FortreeCity_House2_EventObjects:: @ 8389278 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0 + +FortreeCity_House2_MapWarps:: @ 8389290 + warp_def 3, 5, 0, 4, MAP_FORTREE_CITY + warp_def 4, 5, 0, 4, MAP_FORTREE_CITY + +FortreeCity_House2_MapEvents:: @ 83892A0 + map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc new file mode 100644 index 000000000..e02749d0e --- /dev/null +++ b/data/maps/FortreeCity_House3/events.inc @@ -0,0 +1,10 @@ +FortreeCity_House3_EventObjects:: @ 83892B4 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0 + +FortreeCity_House3_MapWarps:: @ 83892E4 + warp_def 3, 5, 0, 5, MAP_FORTREE_CITY + warp_def 4, 5, 0, 5, MAP_FORTREE_CITY + +FortreeCity_House3_MapEvents:: @ 83892F4 + map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc new file mode 100644 index 000000000..58285c7f4 --- /dev/null +++ b/data/maps/FortreeCity_House4/events.inc @@ -0,0 +1,11 @@ +FortreeCity_House4_EventObjects:: @ 8389308 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE + +FortreeCity_House4_MapWarps:: @ 8389350 + warp_def 3, 5, 0, 6, MAP_FORTREE_CITY + warp_def 4, 5, 0, 6, MAP_FORTREE_CITY + +FortreeCity_House4_MapEvents:: @ 8389360 + map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc new file mode 100644 index 000000000..93447f739 --- /dev/null +++ b/data/maps/FortreeCity_House5/events.inc @@ -0,0 +1,11 @@ +FortreeCity_House5_EventObjects:: @ 8389374 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0 + +FortreeCity_House5_MapWarps:: @ 83893BC + warp_def 3, 5, 0, 7, MAP_FORTREE_CITY + warp_def 4, 5, 0, 7, MAP_FORTREE_CITY + +FortreeCity_House5_MapEvents:: @ 83893CC + map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc new file mode 100644 index 000000000..a9c48da93 --- /dev/null +++ b/data/maps/FortreeCity_Mart/events.inc @@ -0,0 +1,12 @@ +FortreeCity_Mart_EventObjects:: @ 83891F4 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0 + +FortreeCity_Mart_MapWarps:: @ 8389254 + warp_def 3, 7, 0, 3, MAP_FORTREE_CITY + warp_def 4, 7, 0, 3, MAP_FORTREE_CITY + +FortreeCity_Mart_MapEvents:: @ 8389264 + map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..dcf0e088a --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +FortreeCity_PokemonCenter_1F_EventObjects:: @ 83890E4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0 + +FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 + 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:: @ 838915C + map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..2e410c319 --- /dev/null +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +FortreeCity_PokemonCenter_2F_EventObjects:: @ 8389170 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0 + +FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 + warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 + map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc new file mode 100644 index 000000000..20ea8d4d5 --- /dev/null +++ b/data/maps/GraniteCave_1F/events.inc @@ -0,0 +1,12 @@ +GraniteCave_1F_EventObjects:: @ 838BF24 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1 + +GraniteCave_1F_MapWarps:: @ 838BF54 + 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:: @ 838BF74 + map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc new file mode 100644 index 000000000..3d148a922 --- /dev/null +++ b/data/maps/GraniteCave_B1F/events.inc @@ -0,0 +1,14 @@ +GraniteCave_B1F_EventObjects:: @ 838BF88 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1 + +GraniteCave_B1F_MapWarps:: @ 838BFA0 + 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:: @ 838BFD8 + map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc new file mode 100644 index 000000000..e5c7b1768 --- /dev/null +++ b/data/maps/GraniteCave_B2F/events.inc @@ -0,0 +1,24 @@ +GraniteCave_B2F_EventObjects:: @ 838BFEC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17 + +GraniteCave_B2F_MapWarps:: @ 838C0C4 + 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:: @ 838C0EC + bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_30 + bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31 + +GraniteCave_B2F_MapEvents:: @ 838C104 + map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc new file mode 100644 index 000000000..9d8f4b2ba --- /dev/null +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -0,0 +1,8 @@ +GraniteCave_StevensRoom_EventObjects:: @ 838C118 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE + +GraniteCave_StevensRoom_MapWarps:: @ 838C130 + warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F + +GraniteCave_StevensRoom_MapEvents:: @ 838C138 + map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc new file mode 100644 index 000000000..3aa3036de --- /dev/null +++ b/data/maps/InsideOfTruck/events.inc @@ -0,0 +1,24 @@ +InsideOfTruck_EventObjects:: @ 8391618 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + +InsideOfTruck_MapWarps:: @ 8391660 + 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:: @ 8391678 + coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + +InsideOfTruck_MapBGEvents:: @ 83916A8 + bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + +InsideOfTruck_MapEvents:: @ 83916E4 + map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc new file mode 100644 index 000000000..8c279596d --- /dev/null +++ b/data/maps/IslandCave/events.inc @@ -0,0 +1,15 @@ +IslandCave_EventObjects:: @ 838E674 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE + +IslandCave_MapWarps:: @ 838E68C + 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:: @ 838E6A4 + bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 + bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + +IslandCave_MapEvents:: @ 838E6C8 + map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc new file mode 100644 index 000000000..4b656e76e --- /dev/null +++ b/data/maps/JaggedPass/events.inc @@ -0,0 +1,25 @@ +JaggedPass_EventObjects:: @ 838C61C + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, 8, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, 14, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, 15, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0 + +JaggedPass_MapWarps:: @ 838C67C + 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 + +JaggedPass_MapCoordEvents:: @ 838C69C + 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 + +JaggedPass_MapBGEvents:: @ 838C6EC + bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_4D + bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C + +JaggedPass_MapEvents:: @ 838C704 + map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc new file mode 100644 index 000000000..895c792f4 --- /dev/null +++ b/data/maps/LavaridgeTown/events.inc @@ -0,0 +1,34 @@ +LavaridgeTown_EventObjects:: @ 8380C78 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0 + object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2 + object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0 + +LavaridgeTown_MapWarps:: @ 8380D50 + 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:: @ 8380D80 + coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 + +LavaridgeTown_MapBGEvents:: @ 8380D90 + bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7 + bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5 + bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 + bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC + bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 + bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 + +LavaridgeTown_MapEvents:: @ 8380DF0 + map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc new file mode 100644 index 000000000..ed3cc738f --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -0,0 +1,39 @@ +LavaridgeTown_Gym_1F_EventObjects:: @ 838625C + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0 + +LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 + warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN + warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F + warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F + +LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 + bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 + bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888 + +LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC + map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc new file mode 100644 index 000000000..9492194a8 --- /dev/null +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -0,0 +1,24 @@ +LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 + warp_def 3, 21, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 9, 2, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 1, 6, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 20, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 23, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 17, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 17, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 11, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 12, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 9, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 0, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 4, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 18, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 14, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 6, 2, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F + warp_def 10, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F + +LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 + map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc new file mode 100644 index 000000000..0e2c546b6 --- /dev/null +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -0,0 +1,11 @@ +LavaridgeTown_HerbShop_EventObjects:: @ 83861F0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0 + +LavaridgeTown_HerbShop_MapWarps:: @ 8386238 + warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN + +LavaridgeTown_HerbShop_MapEvents:: @ 8386248 + map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc new file mode 100644 index 000000000..90e33480c --- /dev/null +++ b/data/maps/LavaridgeTown_House/events.inc @@ -0,0 +1,10 @@ +LavaridgeTown_House_EventObjects:: @ 8386494 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0 + +LavaridgeTown_House_MapWarps:: @ 83864C4 + warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN + +LavaridgeTown_House_MapEvents:: @ 83864D4 + map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc new file mode 100644 index 000000000..2d365da54 --- /dev/null +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -0,0 +1,11 @@ +LavaridgeTown_Mart_EventObjects:: @ 83864E8 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0 + +LavaridgeTown_Mart_MapWarps:: @ 8386530 + warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN + warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN + +LavaridgeTown_Mart_MapEvents:: @ 8386540 + map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..98f670755 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +LavaridgeTown_PokemonCenter_1F_EventObjects:: @ 8386554 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0 + +LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 + 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:: @ 83865D4 + map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..370feb889 --- /dev/null +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +LavaridgeTown_PokemonCenter_2F_EventObjects:: @ 83865E8 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0 + +LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 + warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 + map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc new file mode 100644 index 000000000..e2aa43d2d --- /dev/null +++ b/data/maps/LilycoveCity/events.inc @@ -0,0 +1,53 @@ +LilycoveCity_EventObjects:: @ 838016C + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0 + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0 + object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART + +LilycoveCity_MapWarps:: @ 8380304 + 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 + warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F + +LilycoveCity_MapBGEvents:: @ 838037C + bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 + bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA + bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3 + bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA + bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67 + bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70 + bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79 + bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC + bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA + bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC + bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B + bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B + bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B + +LilycoveCity_MapEvents:: @ 8380418 + map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc new file mode 100644 index 000000000..bc4331484 --- /dev/null +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -0,0 +1,50 @@ +LilycoveCity_ContestHall_EventObjects:: @ 8389A18 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0 + +LilycoveCity_ContestHall_MapWarps:: @ 8389D18 + 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:: @ 8389D38 + bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C + bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E + bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E + bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C + bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + +LilycoveCity_ContestHall_MapEvents:: @ 8389D80 + map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc new file mode 100644 index 000000000..b44590d65 --- /dev/null +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -0,0 +1,32 @@ +LilycoveCity_ContestLobby_EventObjects:: @ 838984C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0 + object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0 + +LilycoveCity_ContestLobby_MapWarps:: @ 838999C + warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY + warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL + warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL + +LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC + bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 + bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659 + bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066 + bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D + bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074 + bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D + +LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 + map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc new file mode 100644 index 000000000..eee09c890 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -0,0 +1,13 @@ +LilycoveCity_CoveLilyMotel_1F_EventObjects:: @ 8389464 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0 + +LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C + 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:: @ 8389494 + coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + +LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 + map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc new file mode 100644 index 000000000..4469cddb0 --- /dev/null +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -0,0 +1,13 @@ +LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + +LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 + warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F + +LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 + map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc new file mode 100644 index 000000000..eca98b599 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -0,0 +1,9 @@ +LilycoveCity_DepartmentStoreElevator_EventObjects:: @ 838A624 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0 + +LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C + warp_def 1, 5, 3, 127, MAP_NONE + warp_def 2, 5, 3, 127, MAP_NONE + +LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C + map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc new file mode 100644 index 000000000..71d34fa68 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART + +LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 + warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F + +LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 + bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + +LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 + map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc new file mode 100644 index 000000000..d5170d4c1 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -0,0 +1,19 @@ +LilycoveCity_DepartmentStore_1F_EventObjects:: @ 838A218 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0 + +LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 + 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:: @ 838A2C8 + bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 + +LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 + map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc new file mode 100644 index 000000000..65c22a60f --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_2F_EventObjects:: @ 838A2E8 + object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0 + +LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 + 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:: @ 838A378 + map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc new file mode 100644 index 000000000..212d44971 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_3F_EventObjects:: @ 838A38C + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0 + +LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 + 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:: @ 838A41C + map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc new file mode 100644 index 000000000..40b8eab37 --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_DepartmentStore_4F_EventObjects:: @ 838A430 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0 + +LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 + 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:: @ 838A4C0 + map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc new file mode 100644 index 000000000..2883d167b --- /dev/null +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -0,0 +1,16 @@ +LilycoveCity_DepartmentStore_5F_EventObjects:: @ 838A4D4 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0 + +LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C + 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:: @ 838A594 + map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_EmptyMap/events.inc b/data/maps/LilycoveCity_EmptyMap/events.inc new file mode 100644 index 000000000..4ac5c42b8 --- /dev/null +++ b/data/maps/LilycoveCity_EmptyMap/events.inc @@ -0,0 +1,5 @@ +LilycoveCity_EmptyMap_MapWarps:: @ 838A028 + warp_def 7, 5, 0, 2, MAP_LILYCOVE_CITY_HARBOR + +LilycoveCity_EmptyMap_MapEvents:: @ 838A030 + map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc new file mode 100644 index 000000000..35a34928f --- /dev/null +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_Harbor_EventObjects:: @ 8389F94 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE + +LilycoveCity_Harbor_MapWarps:: @ 8389FF4 + warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY + warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP + warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP + +LilycoveCity_Harbor_MapEvents:: @ 838A014 + map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc new file mode 100644 index 000000000..482ebf0b6 --- /dev/null +++ b/data/maps/LilycoveCity_House1/events.inc @@ -0,0 +1,10 @@ +LilycoveCity_House1_EventObjects:: @ 838A080 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0 + +LilycoveCity_House1_MapWarps:: @ 838A0B0 + warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY + +LilycoveCity_House1_MapEvents:: @ 838A0C0 + map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc new file mode 100644 index 000000000..d557cd75a --- /dev/null +++ b/data/maps/LilycoveCity_House2/events.inc @@ -0,0 +1,9 @@ +LilycoveCity_House2_EventObjects:: @ 838A0D4 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0 + +LilycoveCity_House2_MapWarps:: @ 838A0EC + warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY + warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY + +LilycoveCity_House2_MapEvents:: @ 838A0FC + map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc new file mode 100644 index 000000000..2186eb0d2 --- /dev/null +++ b/data/maps/LilycoveCity_House3/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_House3_EventObjects:: @ 838A110 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0 + +LilycoveCity_House3_MapWarps:: @ 838A1A0 + warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY + +LilycoveCity_House3_MapEvents:: @ 838A1B0 + map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc new file mode 100644 index 000000000..d5ebda9f2 --- /dev/null +++ b/data/maps/LilycoveCity_House4/events.inc @@ -0,0 +1,10 @@ +LilycoveCity_House4_EventObjects:: @ 838A1C4 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0 + +LilycoveCity_House4_MapWarps:: @ 838A1F4 + warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY + warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY + +LilycoveCity_House4_MapEvents:: @ 838A204 + map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc new file mode 100644 index 000000000..a081a6523 --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -0,0 +1,37 @@ +LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + +LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 + 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:: @ 838966C + bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D + bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B + bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 + bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + +LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C + map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc new file mode 100644 index 000000000..4e2ffe49f --- /dev/null +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -0,0 +1,25 @@ +LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + +LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 + warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F + +LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 + bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + +LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 + map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc new file mode 100644 index 000000000..d28c4631c --- /dev/null +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -0,0 +1,9 @@ +LilycoveCity_MoveDeletersHouse_EventObjects:: @ 838A044 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0 + +LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C + warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY + +LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C + map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..2505adbc3 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +LilycoveCity_PokemonCenter_1F_EventObjects:: @ 8389D94 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0 + +LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC + 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:: @ 8389DF4 + map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..b8fd09d02 --- /dev/null +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +LilycoveCity_PokemonCenter_2F_EventObjects:: @ 8389E08 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0 + +LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 + warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 + map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc new file mode 100644 index 000000000..4f1d4ff4d --- /dev/null +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -0,0 +1,16 @@ +LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY + +LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 + warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY + warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY + +LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 + map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc new file mode 100644 index 000000000..4a0127506 --- /dev/null +++ b/data/maps/LilycoveCity_UnusedMart/events.inc @@ -0,0 +1,6 @@ +LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C + warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY + warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY + +LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C + map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc new file mode 100644 index 000000000..9bcf27a90 --- /dev/null +++ b/data/maps/LinkContestRoom1/events.inc @@ -0,0 +1,18 @@ +LinkContestRoom1_EventObjects:: @ 839149C + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL + object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 + +LinkContestRoom1_MapEvents:: @ 8391604 diff --git a/data/maps/LinkContestRoom2/events.inc b/data/maps/LinkContestRoom2/events.inc new file mode 100644 index 000000000..562a96523 --- /dev/null +++ b/data/maps/LinkContestRoom2/events.inc @@ -0,0 +1 @@ +LinkContestRoom2_MapEvents:: @ 8391604 diff --git a/data/maps/LinkContestRoom3/events.inc b/data/maps/LinkContestRoom3/events.inc new file mode 100644 index 000000000..8c93f28c9 --- /dev/null +++ b/data/maps/LinkContestRoom3/events.inc @@ -0,0 +1 @@ +LinkContestRoom3_MapEvents:: @ 8391604 diff --git a/data/maps/LinkContestRoom4/events.inc b/data/maps/LinkContestRoom4/events.inc new file mode 100644 index 000000000..a5e455811 --- /dev/null +++ b/data/maps/LinkContestRoom4/events.inc @@ -0,0 +1 @@ +LinkContestRoom4_MapEvents:: @ 8391604 diff --git a/data/maps/LinkContestRoom5/events.inc b/data/maps/LinkContestRoom5/events.inc new file mode 100644 index 000000000..f0f8fa508 --- /dev/null +++ b/data/maps/LinkContestRoom5/events.inc @@ -0,0 +1 @@ +LinkContestRoom5_MapEvents:: @ 8391604 diff --git a/data/maps/LinkContestRoom6/events.inc b/data/maps/LinkContestRoom6/events.inc new file mode 100644 index 000000000..a8fd4962f --- /dev/null +++ b/data/maps/LinkContestRoom6/events.inc @@ -0,0 +1 @@ +LinkContestRoom6_MapEvents:: @ 8391604 diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc new file mode 100644 index 000000000..b50dbc7e1 --- /dev/null +++ b/data/maps/LittlerootTown/events.inc @@ -0,0 +1,32 @@ +LittlerootTown_EventObjects:: @ 83808FC + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY + +LittlerootTown_MapWarps:: @ 838098C + 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:: @ 83809A4 + coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 + +LittlerootTown_MapBGEvents:: @ 8380A34 + bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 + bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF + bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808 + bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 + +LittlerootTown_MapEvents:: @ 8380A64 + map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc new file mode 100644 index 000000000..4ac7d4b3c --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -0,0 +1,17 @@ +LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 + object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT + +LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC + 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:: @ 8385704 + coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + +LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 + map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc new file mode 100644 index 000000000..2e4c4b6ae --- /dev/null +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -0,0 +1,27 @@ +LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS + +LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 + warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F + +LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 + bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E + bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867 + bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 + bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870 + +LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 + map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc new file mode 100644 index 000000000..353dc00a8 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -0,0 +1,17 @@ +LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS + object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 + object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT + +LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C + 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:: @ 8385954 + coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + +LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 + map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc new file mode 100644 index 000000000..98a144305 --- /dev/null +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -0,0 +1,28 @@ +LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL + +LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 + warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F + +LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 + bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 + bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867 + bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF + bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39 + +LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 + map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc new file mode 100644 index 000000000..bca8009b5 --- /dev/null +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -0,0 +1,28 @@ +LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB + +LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 + warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN + warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN + +LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 + bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + +LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 + map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc new file mode 100644 index 000000000..362d9b719 --- /dev/null +++ b/data/maps/MagmaHideout_1F/events.inc @@ -0,0 +1,11 @@ +MagmaHideout_1F_EventObjects:: @ 838E9BC + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, 50, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0 + +MagmaHideout_1F_MapWarps:: @ 838EA04 + warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY + warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F + +MagmaHideout_1F_MapEvents:: @ 838EA14 + map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_B1F/events.inc b/data/maps/MagmaHideout_B1F/events.inc new file mode 100644 index 000000000..5e4c3a078 --- /dev/null +++ b/data/maps/MagmaHideout_B1F/events.inc @@ -0,0 +1,43 @@ +MagmaHideout_B1F_EventObjects:: @ 838EA28 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, 9, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, 23, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0 + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, 27, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT + +MagmaHideout_B1F_MapWarps:: @ 838EAE8 + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F + warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F + warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F + warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F + warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F + warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F + warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F + warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F + warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F + warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F + warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F + warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F + warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F + warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F + warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F + warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F + warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F + +MagmaHideout_B1F_MapEvents:: @ 838EBD0 + map_events MagmaHideout_B1F_EventObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_B2F/events.inc b/data/maps/MagmaHideout_B2F/events.inc new file mode 100644 index 000000000..111b97e42 --- /dev/null +++ b/data/maps/MagmaHideout_B2F/events.inc @@ -0,0 +1,25 @@ +MagmaHideout_B2F_EventObjects:: @ 838EBE4 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, 10, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, 51, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, 9, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, 8, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1 + +MagmaHideout_B2F_MapWarps:: @ 838EC5C + warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F + warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F + warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F + warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F + warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F + warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F + +MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C + coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + +MagmaHideout_B2F_MapEvents:: @ 838ECDC + map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc new file mode 100644 index 000000000..6b26c7973 --- /dev/null +++ b/data/maps/MauvilleCity/events.inc @@ -0,0 +1,32 @@ +MauvilleCity_EventObjects:: @ 837FB90 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1 + +MauvilleCity_MapWarps:: @ 837FC68 + 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:: @ 837FCA0 + bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA + bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087 + bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 + bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 + bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA + bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E + bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090 + bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 + +MauvilleCity_MapEvents:: @ 837FD00 + map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc new file mode 100644 index 000000000..83b5f66d8 --- /dev/null +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -0,0 +1,14 @@ +MauvilleCity_BikeShop_EventObjects:: @ 8388318 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0 + +MauvilleCity_BikeShop_MapWarps:: @ 8388348 + warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY + +MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 + bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 + bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988 + +MauvilleCity_BikeShop_MapEvents:: @ 8388370 + map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc new file mode 100644 index 000000000..7b789a34e --- /dev/null +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -0,0 +1,46 @@ +MauvilleCity_GameCorner_EventObjects:: @ 83883C0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0 + +MauvilleCity_GameCorner_MapWarps:: @ 83884E0 + warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY + warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY + +MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 + bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 + bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155 + bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175 + bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195 + bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5 + bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5 + bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5 + bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215 + bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235 + bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255 + bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275 + bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295 + bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + +MauvilleCity_GameCorner_MapEvents:: @ 8388610 + map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc new file mode 100644 index 000000000..cfcbbc4c6 --- /dev/null +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -0,0 +1,23 @@ +MauvilleCity_Gym_EventObjects:: @ 838821C + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, 10, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0 + +MauvilleCity_Gym_MapWarps:: @ 83882AC + warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY + warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY + +MauvilleCity_Gym_MapCoordEvents:: @ 83882BC + coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 + +MauvilleCity_Gym_MapBGEvents:: @ 83882EC + bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 + bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771 + +MauvilleCity_Gym_MapEvents:: @ 8388304 + map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc new file mode 100644 index 000000000..07044121d --- /dev/null +++ b/data/maps/MauvilleCity_House1/events.inc @@ -0,0 +1,9 @@ +MauvilleCity_House1_EventObjects:: @ 8388384 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0 + +MauvilleCity_House1_MapWarps:: @ 838839C + warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY + +MauvilleCity_House1_MapEvents:: @ 83883AC + map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc new file mode 100644 index 000000000..58d8d5a24 --- /dev/null +++ b/data/maps/MauvilleCity_House2/events.inc @@ -0,0 +1,9 @@ +MauvilleCity_House2_EventObjects:: @ 8388624 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0 + +MauvilleCity_House2_MapWarps:: @ 838863C + warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY + warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY + +MauvilleCity_House2_MapEvents:: @ 838864C + map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc new file mode 100644 index 000000000..cb8397726 --- /dev/null +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -0,0 +1,11 @@ +MauvilleCity_Mart_EventObjects:: @ 83887A0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0 + +MauvilleCity_Mart_MapWarps:: @ 83887E8 + warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY + warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY + +MauvilleCity_Mart_MapEvents:: @ 83887F8 + map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..30f702a6f --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +MauvilleCity_PokemonCenter_1F_EventObjects:: @ 8388660 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0 + +MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 + 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:: @ 83886F0 + map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..aef1d63ed --- /dev/null +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -0,0 +1,15 @@ +MauvilleCity_PokemonCenter_2F_EventObjects:: @ 8388704 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, 5, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0 + +MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 + warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C + map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc new file mode 100644 index 000000000..0b85c4e98 --- /dev/null +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -0,0 +1,28 @@ +MeteorFalls_1F_1R_EventObjects:: @ 838BACC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F + object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS + +MeteorFalls_1F_1R_MapWarps:: @ 838BBBC + 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 + +MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 + coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + +MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 + bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 + bg_event 9, 58, 0, 0, 0, 0x0 + +MeteorFalls_1F_1R_MapEvents:: @ 838BC0C + 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_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc new file mode 100644 index 000000000..5264fcb5e --- /dev/null +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -0,0 +1,17 @@ +MeteorFalls_1F_2R_EventObjects:: @ 838BC20 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0 + +MeteorFalls_1F_2R_MapWarps:: @ 838BC68 + 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:: @ 838BC88 + bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 + bg_event 9, 58, 0, 0, 0, 0x0 + +MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 + map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc new file mode 100644 index 000000000..053c932ce --- /dev/null +++ b/data/maps/MeteorFalls_B1F_1R/events.inc @@ -0,0 +1,10 @@ +MeteorFalls_B1F_1R_MapWarps:: @ 838BCB4 + 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:: @ 838BCE4 + map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc new file mode 100644 index 000000000..964a6c447 --- /dev/null +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -0,0 +1,8 @@ +MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1 + +MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 + warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R + +MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 + map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc new file mode 100644 index 000000000..4803f9347 --- /dev/null +++ b/data/maps/MossdeepCity/events.inc @@ -0,0 +1,41 @@ +MossdeepCity_EventObjects:: @ 838042C + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0 + +MossdeepCity_MapWarps:: @ 8380504 + 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, 24, 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, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F + +MossdeepCity_MapCoordEvents:: @ 8380554 + coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + +MossdeepCity_MapBGEvents:: @ 8380594 + bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 + bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED + bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA + bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 + bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF + bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA + bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 + bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 + +MossdeepCity_MapEvents:: @ 83805F4 + map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc new file mode 100644 index 000000000..2d10740b1 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -0,0 +1,13 @@ +MossdeepCity_GameCorner_1F_EventObjects:: @ 838AC6C + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0 + +MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 + warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY + warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F + +MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C + bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C + +MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 + map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc new file mode 100644 index 000000000..da6316421 --- /dev/null +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -0,0 +1,8 @@ +MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + +MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 + warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F + +MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC + map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc new file mode 100644 index 000000000..7c7a25777 --- /dev/null +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -0,0 +1,28 @@ +MossdeepCity_Gym_EventObjects:: @ 838A660 + object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, 9, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, 10, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, 8, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, 10, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 + +MossdeepCity_Gym_MapWarps:: @ 838A738 + warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY + warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY + +MossdeepCity_Gym_MapCoordEvents:: @ 838A748 + coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 + +MossdeepCity_Gym_MapBGEvents:: @ 838A758 + bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA + bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646 + bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A + bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE + bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA + bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A + +MossdeepCity_Gym_MapEvents:: @ 838A7A0 + map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc new file mode 100644 index 000000000..2fe9e0373 --- /dev/null +++ b/data/maps/MossdeepCity_House1/events.inc @@ -0,0 +1,10 @@ +MossdeepCity_House1_EventObjects:: @ 838A7B4 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0 + +MossdeepCity_House1_MapWarps:: @ 838A7E4 + warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY + +MossdeepCity_House1_MapEvents:: @ 838A7F4 + map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc new file mode 100644 index 000000000..743350683 --- /dev/null +++ b/data/maps/MossdeepCity_House2/events.inc @@ -0,0 +1,11 @@ +MossdeepCity_House2_EventObjects:: @ 838A808 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE + +MossdeepCity_House2_MapWarps:: @ 838A850 + warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY + warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY + +MossdeepCity_House2_MapEvents:: @ 838A860 + map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc new file mode 100644 index 000000000..f601038e6 --- /dev/null +++ b/data/maps/MossdeepCity_House3/events.inc @@ -0,0 +1,9 @@ +MossdeepCity_House3_EventObjects:: @ 838AA08 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0 + +MossdeepCity_House3_MapWarps:: @ 838AA20 + warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY + +MossdeepCity_House3_MapEvents:: @ 838AA30 + map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc new file mode 100644 index 000000000..cfde3a35e --- /dev/null +++ b/data/maps/MossdeepCity_House4/events.inc @@ -0,0 +1,11 @@ +MossdeepCity_House4_EventObjects:: @ 838AAF8 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0 + +MossdeepCity_House4_MapWarps:: @ 838AB40 + warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY + warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY + +MossdeepCity_House4_MapEvents:: @ 838AB50 + map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc new file mode 100644 index 000000000..92f4a8cbd --- /dev/null +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -0,0 +1,12 @@ +MossdeepCity_Mart_EventObjects:: @ 838A984 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0 + +MossdeepCity_Mart_MapWarps:: @ 838A9E4 + warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY + +MossdeepCity_Mart_MapEvents:: @ 838A9F4 + map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..da310c9f7 --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +MossdeepCity_PokemonCenter_1F_EventObjects:: @ 838A874 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0 + +MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC + 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:: @ 838A8D4 + map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..4af09479f --- /dev/null +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -0,0 +1,15 @@ +MossdeepCity_PokemonCenter_2F_EventObjects:: @ 838A8E8 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, 5, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0 + +MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 + warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 + map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc new file mode 100644 index 000000000..85e716a93 --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -0,0 +1,14 @@ +MossdeepCity_SpaceCenter_1F_EventObjects:: @ 838AB64 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0 + +MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC + 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:: @ 838ABF4 + map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc new file mode 100644 index 000000000..faf5d89fa --- /dev/null +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -0,0 +1,10 @@ +MossdeepCity_SpaceCenter_2F_EventObjects:: @ 838AC08 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0 + +MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 + warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F + +MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 + map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc new file mode 100644 index 000000000..7a8fee393 --- /dev/null +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -0,0 +1,18 @@ +MossdeepCity_StevensHouse_EventObjects:: @ 838AA44 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER + +MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 + warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY + warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY + +MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 + bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + +MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 + map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc new file mode 100644 index 000000000..f011502f2 --- /dev/null +++ b/data/maps/MtChimney/events.inc @@ -0,0 +1,42 @@ +MtChimney_EventObjects:: @ 838C330 + object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE + +MtChimney_MapWarps:: @ 838C5D0 + 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:: @ 838C5F0 + bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D + bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA + +MtChimney_MapEvents:: @ 838C608 + map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc new file mode 100644 index 000000000..e5d69ee75 --- /dev/null +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -0,0 +1,10 @@ +MtChimney_CableCarStation_EventObjects:: @ 838B828 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + +MtChimney_CableCarStation_MapWarps:: @ 838B858 + warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY + warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY + +MtChimney_CableCarStation_MapEvents:: @ 838B868 + map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc new file mode 100644 index 000000000..f547a9a98 --- /dev/null +++ b/data/maps/MtPyre_1F/events.inc @@ -0,0 +1,15 @@ +MtPyre_1F_EventObjects:: @ 838C7FC + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0 + +MtPyre_1F_MapWarps:: @ 838C844 + 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:: @ 838C874 + map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc new file mode 100644 index 000000000..9f8041366 --- /dev/null +++ b/data/maps/MtPyre_2F/events.inc @@ -0,0 +1,17 @@ +MtPyre_2F_EventObjects:: @ 838C888 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0 + +MtPyre_2F_MapWarps:: @ 838C918 + 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:: @ 838C940 + map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc new file mode 100644 index 000000000..fbaf6fa4b --- /dev/null +++ b/data/maps/MtPyre_3F/events.inc @@ -0,0 +1,15 @@ +MtPyre_3F_EventObjects:: @ 838C954 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, 17, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 + +MtPyre_3F_MapWarps:: @ 838C99C + 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:: @ 838C9CC + map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc new file mode 100644 index 000000000..9de527f2d --- /dev/null +++ b/data/maps/MtPyre_4F/events.inc @@ -0,0 +1,14 @@ +MtPyre_4F_EventObjects:: @ 838C9E0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 + +MtPyre_4F_MapWarps:: @ 838CA10 + 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:: @ 838CA40 + map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc new file mode 100644 index 000000000..cbf1b64b4 --- /dev/null +++ b/data/maps/MtPyre_5F/events.inc @@ -0,0 +1,13 @@ +MtPyre_5F_EventObjects:: @ 838CA54 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1 + +MtPyre_5F_MapWarps:: @ 838CA84 + 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:: @ 838CAAC + map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc new file mode 100644 index 000000000..d65a3a8c6 --- /dev/null +++ b/data/maps/MtPyre_6F/events.inc @@ -0,0 +1,10 @@ +MtPyre_6F_EventObjects:: @ 838CAC0 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1 + +MtPyre_6F_MapWarps:: @ 838CAF0 + warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F + warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F + +MtPyre_6F_MapEvents:: @ 838CB00 + map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc new file mode 100644 index 000000000..48593481e --- /dev/null +++ b/data/maps/MtPyre_Exterior/events.inc @@ -0,0 +1,22 @@ +MtPyre_Exterior_EventObjects:: @ 838CB14 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2 + +MtPyre_Exterior_MapWarps:: @ 838CB44 + 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:: @ 838CB5C + coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + +MtPyre_Exterior_MapBGEvents:: @ 838CBAC + bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D + bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E + +MtPyre_Exterior_MapEvents:: @ 838CBC4 + map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc new file mode 100644 index 000000000..3ddc6f36b --- /dev/null +++ b/data/maps/MtPyre_Summit/events.inc @@ -0,0 +1,27 @@ +MtPyre_Summit_EventObjects:: @ 838CBD8 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0 + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + +MtPyre_Summit_MapWarps:: @ 838CC68 + 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:: @ 838CC80 + coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 + +MtPyre_Summit_MapBGEvents:: @ 838CCE0 + bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F + bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50 + +MtPyre_Summit_MapEvents:: @ 838CCF8 + map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc new file mode 100644 index 000000000..8967a1df0 --- /dev/null +++ b/data/maps/NewMauville_Entrance/events.inc @@ -0,0 +1,9 @@ +NewMauville_Entrance_MapWarps:: @ 838DED4 + warp_def 4, 6, 3, 0, MAP_ROUTE110 + warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE + +NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 + coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC + +NewMauville_Entrance_MapEvents:: @ 838DEF4 + map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc new file mode 100644 index 000000000..be85150e3 --- /dev/null +++ b/data/maps/NewMauville_Inside/events.inc @@ -0,0 +1,37 @@ +NewMauville_Inside_EventObjects:: @ 838DF08 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE + +NewMauville_Inside_MapWarps:: @ 838DFC8 + warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE + +NewMauville_Inside_MapCoordEvents:: @ 838DFD0 + coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 + +NewMauville_Inside_MapBGEvents:: @ 838E070 + bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + +NewMauville_Inside_MapEvents:: @ 838E0D0 + map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc new file mode 100644 index 000000000..ac50e1197 --- /dev/null +++ b/data/maps/OldaleTown/events.inc @@ -0,0 +1,27 @@ +OldaleTown_EventObjects:: @ 8380A78 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0 + object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN + +OldaleTown_MapWarps:: @ 8380AD8 + 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:: @ 8380AF8 + coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 + +OldaleTown_MapBGEvents:: @ 8380B38 + bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA + bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA + bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA + bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + +OldaleTown_MapEvents:: @ 8380B74 + map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc new file mode 100644 index 000000000..e037e3b0e --- /dev/null +++ b/data/maps/OldaleTown_House1/events.inc @@ -0,0 +1,9 @@ +OldaleTown_House1_EventObjects:: @ 8385C4C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0 + +OldaleTown_House1_MapWarps:: @ 8385C64 + warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN + warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN + +OldaleTown_House1_MapEvents:: @ 8385C74 + map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc new file mode 100644 index 000000000..0968fda57 --- /dev/null +++ b/data/maps/OldaleTown_House2/events.inc @@ -0,0 +1,10 @@ +OldaleTown_House2_EventObjects:: @ 8385C88 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0 + +OldaleTown_House2_MapWarps:: @ 8385CB8 + warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN + +OldaleTown_House2_MapEvents:: @ 8385CC8 + map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc new file mode 100644 index 000000000..9d0b70937 --- /dev/null +++ b/data/maps/OldaleTown_Mart/events.inc @@ -0,0 +1,11 @@ +OldaleTown_Mart_EventObjects:: @ 8385DEC + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0 + +OldaleTown_Mart_MapWarps:: @ 8385E34 + warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN + warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN + +OldaleTown_Mart_MapEvents:: @ 8385E44 + map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..89ad23d8f --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +OldaleTown_PokemonCenter_1F_EventObjects:: @ 8385CDC + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0 + +OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C + 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:: @ 8385D54 + map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..9af6ec676 --- /dev/null +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +OldaleTown_PokemonCenter_2F_EventObjects:: @ 8385D68 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0 + +OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 + warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 + map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc new file mode 100644 index 000000000..f8db75501 --- /dev/null +++ b/data/maps/PacifidlogTown/events.inc @@ -0,0 +1,20 @@ +PacifidlogTown_EventObjects:: @ 838100C + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0 + +PacifidlogTown_MapWarps:: @ 8381054 + 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:: @ 8381084 + bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B + bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + +PacifidlogTown_MapEvents:: @ 83810A8 + map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc new file mode 100644 index 000000000..95d0009d9 --- /dev/null +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -0,0 +1,10 @@ +PacifidlogTown_House1_EventObjects:: @ 8386F40 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0 + +PacifidlogTown_House1_MapWarps:: @ 8386F70 + warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN + +PacifidlogTown_House1_MapEvents:: @ 8386F80 + map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc new file mode 100644 index 000000000..00493650a --- /dev/null +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -0,0 +1,11 @@ +PacifidlogTown_House2_EventObjects:: @ 8386F94 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0 + +PacifidlogTown_House2_MapWarps:: @ 8386FDC + warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN + +PacifidlogTown_House2_MapEvents:: @ 8386FEC + map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc new file mode 100644 index 000000000..0f7bb798b --- /dev/null +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -0,0 +1,10 @@ +PacifidlogTown_House3_EventObjects:: @ 8387000 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0 + +PacifidlogTown_House3_MapWarps:: @ 8387030 + warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN + +PacifidlogTown_House3_MapEvents:: @ 8387040 + map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc new file mode 100644 index 000000000..e41a86e44 --- /dev/null +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -0,0 +1,11 @@ +PacifidlogTown_House4_EventObjects:: @ 8387054 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0 + +PacifidlogTown_House4_MapWarps:: @ 838709C + warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN + +PacifidlogTown_House4_MapEvents:: @ 83870AC + map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc new file mode 100644 index 000000000..bac0ca3e1 --- /dev/null +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -0,0 +1,10 @@ +PacifidlogTown_House5_EventObjects:: @ 83870C0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0 + +PacifidlogTown_House5_MapWarps:: @ 83870F0 + warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN + warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN + +PacifidlogTown_House5_MapEvents:: @ 8387100 + map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..05f1e9698 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +PacifidlogTown_PokemonCenter_1F_EventObjects:: @ 8386E30 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0 + +PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 + 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:: @ 8386EA8 + map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..8bc70f400 --- /dev/null +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +PacifidlogTown_PokemonCenter_2F_EventObjects:: @ 8386EBC + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0 + +PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 + warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C + map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc new file mode 100644 index 000000000..43216cdc9 --- /dev/null +++ b/data/maps/PetalburgCity/events.inc @@ -0,0 +1,37 @@ +PetalburgCity_EventObjects:: @ 837F5F0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0 + +PetalburgCity_MapWarps:: @ 837F6C8 + 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:: @ 837F6F8 + coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A + +PetalburgCity_MapBGEvents:: @ 837F738 + bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 + bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 + bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA + bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B + bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA + bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 + bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D + bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F + +PetalburgCity_MapEvents:: @ 837F798 + map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc new file mode 100644 index 000000000..b5dd1f57b --- /dev/null +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -0,0 +1,70 @@ +PetalburgCity_Gym_EventObjects:: @ 8387168 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM + +PetalburgCity_Gym_MapWarps:: @ 8387258 + 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:: @ 8387388 + bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 + bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3 + bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8 + bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B + bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E + bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91 + bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4 + bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7 + bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A + bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D + bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90 + bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3 + bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA + bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA + +PetalburgCity_Gym_MapEvents:: @ 8387430 + map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc new file mode 100644 index 000000000..df1970bd4 --- /dev/null +++ b/data/maps/PetalburgCity_House1/events.inc @@ -0,0 +1,10 @@ +PetalburgCity_House1_EventObjects:: @ 8387444 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0 + +PetalburgCity_House1_MapWarps:: @ 8387474 + warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY + warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY + +PetalburgCity_House1_MapEvents:: @ 8387484 + map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc new file mode 100644 index 000000000..b26cc139f --- /dev/null +++ b/data/maps/PetalburgCity_House2/events.inc @@ -0,0 +1,10 @@ +PetalburgCity_House2_EventObjects:: @ 8387498 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0 + +PetalburgCity_House2_MapWarps:: @ 83874C8 + warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY + +PetalburgCity_House2_MapEvents:: @ 83874D8 + map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc new file mode 100644 index 000000000..3171dca99 --- /dev/null +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -0,0 +1,12 @@ +PetalburgCity_Mart_EventObjects:: @ 8387614 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0 + +PetalburgCity_Mart_MapWarps:: @ 8387674 + warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY + +PetalburgCity_Mart_MapEvents:: @ 8387684 + map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..d4dc0c63e --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -0,0 +1,14 @@ +PetalburgCity_PokemonCenter_1F_EventObjects:: @ 83874EC + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0 + +PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 + 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:: @ 838757C + map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..365e3a258 --- /dev/null +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +PetalburgCity_PokemonCenter_2F_EventObjects:: @ 8387590 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0 + +PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 + warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 + map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc new file mode 100644 index 000000000..bc33ab969 --- /dev/null +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -0,0 +1,10 @@ +PetalburgCity_WallysHouse_EventObjects:: @ 8387114 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0 + +PetalburgCity_WallysHouse_MapWarps:: @ 8387144 + warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY + warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY + +PetalburgCity_WallysHouse_MapEvents:: @ 8387154 + map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc new file mode 100644 index 000000000..d624d94dc --- /dev/null +++ b/data/maps/PetalburgWoods/events.inc @@ -0,0 +1,37 @@ +PetalburgWoods_EventObjects:: @ 838C14C + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0 + +PetalburgWoods_MapWarps:: @ 838C284 + 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:: @ 838C2B4 + coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 + +PetalburgWoods_MapBGEvents:: @ 838C2D4 + bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 + bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A + bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B + bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C + bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D + bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E + +PetalburgWoods_MapEvents:: @ 838C31C + map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc new file mode 100644 index 000000000..e8c27a9c9 --- /dev/null +++ b/data/maps/RecordCorner/events.inc @@ -0,0 +1,17 @@ +RecordCorner_EventObjects:: @ 839139C + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0 + +RecordCorner_MapWarps:: @ 83913B4 + 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:: @ 83913D4 + coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 + +RecordCorner_MapEvents:: @ 8391414 + map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc new file mode 100644 index 000000000..933509835 --- /dev/null +++ b/data/maps/Route101/events.inc @@ -0,0 +1,24 @@ +Route101_EventObjects:: @ 83810BC + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA64, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG + object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 + +Route101_MapCoordEvents:: @ 838114C + coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 + coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 + coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE + coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 + +Route101_MapBGEvents:: @ 83811DC + bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 + +Route101_MapEvents:: @ 83811E8 + map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc new file mode 100644 index 000000000..4de0e95d2 --- /dev/null +++ b/data/maps/Route102/events.inc @@ -0,0 +1,17 @@ +Route102_EventObjects:: @ 83811FC + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_14EADA, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_14EB53, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 + +Route102_MapBGEvents:: @ 83812D4 + bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC + bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3 + +Route102_MapEvents:: @ 83812EC + map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc new file mode 100644 index 000000000..f131106da --- /dev/null +++ b/data/maps/Route103/events.inc @@ -0,0 +1,22 @@ +Route103_EventObjects:: @ 8381300 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_14ED82, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, 7, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, 18, 0, 0, 1, 3, Route103_EventScript_14ED94, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_14EE37, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_14ED79, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, 10, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 + +Route103_MapBGEvents:: @ 8381468 + bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B + +Route103_MapEvents:: @ 8381474 + map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc new file mode 100644 index 000000000..61934c590 --- /dev/null +++ b/data/maps/Route104/events.inc @@ -0,0 +1,58 @@ +Route104_EventObjects:: @ 8381488 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF42, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_14EF81, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F172, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, S_BerryTree, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, S_BerryTree, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, S_BerryTree, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, S_BerryTree, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F25A, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F279, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_14F21C, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_14F189, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_14EF93, 0 + +Route104_MapWarps:: @ 8381788 + 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_MapBGEvents:: @ 83817C8 + bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 + bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D + bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 + bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F + bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 + bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C + bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E + bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25 + bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_55 + bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58 + +Route104_MapEvents:: @ 8381840 + map_events Route104_EventObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc new file mode 100644 index 000000000..9ae66cabb --- /dev/null +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -0,0 +1,10 @@ +Route104_MrBrineysHouse_EventObjects:: @ 838B654 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE + +Route104_MrBrineysHouse_MapWarps:: @ 838B684 + warp_def 5, 8, 0, 0, MAP_ROUTE104 + warp_def 6, 8, 0, 0, MAP_ROUTE104 + +Route104_MrBrineysHouse_MapEvents:: @ 838B694 + map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc new file mode 100644 index 000000000..edf18089d --- /dev/null +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -0,0 +1,11 @@ +Route104_PrettyPetalFlowerShop_EventObjects:: @ 838B6A8 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0 + +Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 + warp_def 2, 8, 0, 1, MAP_ROUTE104 + warp_def 3, 8, 0, 1, MAP_ROUTE104 + +Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 + map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc new file mode 100644 index 000000000..2d7c90dc1 --- /dev/null +++ b/data/maps/Route104_Prototype/events.inc @@ -0,0 +1,23 @@ +Route104_Prototype_EventObjects:: @ 8391F2C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, 23, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, 8, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, 24, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, 8, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0 + object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 + object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, 7, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, 2, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0 + +Route104_Prototype_MapWarps:: @ 839204C + warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP + +Route104_Prototype_MapBGEvents:: @ 8392054 + bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C + bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25 + +Route104_Prototype_MapEvents:: @ 839206C + map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc new file mode 100644 index 000000000..89ceb8270 --- /dev/null +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -0,0 +1,9 @@ +Route104_PrototypePrettyPetalFlowerShop_EventObjects:: @ 8392080 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0 + +Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 + warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE + warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE + +Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 + map_events Route104_PrototypePrettyPetalFlowerShop_EventObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc new file mode 100644 index 000000000..999966093 --- /dev/null +++ b/data/maps/Route105/events.inc @@ -0,0 +1,16 @@ +Route105_EventObjects:: @ 8381854 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, 27, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, 25, 0, 7, 1, 3, Route105_EventScript_14F300, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_14F317, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, 13, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0 + +Route105_MapWarps:: @ 83818E4 + warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE + +Route105_MapBGEvents:: @ 83818EC + bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59 + +Route105_MapEvents:: @ 83818F8 + map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc new file mode 100644 index 000000000..55f395ded --- /dev/null +++ b/data/maps/Route106/events.inc @@ -0,0 +1,18 @@ +Route106_EventObjects:: @ 838190C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, 27, 4, 0, 1, 3, Route106_EventScript_14F338, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F34F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_14F366, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1 + +Route106_MapWarps:: @ 8381984 + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F + +Route106_MapBGEvents:: @ 838198C + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F + bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F + +Route106_MapEvents:: @ 83819BC + map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc new file mode 100644 index 000000000..9bdeaf3b0 --- /dev/null +++ b/data/maps/Route107/events.inc @@ -0,0 +1,10 @@ +Route107_EventObjects:: @ 83819D0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, 14, 0, 0, 1, 3, Route107_EventScript_14F411, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, 7, 0, 0, 1, 4, Route107_EventScript_14F428, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F43F, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F45A, 0 + +Route107_MapEvents:: @ 8381A60 + map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc new file mode 100644 index 000000000..997fb5ce2 --- /dev/null +++ b/data/maps/Route108/events.inc @@ -0,0 +1,14 @@ +Route108_EventObjects:: @ 8381A74 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_14F476, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, 13, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, 24, 0, 0, 1, 3, Route108_EventScript_14F48D, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, 51, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0 + +Route108_MapWarps:: @ 8381AD4 + warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK + +Route108_MapBGEvents:: @ 8381ADC + bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56 + +Route108_MapEvents:: @ 8381AE8 + map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc new file mode 100644 index 000000000..7376fd4bf --- /dev/null +++ b/data/maps/Route109/events.inc @@ -0,0 +1,37 @@ +Route109_EventObjects:: @ 8381AFC + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, 15, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, 8, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, 23, 0, 0, 1, 3, Route109_EventScript_14F809, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F847, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_14F705, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, 1, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_14F89C, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_14F885, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, 10, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, 10, 1, 1, 0, 0, Route109_EventScript_14F70E, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, 9, 1, 1, 0, 0, Route109_EventScript_14F725, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_14F776, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F77F, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F788, 0 + +Route109_MapWarps:: @ 8381CDC + warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE + +Route109_MapBGEvents:: @ 8381CE4 + bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B + bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 + bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32 + bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34 + bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33 + bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_40 + bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5A + bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B + +Route109_MapEvents:: @ 8381D44 + map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc new file mode 100644 index 000000000..f82513f08 --- /dev/null +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -0,0 +1,12 @@ +Route109_SeashoreHouse_EventObjects:: @ 83920BC + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0 + +Route109_SeashoreHouse_MapWarps:: @ 839211C + warp_def 6, 9, 0, 0, MAP_ROUTE109 + warp_def 7, 9, 0, 0, MAP_ROUTE109 + +Route109_SeashoreHouse_MapEvents:: @ 839212C + map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc new file mode 100644 index 000000000..eb032e0cc --- /dev/null +++ b/data/maps/Route110/events.inc @@ -0,0 +1,69 @@ +Route110_EventObjects:: @ 8381D58 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F99E, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_14FB28, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_14FB94, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, 23, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, 20, 0, 0, 1, 3, Route110_EventScript_14FABC, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, S_BerryTree, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, S_BerryTree, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_14FA53, 0 + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_14FB11, 0 + object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110 + object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_14FC10, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, 9, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0 + +Route110_MapWarps:: @ 8382040 + 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_NORTH_ENTRANCE + warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE + warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE + +Route110_MapCoordEvents:: @ 8382070 + coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 + coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 + coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 + +Route110_MapBGEvents:: @ 83820C0 + bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF + bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01 + bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6 + bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD + bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 + bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A + bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 + bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 + bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 + bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C + bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 + bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E + bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36 + bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35 + bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41 + bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37 + bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 + +Route110_MapEvents:: @ 838218C + map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc new file mode 100644 index 000000000..0474772cb --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -0,0 +1,15 @@ +Route110_SeasideCyclingRoadNorthEntrance_EventObjects:: @ 8392CAC + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0 + +Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 + 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_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 + map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc new file mode 100644 index 000000000..996562b61 --- /dev/null +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -0,0 +1,15 @@ +Route110_SeasideCyclingRoadSouthEntrance_EventObjects:: @ 8392C40 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0 + +Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 + 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_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 + coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 + map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc new file mode 100644 index 000000000..4b7e39efd --- /dev/null +++ b/data/maps/Route110_TrickHouseCorridor/events.inc @@ -0,0 +1,8 @@ +Route110_TrickHouseCorridor_MapWarps:: @ 8392228 + 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:: @ 8392248 + map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc new file mode 100644 index 000000000..732c6c705 --- /dev/null +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -0,0 +1,15 @@ +Route110_TrickHouseEnd_EventObjects:: @ 83921D0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END + +Route110_TrickHouseEnd_MapWarps:: @ 83921E8 + 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:: @ 83921F8 + coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + +Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 + bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 + +Route110_TrickHouseEnd_MapEvents:: @ 8392214 + map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc new file mode 100644 index 000000000..07c5a6555 --- /dev/null +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -0,0 +1,19 @@ +Route110_TrickHouseEntrance_EventObjects:: @ 8392140 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE + +Route110_TrickHouseEntrance_MapWarps:: @ 8392158 + 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:: @ 8392170 + coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + +Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 + bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A + +Route110_TrickHouseEntrance_MapEvents:: @ 83921BC + map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc new file mode 100644 index 000000000..ef5b7732f --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -0,0 +1,31 @@ +Route110_TrickHousePuzzle1_EventObjects:: @ 839225C + object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, 9, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D + object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F + +Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 + 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:: @ 839243C + bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 + +Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 + map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc new file mode 100644 index 000000000..c815a1624 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -0,0 +1,23 @@ +Route110_TrickHousePuzzle2_EventObjects:: @ 839245C + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 + +Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 + 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:: @ 83924EC + coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 + +Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C + bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 + +Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 + map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc new file mode 100644 index 000000000..e45f2d33b --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -0,0 +1,32 @@ +Route110_TrickHousePuzzle3_EventObjects:: @ 839254C + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + +Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 + 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:: @ 839266C + coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 + +Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC + bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB + +Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 + map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc new file mode 100644 index 000000000..4d7189920 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -0,0 +1,27 @@ +Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A + object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B + +Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 + 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:: @ 839287C + bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E + +Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 + map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc new file mode 100644 index 000000000..66884fc3d --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -0,0 +1,33 @@ +Route110_TrickHousePuzzle5_EventObjects:: @ 839289C + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0 + +Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 + 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:: @ 839292C + coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 + +Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C + bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 + +Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 + map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc new file mode 100644 index 000000000..6ac299c5f --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -0,0 +1,16 @@ +Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, 10, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 + +Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C + 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:: @ 8392AA4 + bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA + +Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 + map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc new file mode 100644 index 000000000..d57546ce1 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -0,0 +1,24 @@ +Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, 23, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 + +Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 + 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_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C + coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + +Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C + bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B + bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9 + bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317 + bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8 + bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346 + bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375 + +Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 + map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc new file mode 100644 index 000000000..481b2d926 --- /dev/null +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -0,0 +1,16 @@ +Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 + +Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 + 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:: @ 8392C20 + bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C + +Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C + map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc new file mode 100644 index 000000000..837c17c39 --- /dev/null +++ b/data/maps/Route111/events.inc @@ -0,0 +1,100 @@ +Route111_EventObjects:: @ 83821A0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1503BE, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_150395, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, 21, 0, 0, 1, 3, Route111_EventScript_1503A7, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_150403, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1503D5, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, 24, 0, 0, 1, 3, Route111_EventScript_1503EC, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1500C5, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, S_BerryTree, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, S_BerryTree, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_150458, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_150441, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_15046F, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, 7, 4, 0, 1, 4, Route111_EventScript_1504C4, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_150486, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN + object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL + object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL + object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_15039E, 0 + +Route111_MapWarps:: @ 8382500 + 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 + +Route111_MapCoordEvents:: @ 8382518 + coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 + coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 + coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + +Route111_MapBGEvents:: @ 8382738 + bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368 + bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F + bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 + bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A + 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, 0, 0, Route111_EventScript_150383 + 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_2 + bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 + bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C + 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_38 + bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39 + +Route111_MapEvents:: @ 8382804 + map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc new file mode 100644 index 000000000..da7f2f605 --- /dev/null +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -0,0 +1,9 @@ +Route111_OldLadysRestStop_EventObjects:: @ 838B798 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0 + +Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 + warp_def 3, 7, 0, 2, MAP_ROUTE111 + warp_def 4, 7, 0, 2, MAP_ROUTE111 + +Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 + map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc new file mode 100644 index 000000000..70d00eabc --- /dev/null +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -0,0 +1,12 @@ +Route111_WinstrateFamilysHouse_EventObjects:: @ 838B714 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0 + +Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 + warp_def 3, 7, 0, 0, MAP_ROUTE111 + warp_def 4, 7, 0, 0, MAP_ROUTE111 + +Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 + map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc new file mode 100644 index 000000000..e1673dc69 --- /dev/null +++ b/data/maps/Route112/events.inc @@ -0,0 +1,29 @@ +Route112_EventObjects:: @ 8382818 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, 8, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_150549, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_15059E, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1505B5, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, 16, 0, 0, 1, 4, Route112_EventScript_150560, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, 8, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_150540, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1 + +Route112_MapWarps:: @ 8382938 + 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:: @ 8382968 + bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E + bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525 + bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 + +Route112_MapEvents:: @ 838298C + map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc new file mode 100644 index 000000000..a2c93ca9d --- /dev/null +++ b/data/maps/Route112_CableCarStation/events.inc @@ -0,0 +1,10 @@ +Route112_CableCarStation_EventObjects:: @ 838B7D4 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + +Route112_CableCarStation_MapWarps:: @ 838B804 + warp_def 6, 11, 0, 0, MAP_ROUTE112 + warp_def 7, 11, 0, 1, MAP_ROUTE112 + +Route112_CableCarStation_MapEvents:: @ 838B814 + map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc new file mode 100644 index 000000000..3fd5ea281 --- /dev/null +++ b/data/maps/Route113/events.inc @@ -0,0 +1,48 @@ +Route113_EventObjects:: @ 83829A0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_15060E, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_150605, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_15063B, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_150652, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_150669, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506A7, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506E5, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_1506FC, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_150717, 0 + +Route113_MapWarps:: @ 8382AA8 + warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP + +Route113_MapCoordEvents:: @ 8382AB0 + 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 87, 9, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 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 88, 8, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 6, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH + +Route113_MapBGEvents:: @ 8382BE0 + bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 + bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 + bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 + bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 + bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 + bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 + bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E + +Route113_MapEvents:: @ 8382C34 + map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc new file mode 100644 index 000000000..24b90b2d7 --- /dev/null +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -0,0 +1,10 @@ +Route113_GlassWorkshop_EventObjects:: @ 8392D18 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0 + +Route113_GlassWorkshop_MapWarps:: @ 8392D48 + warp_def 3, 8, 0, 0, MAP_ROUTE113 + warp_def 4, 8, 0, 0, MAP_ROUTE113 + +Route113_GlassWorkshop_MapEvents:: @ 8392D58 + map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc new file mode 100644 index 000000000..eb05dd1ce --- /dev/null +++ b/data/maps/Route114/events.inc @@ -0,0 +1,46 @@ +Route114_EventObjects:: @ 8382C48 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1507F1, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 15, 0, 0, 1, 4, Route114_EventScript_150808, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_15081F, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_150836, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_15084D, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_150782, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1507C3, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_150733, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, 8, 0, 0, 1, 0, Route114_EventScript_1508E0, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1508C9, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_15088B, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_150912, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_1508F7, 0 + +Route114_MapWarps:: @ 8382E70 + 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 + +Route114_MapBGEvents:: @ 8382E88 + bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 + bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF + 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, 0, 0, Route114_EventScript_1507E8 + bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 + bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 + bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A + +Route114_MapEvents:: @ 8382F18 + map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc new file mode 100644 index 000000000..1f41db668 --- /dev/null +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -0,0 +1,16 @@ +Route114_FossilManiacsHouse_EventObjects:: @ 838B87C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0 + +Route114_FossilManiacsHouse_MapWarps:: @ 838B894 + 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:: @ 838B8AC + bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + +Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC + map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc new file mode 100644 index 000000000..13db6a8ca --- /dev/null +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -0,0 +1,9 @@ +Route114_FossilManiacsTunnel_EventObjects:: @ 838B8F0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0 + +Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 + warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE + +Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 + map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc new file mode 100644 index 000000000..86ebf06de --- /dev/null +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -0,0 +1,14 @@ +Route114_LanettesHouse_EventObjects:: @ 838B92C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE + +Route114_LanettesHouse_MapWarps:: @ 838B944 + warp_def 5, 7, 0, 2, MAP_ROUTE114 + warp_def 6, 7, 0, 2, MAP_ROUTE114 + +Route114_LanettesHouse_MapBGEvents:: @ 838B954 + bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 + bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + +Route114_LanettesHouse_MapEvents:: @ 838B978 + map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc new file mode 100644 index 000000000..e03d62fb4 --- /dev/null +++ b/data/maps/Route115/events.inc @@ -0,0 +1,39 @@ +Route115_EventObjects:: @ 8382F2C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_15092E, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_150949, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_15099E, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 69, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 70, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 71, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1509DC, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, 50, 3, 3, 1, 2, Route115_EventScript_150987, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, 14, 0, 0, 1, 3, Route115_EventScript_150A1A, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4 + +Route115_MapWarps:: @ 83830AC + warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R + +Route115_MapBGEvents:: @ 83830B4 + 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, 0, 0, Route115_EventScript_150937 + bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 + 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_61 + +Route115_MapEvents:: @ 838315C + map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc new file mode 100644 index 000000000..fd1b98f0a --- /dev/null +++ b/data/maps/Route116/events.inc @@ -0,0 +1,47 @@ +Route116_EventObjects:: @ 8383170 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_150C62, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_150C79, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, 13, 0, 0, 1, 2, Route116_EventScript_150CCE, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_150CE5, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, 8, 0, 0, 1, 2, Route116_EventScript_150CFC, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, 9, 0, 0, 1, 2, Route116_EventScript_150C90, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN + +Route116_MapWarps:: @ 8383380 + 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 + +Route116_MapCoordEvents:: @ 8383398 + coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E + +Route116_MapBGEvents:: @ 83833A8 + bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 + bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 + bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 + 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, 0, 0, Route116_EventScript_150B4B + bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 + 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_2D + bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES + +Route116_MapEvents:: @ 838342C + map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc new file mode 100644 index 000000000..454f184e3 --- /dev/null +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -0,0 +1,11 @@ +Route116_TunnelersRestHouse_EventObjects:: @ 838B98C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0 + +Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 + warp_def 4, 8, 0, 1, MAP_ROUTE116 + warp_def 5, 8, 0, 1, MAP_ROUTE116 + +Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 + map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc new file mode 100644 index 000000000..a668f4b32 --- /dev/null +++ b/data/maps/Route117/events.inc @@ -0,0 +1,34 @@ +Route117_EventObjects:: @ 8383440 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_150D57, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, 33, 2, 2, 0, 0, Route117_EventScript_150D60, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_1B222D, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, 28, 7, 0, 1, 4, Route117_EventScript_150E09, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 23, 0, 0, 1, 3, Route117_EventScript_150DCB, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, 18, 0, 0, 1, 3, Route117_EventScript_150D8D, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, 40, 4, 4, 1, 3, Route117_EventScript_150E47, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_150E85, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150EE2, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150E9C, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_150D69, 0 + +Route117_MapWarps:: @ 8383638 + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE + +Route117_MapBGEvents:: @ 8383640 + bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 + bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B + bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 + bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 + +Route117_MapEvents:: @ 8383670 + map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc new file mode 100644 index 000000000..3f2c3be51 --- /dev/null +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -0,0 +1,9 @@ +Route117_PokemonDayCare_EventObjects:: @ 838B9F8 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0 + +Route117_PokemonDayCare_MapWarps:: @ 838BA10 + warp_def 2, 8, 0, 0, MAP_ROUTE117 + warp_def 3, 8, 0, 0, MAP_ROUTE117 + +Route117_PokemonDayCare_MapEvents:: @ 838BA20 + map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc new file mode 100644 index 000000000..c12e77bd9 --- /dev/null +++ b/data/maps/Route118/events.inc @@ -0,0 +1,40 @@ +Route118_EventObjects:: @ 8383684 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_151139, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, 2, 1, 1, 0, 0, Route118_EventScript_150F93, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_150F34, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, 24, 0, 0, 1, 4, Route118_EventScript_15108F, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1510E4, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_151150, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1510CD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1510FB, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 + +Route118_MapCoordEvents:: @ 8383864 + coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 + +Route118_MapBGEvents:: @ 8383894 + bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 + bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C + bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 + 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_43 + bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42 + +Route118_MapEvents:: @ 8383900 + map_events Route118_EventObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc new file mode 100644 index 000000000..49677e8e5 --- /dev/null +++ b/data/maps/Route119/events.inc @@ -0,0 +1,94 @@ +Route119_EventObjects:: @ 8383914 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_151491, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_151463, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_15144C, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1514BF, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_151435, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1514FD, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_15147A, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1514A8, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, 57, 0, 0, 1, 2, Route119_EventScript_151569, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_151580, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_15153B, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, 8, 0, 0, 1, 3, Route119_EventScript_151552, 0 + object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1515F3, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, S_BerryTree, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, S_BerryTree, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, S_BerryTree, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, S_BerryTree, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_15141A, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1515FC, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_151597, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, 76, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1515AE, 0 + +Route119_MapWarps:: @ 8383C8C + warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F + warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE + +Route119_MapCoordEvents:: @ 8383C9C + coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 + coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE + 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 33, 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 34, 10, 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 + +Route119_MapBGEvents:: @ 8383E2C + bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C + bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 + 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_5 + bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6 + 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_44 + bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 + bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 + +Route119_MapEvents:: @ 8383F1C + map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc new file mode 100644 index 000000000..0b7bc6b70 --- /dev/null +++ b/data/maps/Route119_House/events.inc @@ -0,0 +1,15 @@ +Route119_House_EventObjects:: @ 8392F40 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0 + +Route119_House_MapWarps:: @ 8392FE8 + warp_def 3, 8, 0, 1, MAP_ROUTE119 + warp_def 4, 8, 0, 1, MAP_ROUTE119 + +Route119_House_MapEvents:: @ 8392FF8 + map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc new file mode 100644 index 000000000..0107020cd --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -0,0 +1,20 @@ +Route119_WeatherInstitute_1F_EventObjects:: @ 8392DC0 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0 + +Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 + 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:: @ 8392E50 + bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + +Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 + map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc new file mode 100644 index 000000000..62cb0391f --- /dev/null +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -0,0 +1,13 @@ +Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + +Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 + warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F + +Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C + map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc new file mode 100644 index 000000000..1c0444b22 --- /dev/null +++ b/data/maps/Route120/events.inc @@ -0,0 +1,86 @@ +Route120_EventObjects:: @ 8383F30 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1519B3, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1519CA, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_151A08, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_151A1F, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_151A36, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_151739, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, 15, 0, 0, 1, 4, Route120_EventScript_151A74, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_151A8B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_151AA2, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 17, 0, 0, 1, 3, Route120_EventScript_151AB9, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_151AD0, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_151AE7, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6 + +Route120_MapWarps:: @ 8384308 + warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB + warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB + +Route120_MapCoordEvents:: @ 8384318 + 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:: @ 8384448 + bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 + bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA + 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_47 + bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54 + bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45 + bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46 + bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 + +Route120_MapEvents:: @ 83844F0 + map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc new file mode 100644 index 000000000..7405af540 --- /dev/null +++ b/data/maps/Route121/events.inc @@ -0,0 +1,46 @@ +Route121_EventObjects:: @ 8384504 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_151B0A, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BDE, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BF9, 0 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_151B72, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 17, 0, 0, 1, 3, Route121_EventScript_151B89, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, 15, 0, 0, 1, 4, Route121_EventScript_151BC7, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_151C14, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 + +Route121_MapWarps:: @ 8384714 + warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE + +Route121_MapCoordEvents:: @ 838471C + coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + +Route121_MapBGEvents:: @ 838475C + bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 + 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, 0, 0, Route121_EventScript_151B1C + bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 + bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 + bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 + +Route121_MapEvents:: @ 83847C8 + map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc new file mode 100644 index 000000000..6ed6613ec --- /dev/null +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -0,0 +1,19 @@ +Route121_SafariZoneEntrance_EventObjects:: @ 838BA34 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + +Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C + warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST + warp_def 14, 13, 0, 0, MAP_ROUTE121 + warp_def 15, 13, 0, 0, MAP_ROUTE121 + +Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C + coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + +Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC + bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 + +Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 + map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc new file mode 100644 index 000000000..3bad2b895 --- /dev/null +++ b/data/maps/Route122/events.inc @@ -0,0 +1,5 @@ +Route122_MapWarps:: @ 83847DC + warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F + +Route122_MapEvents:: @ 83847E4 + map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc new file mode 100644 index 000000000..b25ec5c64 --- /dev/null +++ b/data/maps/Route123/events.inc @@ -0,0 +1,76 @@ +Route123_EventObjects:: @ 83847F8 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_151CD1, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_151CE8, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, S_BerryTree, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, S_BerryTree, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_151C5D, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, S_BerryTree, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, S_BerryTree, 0 + object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, S_BerryTree, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_151CFF, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151DAD, 0 + object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151D92, 0 + object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 6, Route123_EventScript_151D16, 0 + object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_151D54, 0 + object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, 1, 0, 0, 1, 3, Route123_EventScript_151DC8, 0 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3 + object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4 + +Route123_MapWarps:: @ 8384B28 + warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE + +Route123_MapCoordEvents:: @ 8384B30 + 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:: @ 8384C90 + bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF + 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, 0, 0, Route123_EventScript_151CB6 + bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 + bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 + bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 + bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 + bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A + +Route123_MapEvents:: @ 8384CFC + map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc new file mode 100644 index 000000000..ff950e5cb --- /dev/null +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -0,0 +1,10 @@ +Route123_BerryMastersHouse_EventObjects:: @ 8392D6C + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0 + +Route123_BerryMastersHouse_MapWarps:: @ 8392D9C + warp_def 3, 7, 0, 0, MAP_ROUTE123 + warp_def 4, 7, 0, 0, MAP_ROUTE123 + +Route123_BerryMastersHouse_MapEvents:: @ 8392DAC + map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc new file mode 100644 index 000000000..694718fb6 --- /dev/null +++ b/data/maps/Route124/events.inc @@ -0,0 +1,20 @@ +Route124_EventObjects:: @ 8384D10 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, 1, 5, 0, 1, 3, Route124_EventScript_151DF8, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, 52, 5, 3, 1, 3, Route124_EventScript_151E0F, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, 24, 0, 0, 1, 3, Route124_EventScript_151E26, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 6, 8, 1, 3, Route124_EventScript_151E64, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, 28, 7, 0, 1, 2, Route124_EventScript_151E7B, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151E92, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151ED8, 0 + +Route124_MapWarps:: @ 8384E00 + warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE + +Route124_MapBGEvents:: @ 8384E08 + bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF + +Route124_MapEvents:: @ 8384E14 + map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc new file mode 100644 index 000000000..e165c9da8 --- /dev/null +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -0,0 +1,12 @@ +Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0 + +Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 + warp_def 3, 8, 0, 0, MAP_ROUTE124 + warp_def 4, 8, 0, 0, MAP_ROUTE124 + +Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 + bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 + +Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 + map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc new file mode 100644 index 000000000..8ad4ce22a --- /dev/null +++ b/data/maps/Route125/events.inc @@ -0,0 +1,20 @@ +Route125_EventObjects:: @ 8384E28 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, 23, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, 10, 2, 5, 1, 2, Route125_EventScript_151F45, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, 28, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, 52, 9, 9, 1, 3, Route125_EventScript_151F73, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, 14, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 + +Route125_MapWarps:: @ 8384ED0 + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + +Route125_MapBGEvents:: @ 8384ED8 + 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:: @ 8384F08 + map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc new file mode 100644 index 000000000..f90152ea4 --- /dev/null +++ b/data/maps/Route126/events.inc @@ -0,0 +1,9 @@ +Route126_EventObjects:: @ 8384F1C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, 51, 10, 3, 1, 3, Route126_EventScript_15200E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, 28, 9, 0, 1, 3, Route126_EventScript_152025, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, 7, 0, 0, 1, 3, Route126_EventScript_15203C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, 24, 0, 0, 1, 3, Route126_EventScript_152053, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1 + +Route126_MapEvents:: @ 8384F94 + map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc new file mode 100644 index 000000000..66078b122 --- /dev/null +++ b/data/maps/Route127/events.inc @@ -0,0 +1,20 @@ +Route127_EventObjects:: @ 8384FA8 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, 14, 0, 0, 1, 2, Route127_EventScript_15207A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, 21, 0, 0, 1, 4, Route127_EventScript_152091, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, 7, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, 8, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, 24, 1, 1, 1, 2, Route127_EventScript_152104, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 + +Route127_MapBGEvents:: @ 8385080 + 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:: @ 83850BC + map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc new file mode 100644 index 000000000..9ea71c52e --- /dev/null +++ b/data/maps/Route128/events.inc @@ -0,0 +1,17 @@ +Route128_EventObjects:: @ 83850D0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, 48, 5, 5, 1, 3, Route128_EventScript_1522A4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, 28, 5, 0, 1, 7, Route128_EventScript_1522E2, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128 + object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128 + object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_15234E, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, 17, 1, 1, 1, 2, Route128_EventScript_152337, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_152320, 0 + +Route128_MapBGEvents:: @ 8385190 + bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C + bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5D + bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E + +Route128_MapEvents:: @ 83851B4 + map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc new file mode 100644 index 000000000..e86dd6ce0 --- /dev/null +++ b/data/maps/Route129/events.inc @@ -0,0 +1,8 @@ +Route129_EventObjects:: @ 83851C8 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, 50, 3, 4, 1, 3, Route129_EventScript_152366, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, 52, 5, 2, 1, 2, Route129_EventScript_15237D, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, 1, 1, 1, 1, 2, Route129_EventScript_1523AB, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 24, 1, 1, 1, 2, Route129_EventScript_152394, 0 + +Route129_MapEvents:: @ 8385228 + map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc new file mode 100644 index 000000000..f6770fa34 --- /dev/null +++ b/data/maps/Route130/events.inc @@ -0,0 +1,7 @@ +Route130_EventObjects:: @ 838523C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, 29, 3, 6, 1, 3, Route130_EventScript_152410, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, 13, 1, 1, 1, 3, Route130_EventScript_152427, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11 + +Route130_MapEvents:: @ 8385284 + map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc new file mode 100644 index 000000000..0d61e6f95 --- /dev/null +++ b/data/maps/Route131/events.inc @@ -0,0 +1,13 @@ +Route131_EventObjects:: @ 8385298 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, 29, 5, 7, 1, 3, Route131_EventScript_152452, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, 8, 0, 0, 1, 3, Route131_EventScript_152469, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, 7, 0, 0, 1, 4, Route131_EventScript_152480, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, 47, 1, 4, 1, 3, Route131_EventScript_152497, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524AE, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524C9, 0 + +Route131_MapWarps:: @ 8385328 + warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE + +Route131_MapEvents:: @ 8385330 + map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc new file mode 100644 index 000000000..167fbfd4b --- /dev/null +++ b/data/maps/Route132/events.inc @@ -0,0 +1,9 @@ +Route132_EventObjects:: @ 8385344 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, 46, 3, 3, 1, 2, Route132_EventScript_1524E5, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, 49, 4, 4, 1, 2, Route132_EventScript_1524FC, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, 10, 0, 0, 1, 4, Route132_EventScript_15252A, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, 8, 0, 0, 1, 1, Route132_EventScript_152513, 0 + +Route132_MapEvents:: @ 83853BC + map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc new file mode 100644 index 000000000..d71755575 --- /dev/null +++ b/data/maps/Route133/events.inc @@ -0,0 +1,11 @@ +Route133_EventObjects:: @ 83853D0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, 1, 0, 0, 1, 3, Route133_EventScript_152542, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152570, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152559, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, 13, 1, 1, 1, 1, Route133_EventScript_15259E, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, 10, 0, 0, 1, 4, Route133_EventScript_152587, 0 + +Route133_MapEvents:: @ 8385478 + map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc new file mode 100644 index 000000000..b167d48b1 --- /dev/null +++ b/data/maps/Route134/events.inc @@ -0,0 +1,9 @@ +Route134_EventObjects:: @ 838548C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1525C4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, 1, 0, 0, 1, 3, Route134_EventScript_1525DB, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 1, Route134_EventScript_152609, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, 18, 0, 0, 1, 2, Route134_EventScript_1525F2, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, 27, 10, 0, 1, 3, Route134_EventScript_152620, 0 + +Route134_MapEvents:: @ 8385504 + map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc new file mode 100644 index 000000000..bfc6cff77 --- /dev/null +++ b/data/maps/RustboroCity/events.inc @@ -0,0 +1,59 @@ +RustboroCity_EventObjects:: @ 837FD14 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0 + object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO + +RustboroCity_MapWarps:: @ 837FE64 + 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:: @ 837FEC4 + coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 + +RustboroCity_MapBGEvents:: @ 837FF94 + bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C + bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437 + bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 + bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA + bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E + bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 + bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA + bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413 + bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A + bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 + +RustboroCity_MapEvents:: @ 838000C + map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc new file mode 100644 index 000000000..6a96e223c --- /dev/null +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -0,0 +1,10 @@ +RustboroCity_CuttersHouse_EventObjects:: @ 8388D9C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0 + +RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC + warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY + +RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC + map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc new file mode 100644 index 000000000..5cfbd5134 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -0,0 +1,12 @@ +RustboroCity_DevonCorp_1F_EventObjects:: @ 838880C + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0 + +RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 + 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_MapEvents:: @ 838886C + map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc new file mode 100644 index 000000000..1babeffd7 --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -0,0 +1,13 @@ +RustboroCity_DevonCorp_2F_EventObjects:: @ 8388880 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0 + +RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 + 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:: @ 8388908 + map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc new file mode 100644 index 000000000..b77f343af --- /dev/null +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_3F_EventObjects:: @ 838891C + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 + +RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 + warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F + +RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C + bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + +RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 + map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc new file mode 100644 index 000000000..22a262f47 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -0,0 +1,11 @@ +RustboroCity_Flat1_1F_EventObjects:: @ 8388CB8 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0 + +RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 + 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:: @ 8388D00 + map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc new file mode 100644 index 000000000..e906fe011 --- /dev/null +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -0,0 +1,8 @@ +RustboroCity_Flat1_2F_EventObjects:: @ 8388D14 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0 + +RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C + warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F + +RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 + map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc new file mode 100644 index 000000000..76ed3f04e --- /dev/null +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -0,0 +1,11 @@ +RustboroCity_Flat2_1F_EventObjects:: @ 8388E44 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0 + +RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 + 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:: @ 8388E8C + map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc new file mode 100644 index 000000000..3f56e718c --- /dev/null +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -0,0 +1,10 @@ +RustboroCity_Flat2_2F_EventObjects:: @ 8388EA0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0 + +RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 + 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:: @ 8388EE0 + map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc new file mode 100644 index 000000000..ed3ef80e7 --- /dev/null +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -0,0 +1,9 @@ +RustboroCity_Flat2_3F_EventObjects:: @ 8388EF4 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0 + +RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 + warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F + +RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C + map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc new file mode 100644 index 000000000..97b5a6627 --- /dev/null +++ b/data/maps/RustboroCity_Gym/events.inc @@ -0,0 +1,16 @@ +RustboroCity_Gym_EventObjects:: @ 8388998 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, 10, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0 + +RustboroCity_Gym_MapWarps:: @ 83889F8 + warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY + warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY + +RustboroCity_Gym_MapBGEvents:: @ 8388A08 + bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD + bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD + +RustboroCity_Gym_MapEvents:: @ 8388A20 + map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc new file mode 100644 index 000000000..5a8023d2f --- /dev/null +++ b/data/maps/RustboroCity_House1/events.inc @@ -0,0 +1,10 @@ +RustboroCity_House1_EventObjects:: @ 8388D48 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0 + +RustboroCity_House1_MapWarps:: @ 8388D78 + warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY + warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY + +RustboroCity_House1_MapEvents:: @ 8388D88 + map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc new file mode 100644 index 000000000..4a7a60f12 --- /dev/null +++ b/data/maps/RustboroCity_House2/events.inc @@ -0,0 +1,10 @@ +RustboroCity_House2_EventObjects:: @ 8388DF0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0 + +RustboroCity_House2_MapWarps:: @ 8388E20 + warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY + +RustboroCity_House2_MapEvents:: @ 8388E30 + map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc new file mode 100644 index 000000000..bdd17333c --- /dev/null +++ b/data/maps/RustboroCity_House3/events.inc @@ -0,0 +1,11 @@ +RustboroCity_House3_EventObjects:: @ 8388F40 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0 + +RustboroCity_House3_MapWarps:: @ 8388F88 + warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY + warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY + +RustboroCity_House3_MapEvents:: @ 8388F98 + map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc new file mode 100644 index 000000000..b39aec815 --- /dev/null +++ b/data/maps/RustboroCity_Mart/events.inc @@ -0,0 +1,12 @@ +RustboroCity_Mart_EventObjects:: @ 8388C34 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0 + +RustboroCity_Mart_MapWarps:: @ 8388C94 + warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY + warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY + +RustboroCity_Mart_MapEvents:: @ 8388CA4 + map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..7173fb49c --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -0,0 +1,13 @@ +RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0 + +RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 + 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:: @ 8388B9C + map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..bf5737d14 --- /dev/null +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 + +RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 + warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 + map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc new file mode 100644 index 000000000..fc3f934fa --- /dev/null +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -0,0 +1,21 @@ +RustboroCity_PokemonSchool_EventObjects:: @ 8388A34 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0 + +RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 + warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY + warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY + +RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 + bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5 + +RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 + map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc new file mode 100644 index 000000000..9dda724af --- /dev/null +++ b/data/maps/RusturfTunnel/events.inc @@ -0,0 +1,26 @@ +RusturfTunnel_EventObjects:: @ 838BD2C + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL + +RusturfTunnel_MapWarps:: @ 838BE1C + 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:: @ 838BE34 + coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 + coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F + coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 + +RusturfTunnel_MapEvents:: @ 838BE84 + map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc new file mode 100644 index 000000000..0e034da5c --- /dev/null +++ b/data/maps/SSTidalCorridor/events.inc @@ -0,0 +1,33 @@ +SSTidalCorridor_EventObjects:: @ 83916F8 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + +SSTidalCorridor_MapWarps:: @ 8391758 + 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:: @ 83917A0 + bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2 + bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB + bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4 + bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD + +SSTidalCorridor_MapEvents:: @ 8391830 + map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc new file mode 100644 index 000000000..c9cbf6715 --- /dev/null +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -0,0 +1,12 @@ +SSTidalLowerDeck_EventObjects:: @ 8391844 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0 + +SSTidalLowerDeck_MapWarps:: @ 8391874 + warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR + +SSTidalLowerDeck_MapBGEvents:: @ 839187C + bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23 + +SSTidalLowerDeck_MapEvents:: @ 8391888 + map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc new file mode 100644 index 000000000..e86c60ed6 --- /dev/null +++ b/data/maps/SSTidalRooms/events.inc @@ -0,0 +1,30 @@ +SSTidalRooms_EventObjects:: @ 839189C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL + +SSTidalRooms_MapWarps:: @ 839195C + 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:: @ 83919BC + bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + +SSTidalRooms_MapEvents:: @ 83919D4 + map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc new file mode 100644 index 000000000..ed750532f --- /dev/null +++ b/data/maps/SafariZone_Northeast/events.inc @@ -0,0 +1,13 @@ +SafariZone_Northeast_EventObjects:: @ 8391A2C + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 + +SafariZone_Northeast_MapEvents:: @ 8391B04 + map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc new file mode 100644 index 000000000..18a6db38e --- /dev/null +++ b/data/maps/SafariZone_Northwest/events.inc @@ -0,0 +1,6 @@ +SafariZone_Northwest_EventObjects:: @ 83919E8 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 + +SafariZone_Northwest_MapEvents:: @ 8391A18 + map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc new file mode 100644 index 000000000..8ed841ff1 --- /dev/null +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -0,0 +1,11 @@ +SafariZone_RestHouse_EventObjects:: @ 8391EC0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0 + +SafariZone_RestHouse_MapWarps:: @ 8391F08 + warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST + +SafariZone_RestHouse_MapEvents:: @ 8391F18 + map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc new file mode 100644 index 000000000..a18b2b394 --- /dev/null +++ b/data/maps/SafariZone_Southeast/events.inc @@ -0,0 +1,11 @@ +SafariZone_Southeast_EventObjects:: @ 8391B70 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0 + +SafariZone_Southeast_MapWarps:: @ 8391BD0 + warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE + +SafariZone_Southeast_MapEvents:: @ 8391BD8 + map_events SafariZone_Southeast_EventObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc new file mode 100644 index 000000000..909997d64 --- /dev/null +++ b/data/maps/SafariZone_Southwest/events.inc @@ -0,0 +1,12 @@ +SafariZone_Southwest_EventObjects:: @ 8391B18 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST + +SafariZone_Southwest_MapWarps:: @ 8391B48 + warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE + +SafariZone_Southwest_MapBGEvents:: @ 8391B50 + bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D + +SafariZone_Southwest_MapEvents:: @ 8391B5C + map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc new file mode 100644 index 000000000..a90403222 --- /dev/null +++ b/data/maps/ScorchedSlab/events.inc @@ -0,0 +1,8 @@ +ScorchedSlab_EventObjects:: @ 838E988 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1 + +ScorchedSlab_MapWarps:: @ 838E9A0 + warp_def 7, 16, 1, 1, MAP_ROUTE120 + +ScorchedSlab_MapEvents:: @ 838E9A8 + map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc new file mode 100644 index 000000000..4f6fa0c07 --- /dev/null +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -0,0 +1,6 @@ +SeafloorCavern_Entrance_MapWarps:: @ 838D094 + warp_def 10, 18, 3, 0, MAP_UNDERWATER4 + warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 + +SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 + map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc new file mode 100644 index 000000000..cb6442135 --- /dev/null +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -0,0 +1,14 @@ +SeafloorCavern_Room1_EventObjects:: @ 838D0B8 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + +SeafloorCavern_Room1_MapWarps:: @ 838D130 + 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:: @ 838D148 + map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc new file mode 100644 index 000000000..eefcffd2e --- /dev/null +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -0,0 +1,19 @@ +SeafloorCavern_Room2_EventObjects:: @ 838D15C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + +SeafloorCavern_Room2_MapWarps:: @ 838D234 + warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 + warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 + warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 + +SeafloorCavern_Room2_MapEvents:: @ 838D254 + map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc new file mode 100644 index 000000000..5f8f769d3 --- /dev/null +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -0,0 +1,19 @@ +SeafloorCavern_Room3_EventObjects:: @ 838D268 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + +SeafloorCavern_Room3_MapWarps:: @ 838D358 + warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 + warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 + warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 + +SeafloorCavern_Room3_MapEvents:: @ 838D370 + map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc new file mode 100644 index 000000000..a31f0f5d8 --- /dev/null +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -0,0 +1,11 @@ +SeafloorCavern_Room4_EventObjects:: @ 838D384 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, 23, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + +SeafloorCavern_Room4_MapWarps:: @ 838D39C + 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:: @ 838D3BC + map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc new file mode 100644 index 000000000..767fa6dc1 --- /dev/null +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -0,0 +1,15 @@ +SeafloorCavern_Room5_EventObjects:: @ 838D3D0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + +SeafloorCavern_Room5_MapWarps:: @ 838D460 + 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:: @ 838D478 + map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc new file mode 100644 index 000000000..adf36455a --- /dev/null +++ b/data/maps/SeafloorCavern_Room6/events.inc @@ -0,0 +1,7 @@ +SeafloorCavern_Room6_MapWarps:: @ 838D48C + 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:: @ 838D4A4 + map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc new file mode 100644 index 000000000..616376e32 --- /dev/null +++ b/data/maps/SeafloorCavern_Room7/events.inc @@ -0,0 +1,6 @@ +SeafloorCavern_Room7_MapWarps:: @ 838D4B8 + warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 + warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 + +SeafloorCavern_Room7_MapEvents:: @ 838D4C8 + map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc new file mode 100644 index 000000000..450eb894a --- /dev/null +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -0,0 +1,20 @@ +SeafloorCavern_Room8_EventObjects:: @ 838D4DC + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C + +SeafloorCavern_Room8_MapWarps:: @ 838D5FC + warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 + warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 + +SeafloorCavern_Room8_MapEvents:: @ 838D60C + map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc new file mode 100644 index 000000000..f4efdbcc0 --- /dev/null +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -0,0 +1,17 @@ +SeafloorCavern_Room9_EventObjects:: @ 838D620 + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1 + object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN + +SeafloorCavern_Room9_MapWarps:: @ 838D6C8 + warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 + +SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 + coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + +SeafloorCavern_Room9_MapEvents:: @ 838D6E0 + map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc new file mode 100644 index 000000000..a457a4e03 --- /dev/null +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -0,0 +1,16 @@ +SealedChamber_InnerRoom_MapWarps:: @ 838E900 + warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM + +SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 + bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F249 + bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F257 + bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F265 + bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F273 + bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F281 + bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F28F + bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + +SealedChamber_InnerRoom_MapEvents:: @ 838E974 + map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc new file mode 100644 index 000000000..634f41f60 --- /dev/null +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -0,0 +1,36 @@ +SealedChamber_OuterRoom_MapWarps:: @ 838E788 + warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM + +SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 + bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F18E + bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1AA + bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1B8 + bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + +SealedChamber_OuterRoom_MapEvents:: @ 838E8EC + map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc new file mode 100644 index 000000000..7f883e7e9 --- /dev/null +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -0,0 +1,22 @@ +SecretBase_BlueCave1_EventObjects:: @ 838F18C + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BlueCave1_MapWarps:: @ 838F2F4 + warp_def 5, 7, 0, 126, MAP_NONE + +SecretBase_BlueCave1_MapEvents:: @ 838F2FC + map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc new file mode 100644 index 000000000..93e7b67f8 --- /dev/null +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -0,0 +1,22 @@ +SecretBase_BlueCave2_EventObjects:: @ 838FAA4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BlueCave2_MapWarps:: @ 838FC0C + warp_def 7, 5, 0, 126, MAP_NONE + +SecretBase_BlueCave2_MapEvents:: @ 838FC14 + map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc new file mode 100644 index 000000000..bb761d2e8 --- /dev/null +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -0,0 +1,22 @@ +SecretBase_BlueCave3_EventObjects:: @ 83903BC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BlueCave3_MapWarps:: @ 8390524 + warp_def 4, 15, 0, 126, MAP_NONE + +SecretBase_BlueCave3_MapEvents:: @ 839052C + map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc new file mode 100644 index 000000000..082600bec --- /dev/null +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -0,0 +1,22 @@ +SecretBase_BlueCave4_EventObjects:: @ 8390CD4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BlueCave4_MapWarps:: @ 8390E3C + warp_def 4, 15, 0, 126, MAP_NONE + +SecretBase_BlueCave4_MapEvents:: @ 8390E44 + map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc new file mode 100644 index 000000000..c3219bf43 --- /dev/null +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -0,0 +1,22 @@ +SecretBase_BrownCave1_EventObjects:: @ 838F008 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BrownCave1_MapWarps:: @ 838F170 + warp_def 5, 7, 0, 126, MAP_NONE + +SecretBase_BrownCave1_MapEvents:: @ 838F178 + map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc new file mode 100644 index 000000000..e57348a00 --- /dev/null +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -0,0 +1,22 @@ +SecretBase_BrownCave2_EventObjects:: @ 838F920 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BrownCave2_MapWarps:: @ 838FA88 + warp_def 1, 7, 0, 126, MAP_NONE + +SecretBase_BrownCave2_MapEvents:: @ 838FA90 + map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc new file mode 100644 index 000000000..c1003816a --- /dev/null +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -0,0 +1,22 @@ +SecretBase_BrownCave3_EventObjects:: @ 8390238 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BrownCave3_MapWarps:: @ 83903A0 + warp_def 11, 9, 0, 126, MAP_NONE + +SecretBase_BrownCave3_MapEvents:: @ 83903A8 + map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc new file mode 100644 index 000000000..02afc20c4 --- /dev/null +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -0,0 +1,22 @@ +SecretBase_BrownCave4_EventObjects:: @ 8390B50 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_BrownCave4_MapWarps:: @ 8390CB8 + warp_def 2, 8, 0, 126, MAP_NONE + +SecretBase_BrownCave4_MapEvents:: @ 8390CC0 + map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc new file mode 100644 index 000000000..18fea4c40 --- /dev/null +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -0,0 +1,22 @@ +SecretBase_RedCave1_EventObjects:: @ 838EE84 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_RedCave1_MapWarps:: @ 838EFEC + warp_def 5, 7, 0, 126, MAP_NONE + +SecretBase_RedCave1_MapEvents:: @ 838EFF4 + map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc new file mode 100644 index 000000000..1d9bdde09 --- /dev/null +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -0,0 +1,22 @@ +SecretBase_RedCave2_EventObjects:: @ 838F79C + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_RedCave2_MapWarps:: @ 838F904 + warp_def 3, 14, 0, 126, MAP_NONE + +SecretBase_RedCave2_MapEvents:: @ 838F90C + map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc new file mode 100644 index 000000000..923616945 --- /dev/null +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -0,0 +1,22 @@ +SecretBase_RedCave3_EventObjects:: @ 83900B4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_RedCave3_MapWarps:: @ 839021C + warp_def 3, 6, 0, 126, MAP_NONE + +SecretBase_RedCave3_MapEvents:: @ 8390224 + map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc new file mode 100644 index 000000000..25a0f2ec6 --- /dev/null +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -0,0 +1,22 @@ +SecretBase_RedCave4_EventObjects:: @ 83909CC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_RedCave4_MapWarps:: @ 8390B34 + warp_def 2, 12, 0, 126, MAP_NONE + +SecretBase_RedCave4_MapEvents:: @ 8390B3C + map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc new file mode 100644 index 000000000..e1583e86d --- /dev/null +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -0,0 +1,22 @@ +SecretBase_Shrub1_EventObjects:: @ 838F618 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Shrub1_MapWarps:: @ 838F780 + warp_def 5, 7, 0, 126, MAP_NONE + +SecretBase_Shrub1_MapEvents:: @ 838F788 + map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc new file mode 100644 index 000000000..72bdcc380 --- /dev/null +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -0,0 +1,22 @@ +SecretBase_Shrub2_EventObjects:: @ 838FF30 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Shrub2_MapWarps:: @ 8390098 + warp_def 7, 5, 0, 126, MAP_NONE + +SecretBase_Shrub2_MapEvents:: @ 83900A0 + map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc new file mode 100644 index 000000000..b09c206e7 --- /dev/null +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -0,0 +1,22 @@ +SecretBase_Shrub3_EventObjects:: @ 8390848 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Shrub3_MapWarps:: @ 83909B0 + warp_def 6, 9, 0, 126, MAP_NONE + +SecretBase_Shrub3_MapEvents:: @ 83909B8 + map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc new file mode 100644 index 000000000..a9f636e54 --- /dev/null +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -0,0 +1,22 @@ +SecretBase_Shrub4_EventObjects:: @ 8391160 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Shrub4_MapWarps:: @ 83912C8 + warp_def 11, 8, 0, 126, MAP_NONE + +SecretBase_Shrub4_MapEvents:: @ 83912D0 + map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc new file mode 100644 index 000000000..467789f32 --- /dev/null +++ b/data/maps/SecretBase_Tree1/events.inc @@ -0,0 +1,22 @@ +SecretBase_Tree1_EventObjects:: @ 838F494 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Tree1_MapWarps:: @ 838F5FC + warp_def 5, 7, 0, 126, MAP_NONE + +SecretBase_Tree1_MapEvents:: @ 838F604 + map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc new file mode 100644 index 000000000..ef2280e01 --- /dev/null +++ b/data/maps/SecretBase_Tree2/events.inc @@ -0,0 +1,22 @@ +SecretBase_Tree2_EventObjects:: @ 838FDAC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Tree2_MapWarps:: @ 838FF14 + warp_def 3, 14, 0, 126, MAP_NONE + +SecretBase_Tree2_MapEvents:: @ 838FF1C + map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc new file mode 100644 index 000000000..25bc95466 --- /dev/null +++ b/data/maps/SecretBase_Tree3/events.inc @@ -0,0 +1,22 @@ +SecretBase_Tree3_EventObjects:: @ 83906C4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Tree3_MapWarps:: @ 839082C + warp_def 8, 6, 0, 126, MAP_NONE + +SecretBase_Tree3_MapEvents:: @ 8390834 + map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc new file mode 100644 index 000000000..6f0e5b3b5 --- /dev/null +++ b/data/maps/SecretBase_Tree4/events.inc @@ -0,0 +1,22 @@ +SecretBase_Tree4_EventObjects:: @ 8390FDC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_Tree4_MapWarps:: @ 8391144 + warp_def 7, 12, 0, 126, MAP_NONE + +SecretBase_Tree4_MapEvents:: @ 839114C + map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc new file mode 100644 index 000000000..930cbc21d --- /dev/null +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -0,0 +1,22 @@ +SecretBase_YellowCave1_EventObjects:: @ 838F310 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_YellowCave1_MapWarps:: @ 838F478 + warp_def 5, 7, 0, 126, MAP_NONE + +SecretBase_YellowCave1_MapEvents:: @ 838F480 + map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc new file mode 100644 index 000000000..fd3e265e5 --- /dev/null +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -0,0 +1,22 @@ +SecretBase_YellowCave2_EventObjects:: @ 838FC28 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_YellowCave2_MapWarps:: @ 838FD90 + warp_def 12, 7, 0, 126, MAP_NONE + +SecretBase_YellowCave2_MapEvents:: @ 838FD98 + map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc new file mode 100644 index 000000000..99f0ae8b4 --- /dev/null +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -0,0 +1,22 @@ +SecretBase_YellowCave3_EventObjects:: @ 8390540 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_YellowCave3_MapWarps:: @ 83906A8 + warp_def 5, 9, 0, 126, MAP_NONE + +SecretBase_YellowCave3_MapEvents:: @ 83906B0 + map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc new file mode 100644 index 000000000..af59e0067 --- /dev/null +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -0,0 +1,22 @@ +SecretBase_YellowCave4_EventObjects:: @ 8390E58 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + +SecretBase_YellowCave4_MapWarps:: @ 8390FC0 + warp_def 6, 12, 0, 126, MAP_NONE + +SecretBase_YellowCave4_MapEvents:: @ 8390FC8 + map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc new file mode 100644 index 000000000..c7225843f --- /dev/null +++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc @@ -0,0 +1,2 @@ +ShoalCave_HighTideEntranceRoom_MapEvents:: @ 838DEAC + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc new file mode 100644 index 000000000..e7951742a --- /dev/null +++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc @@ -0,0 +1,2 @@ +ShoalCave_HighTideInnerRoom_MapEvents:: @ 838DEC0 + map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc new file mode 100644 index 000000000..fe4a2eae9 --- /dev/null +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -0,0 +1,12 @@ +ShoalCave_LowTideEntranceRoom_EventObjects:: @ 838DCDC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0 + +ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C + 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:: @ 838DD2C + map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc new file mode 100644 index 000000000..87d291c40 --- /dev/null +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -0,0 +1,9 @@ +ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 + +ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 + warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM + +ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 + map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc new file mode 100644 index 000000000..746f36cdc --- /dev/null +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -0,0 +1,23 @@ +ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 + +ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 + 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:: @ 838DD98 + bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 + bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365 + bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257 + bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293 + bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 + bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 + +ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 + map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc new file mode 100644 index 000000000..6ff9a44b3 --- /dev/null +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -0,0 +1,15 @@ +ShoalCave_LowTideLowerRoom_EventObjects:: @ 838DE3C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0 + +ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C + 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:: @ 838DE8C + bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 + +ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 + map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc new file mode 100644 index 000000000..65570d256 --- /dev/null +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -0,0 +1,12 @@ +ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 + +ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C + 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:: @ 838DE1C + bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 + +ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 + map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc new file mode 100644 index 000000000..e6da2e027 --- /dev/null +++ b/data/maps/SingleBattleColosseum/events.inc @@ -0,0 +1,13 @@ +SingleBattleColosseum_EventObjects:: @ 83912E4 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0 + +SingleBattleColosseum_MapWarps:: @ 83912FC + warp_def 6, 8, 3, 127, MAP_NONE + warp_def 7, 8, 3, 127, MAP_NONE + +SingleBattleColosseum_MapCoordEvents:: @ 839130C + coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 + +SingleBattleColosseum_MapEvents:: @ 839132C + map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc new file mode 100644 index 000000000..2af7aaa76 --- /dev/null +++ b/data/maps/SkyPillar_1F/events.inc @@ -0,0 +1,7 @@ +SkyPillar_1F_MapWarps:: @ 838ED38 + 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:: @ 838ED50 + map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc new file mode 100644 index 000000000..48fcb9fec --- /dev/null +++ b/data/maps/SkyPillar_2F/events.inc @@ -0,0 +1,6 @@ +SkyPillar_2F_MapWarps:: @ 838ED64 + warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F + warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F + +SkyPillar_2F_MapEvents:: @ 838ED74 + map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc new file mode 100644 index 000000000..4aeda3339 --- /dev/null +++ b/data/maps/SkyPillar_3F/events.inc @@ -0,0 +1,7 @@ +SkyPillar_3F_MapWarps:: @ 838ED88 + 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:: @ 838EDA0 + map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc new file mode 100644 index 000000000..3e908ed74 --- /dev/null +++ b/data/maps/SkyPillar_4F/events.inc @@ -0,0 +1,7 @@ +SkyPillar_4F_MapWarps:: @ 838EDB4 + 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:: @ 838EDCC + map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc new file mode 100644 index 000000000..badae77af --- /dev/null +++ b/data/maps/SkyPillar_5F/events.inc @@ -0,0 +1,6 @@ +SkyPillar_5F_MapWarps:: @ 838EE2C + warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F + warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP + +SkyPillar_5F_MapEvents:: @ 838EE3C + map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc new file mode 100644 index 000000000..904b3b9ae --- /dev/null +++ b/data/maps/SkyPillar_Entrance/events.inc @@ -0,0 +1,6 @@ +SkyPillar_Entrance_MapWarps:: @ 838ECF0 + warp_def 6, 16, 3, 0, MAP_ROUTE131 + warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE + +SkyPillar_Entrance_MapEvents:: @ 838ED00 + map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc new file mode 100644 index 000000000..120cd982b --- /dev/null +++ b/data/maps/SkyPillar_Outside/events.inc @@ -0,0 +1,6 @@ +SkyPillar_Outside_MapWarps:: @ 838ED14 + warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE + warp_def 14, 5, 3, 0, MAP_SKY_PILLAR_1F + +SkyPillar_Outside_MapEvents:: @ 838ED24 + map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc new file mode 100644 index 000000000..9fc989c78 --- /dev/null +++ b/data/maps/SkyPillar_Top/events.inc @@ -0,0 +1,8 @@ +SkyPillar_Top_EventObjects:: @ 838EE50 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA + +SkyPillar_Top_MapWarps:: @ 838EE68 + warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F + +SkyPillar_Top_MapEvents:: @ 838EE70 + map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc new file mode 100644 index 000000000..685bc7359 --- /dev/null +++ b/data/maps/SlateportCity/events.inc @@ -0,0 +1,62 @@ +SlateportCity_EventObjects:: @ 837F7AC + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0 + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0 + object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0 + object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0 + object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0 + object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0 + object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0 + object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT + object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0 + object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT + +SlateportCity_MapWarps:: @ 837FA94 + 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_CONTEST_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_MapBGEvents:: @ 837FAEC + bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF + bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA + bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA + bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 + bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91 + bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 + bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88 + bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76 + bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F + bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D + bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33 + bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C + +SlateportCity_MapEvents:: @ 837FB7C + map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity_ContestHall/events.inc b/data/maps/SlateportCity_ContestHall/events.inc new file mode 100644 index 000000000..b2a57ccc9 --- /dev/null +++ b/data/maps/SlateportCity_ContestHall/events.inc @@ -0,0 +1,25 @@ +SlateportCity_ContestHall_EventObjects:: @ 83878A4 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, 2, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, 2, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0 + object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0 + object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0 + object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, 10, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, 9, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, 2, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0 + +SlateportCity_ContestHall_MapWarps:: @ 83879DC + warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY + warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY + +SlateportCity_ContestHall_MapBGEvents:: @ 83879EC + bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + +SlateportCity_ContestHall_MapEvents:: @ 8387A04 + map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents diff --git a/data/maps/SlateportCity_ContestLobby/events.inc b/data/maps/SlateportCity_ContestLobby/events.inc new file mode 100644 index 000000000..8981bf455 --- /dev/null +++ b/data/maps/SlateportCity_ContestLobby/events.inc @@ -0,0 +1,23 @@ +SlateportCity_ContestLobby_EventObjects:: @ 8387788 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, 3, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, 2, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0 + +SlateportCity_ContestLobby_MapWarps:: @ 8387848 + warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY + warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL + +SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 + bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 + bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E + bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F + bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D + +SlateportCity_ContestLobby_MapEvents:: @ 8387890 + map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc new file mode 100644 index 000000000..a7581ab2a --- /dev/null +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -0,0 +1,24 @@ +SlateportCity_Harbor_EventObjects:: @ 8387F30 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + +SlateportCity_Harbor_MapWarps:: @ 8387FF0 + 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:: @ 8388010 + coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF + +SlateportCity_Harbor_MapEvents:: @ 8388050 + map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc new file mode 100644 index 000000000..bc83e91ce --- /dev/null +++ b/data/maps/SlateportCity_House1/events.inc @@ -0,0 +1,9 @@ +SlateportCity_House1_EventObjects:: @ 8387A18 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0 + +SlateportCity_House1_MapWarps:: @ 8387A30 + warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY + +SlateportCity_House1_MapEvents:: @ 8387A40 + map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc new file mode 100644 index 000000000..d115e8225 --- /dev/null +++ b/data/maps/SlateportCity_House2/events.inc @@ -0,0 +1,10 @@ +SlateportCity_House2_EventObjects:: @ 8388064 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0 + +SlateportCity_House2_MapWarps:: @ 8388094 + warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY + +SlateportCity_House2_MapEvents:: @ 83880A4 + map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc new file mode 100644 index 000000000..abf6ebdce --- /dev/null +++ b/data/maps/SlateportCity_Mart/events.inc @@ -0,0 +1,11 @@ +SlateportCity_Mart_EventObjects:: @ 83881B0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0 + +SlateportCity_Mart_MapWarps:: @ 83881F8 + warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY + warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY + +SlateportCity_Mart_MapEvents:: @ 8388208 + map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc new file mode 100644 index 000000000..825c589de --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -0,0 +1,42 @@ +SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 + object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + +SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 + 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:: @ 8387CA0 + coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + +SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 + bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 + bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE + bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 + bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 + bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB + bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + +SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C + 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_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc new file mode 100644 index 000000000..bb52f2403 --- /dev/null +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -0,0 +1,37 @@ +SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + +SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 + warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F + +SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 + bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA + bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 + bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + +SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C + map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..d4d9ab405 --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +SlateportCity_PokemonCenter_1F_EventObjects:: @ 83880B8 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0 + +SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 + 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:: @ 8388118 + map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..df2da68bb --- /dev/null +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +SlateportCity_PokemonCenter_2F_EventObjects:: @ 838812C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0 + +SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 + warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C + map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc new file mode 100644 index 000000000..55b0a693d --- /dev/null +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -0,0 +1,16 @@ +SlateportCity_PokemonFanClub_EventObjects:: @ 8387A54 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0 + +SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 + warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY + warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY + +SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 + map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc new file mode 100644 index 000000000..cd5c7c25b --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -0,0 +1,13 @@ +SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + +SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 + 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:: @ 8387710 + map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc new file mode 100644 index 000000000..aa5c02e40 --- /dev/null +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -0,0 +1,10 @@ +SlateportCity_SternsShipyard_2F_EventObjects:: @ 8387724 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0 + +SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C + warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F + +SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 + map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc new file mode 100644 index 000000000..cb793ea47 --- /dev/null +++ b/data/maps/SootopolisCity/events.inc @@ -0,0 +1,40 @@ +SootopolisCity_EventObjects:: @ 8380608 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, 9, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + +SootopolisCity_MapWarps:: @ 8380710 + 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_HOUSE8 + +SootopolisCity_MapCoordEvents:: @ 8380770 + coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 + +SootopolisCity_MapBGEvents:: @ 8380780 + bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED + bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 + bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA + bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA + bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 + bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 + +SootopolisCity_MapEvents:: @ 83807C8 + map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc new file mode 100644 index 000000000..43cd0fe75 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -0,0 +1,15 @@ +SootopolisCity_Gym_1F_EventObjects:: @ 838ACF0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0 + +SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 + 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:: @ 838AD38 + bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 + bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3 + +SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 + map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc new file mode 100644 index 000000000..9ccf07ef6 --- /dev/null +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -0,0 +1,15 @@ +SootopolisCity_Gym_B1F_EventObjects:: @ 838AD64 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, 10, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, 10, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, 9, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 8, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0 + +SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 + warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F + +SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C + map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc new file mode 100644 index 000000000..a4b4c7932 --- /dev/null +++ b/data/maps/SootopolisCity_House1/events.inc @@ -0,0 +1,10 @@ +SootopolisCity_House1_EventObjects:: @ 838AFA4 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0 + +SootopolisCity_House1_MapWarps:: @ 838AFD4 + warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House1_MapEvents:: @ 838AFE4 + map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc new file mode 100644 index 000000000..146a1d871 --- /dev/null +++ b/data/maps/SootopolisCity_House2/events.inc @@ -0,0 +1,9 @@ +SootopolisCity_House2_EventObjects:: @ 838AFF8 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0 + +SootopolisCity_House2_MapWarps:: @ 838B010 + warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House2_MapEvents:: @ 838B020 + map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc new file mode 100644 index 000000000..d813189e8 --- /dev/null +++ b/data/maps/SootopolisCity_House3/events.inc @@ -0,0 +1,10 @@ +SootopolisCity_House3_EventObjects:: @ 838B034 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0 + +SootopolisCity_House3_MapWarps:: @ 838B064 + warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House3_MapEvents:: @ 838B074 + map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc new file mode 100644 index 000000000..128d0ff99 --- /dev/null +++ b/data/maps/SootopolisCity_House4/events.inc @@ -0,0 +1,11 @@ +SootopolisCity_House4_EventObjects:: @ 838B088 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0 + +SootopolisCity_House4_MapWarps:: @ 838B0D0 + warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House4_MapEvents:: @ 838B0E0 + map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc new file mode 100644 index 000000000..2217f3e0f --- /dev/null +++ b/data/maps/SootopolisCity_House5/events.inc @@ -0,0 +1,10 @@ +SootopolisCity_House5_EventObjects:: @ 838B0F4 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0 + +SootopolisCity_House5_MapWarps:: @ 838B124 + warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House5_MapEvents:: @ 838B134 + map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc new file mode 100644 index 000000000..a189b98ba --- /dev/null +++ b/data/maps/SootopolisCity_House6/events.inc @@ -0,0 +1,9 @@ +SootopolisCity_House6_EventObjects:: @ 838B148 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0 + +SootopolisCity_House6_MapWarps:: @ 838B160 + warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House6_MapEvents:: @ 838B170 + map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc new file mode 100644 index 000000000..39bc71e79 --- /dev/null +++ b/data/maps/SootopolisCity_House7/events.inc @@ -0,0 +1,10 @@ +SootopolisCity_House7_EventObjects:: @ 838B184 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0 + +SootopolisCity_House7_MapWarps:: @ 838B1B4 + warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House7_MapEvents:: @ 838B1C4 + map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House8/events.inc b/data/maps/SootopolisCity_House8/events.inc new file mode 100644 index 000000000..d6b139f34 --- /dev/null +++ b/data/maps/SootopolisCity_House8/events.inc @@ -0,0 +1,14 @@ +SootopolisCity_House8_EventObjects:: @ 838B1D8 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0 + +SootopolisCity_House8_MapWarps:: @ 838B208 + warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY + warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY + +SootopolisCity_House8_MapBGEvents:: @ 838B218 + bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 + bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531 + +SootopolisCity_House8_MapEvents:: @ 838B230 + map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc new file mode 100644 index 000000000..38d3f30f0 --- /dev/null +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -0,0 +1,11 @@ +SootopolisCity_Mart_EventObjects:: @ 838AF38 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0 + +SootopolisCity_Mart_MapWarps:: @ 838AF80 + warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY + warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY + +SootopolisCity_Mart_MapEvents:: @ 838AF90 + map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..8852ba87c --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +SootopolisCity_PokemonCenter_1F_EventObjects:: @ 838AE40 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0 + +SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 + 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:: @ 838AEA0 + map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..2b6b7a022 --- /dev/null +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +SootopolisCity_PokemonCenter_2F_EventObjects:: @ 838AEB4 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0 + +SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC + warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 + map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc new file mode 100644 index 000000000..38ff07de5 --- /dev/null +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -0,0 +1,13 @@ +SouthernIsland_Exterior_EventObjects:: @ 8391E00 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 + +SouthernIsland_Exterior_MapWarps:: @ 8391E30 + warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR + warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR + +SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 + bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A + +SouthernIsland_Exterior_MapEvents:: @ 8391E4C + map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc new file mode 100644 index 000000000..cba468ef7 --- /dev/null +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -0,0 +1,13 @@ +SouthernIsland_Interior_EventObjects:: @ 8391E60 + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + +SouthernIsland_Interior_MapWarps:: @ 8391E90 + warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR + warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR + +SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 + bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B + +SouthernIsland_Interior_MapEvents:: @ 8391EAC + map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc new file mode 100644 index 000000000..bb69d402e --- /dev/null +++ b/data/maps/TradeCenter/events.inc @@ -0,0 +1,13 @@ +TradeCenter_EventObjects:: @ 8391340 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0 + +TradeCenter_MapWarps:: @ 8391358 + warp_def 5, 8, 3, 127, MAP_NONE + warp_def 6, 8, 3, 127, MAP_NONE + +TradeCenter_MapCoordEvents:: @ 8391368 + coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA + +TradeCenter_MapEvents:: @ 8391388 + map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc new file mode 100644 index 000000000..12b3cf72b --- /dev/null +++ b/data/maps/Underwater1/events.inc @@ -0,0 +1,11 @@ +Underwater1_MapBGEvents:: @ 8385518 + bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_8 + bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_9 + bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_A + bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_B + bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_D + bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_24 + bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_26 + +Underwater1_MapEvents:: @ 838556C + map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc new file mode 100644 index 000000000..a628cf972 --- /dev/null +++ b/data/maps/Underwater2/events.inc @@ -0,0 +1,15 @@ +Underwater2_MapWarps:: @ 8385580 + warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY + +Underwater2_MapBGEvents:: @ 8385588 + bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_E + bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_F + bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_10 + bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_11 + bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_13 + bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_12 + bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_14 + bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_C + +Underwater2_MapEvents:: @ 83855E8 + map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc new file mode 100644 index 000000000..62518bafa --- /dev/null +++ b/data/maps/Underwater3/events.inc @@ -0,0 +1,8 @@ +Underwater3_MapBGEvents:: @ 83855FC + bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_15 + bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_16 + bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_17 + bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_18 + +Underwater3_MapEvents:: @ 838562C + map_events 0x0, 0x0, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc new file mode 100644 index 000000000..fad99382b --- /dev/null +++ b/data/maps/Underwater4/events.inc @@ -0,0 +1,9 @@ +Underwater4_MapWarps:: @ 8385640 + warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN + +Underwater4_MapBGEvents:: @ 8385648 + bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_19 + bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_1A + +Underwater4_MapEvents:: @ 8385660 + map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc new file mode 100644 index 000000000..6dc462c80 --- /dev/null +++ b/data/maps/Underwater_Route134/events.inc @@ -0,0 +1,5 @@ +Underwater_Route134_MapWarps:: @ 838E744 + warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER + +Underwater_Route134_MapEvents:: @ 838E74C + map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc new file mode 100644 index 000000000..3b1798716 --- /dev/null +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -0,0 +1,11 @@ +Underwater_SeafloorCavern_EventObjects:: @ 838D018 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + +Underwater_SeafloorCavern_MapWarps:: @ 838D078 + warp_def 6, 7, 0, 0, MAP_UNDERWATER4 + +Underwater_SeafloorCavern_MapEvents:: @ 838D080 + map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc new file mode 100644 index 000000000..ede501142 --- /dev/null +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -0,0 +1,8 @@ +Underwater_SealedChamber_MapWarps:: @ 838E760 + warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 + +Underwater_SealedChamber_MapBGEvents:: @ 838E768 + bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 + +Underwater_SealedChamber_MapEvents:: @ 838E774 + map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc new file mode 100644 index 000000000..f745dc557 --- /dev/null +++ b/data/maps/Underwater_SootopolisCity/events.inc @@ -0,0 +1,6 @@ +Underwater_SootopolisCity_MapWarps:: @ 838BE98 + warp_def 9, 8, 0, 0, MAP_UNDERWATER2 + warp_def 10, 8, 0, 0, MAP_UNDERWATER2 + +Underwater_SootopolisCity_MapEvents:: @ 838BEA8 + map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnknownMap_25_29/events.inc b/data/maps/UnknownMap_25_29/events.inc new file mode 100644 index 000000000..5f3412382 --- /dev/null +++ b/data/maps/UnknownMap_25_29/events.inc @@ -0,0 +1 @@ +UnknownMap_25_29_MapEvents:: @ 8391604 diff --git a/data/maps/UnknownMap_25_30/events.inc b/data/maps/UnknownMap_25_30/events.inc new file mode 100644 index 000000000..8ce359a0b --- /dev/null +++ b/data/maps/UnknownMap_25_30/events.inc @@ -0,0 +1 @@ +UnknownMap_25_30_MapEvents:: @ 8391604 diff --git a/data/maps/UnknownMap_25_31/events.inc b/data/maps/UnknownMap_25_31/events.inc new file mode 100644 index 000000000..f2eabe57f --- /dev/null +++ b/data/maps/UnknownMap_25_31/events.inc @@ -0,0 +1 @@ +UnknownMap_25_31_MapEvents:: @ 8391604 diff --git a/data/maps/UnknownMap_25_32/events.inc b/data/maps/UnknownMap_25_32/events.inc new file mode 100644 index 000000000..aa0435850 --- /dev/null +++ b/data/maps/UnknownMap_25_32/events.inc @@ -0,0 +1 @@ +UnknownMap_25_32_MapEvents:: @ 8391604 diff --git a/data/maps/UnknownMap_25_33/events.inc b/data/maps/UnknownMap_25_33/events.inc new file mode 100644 index 000000000..db91b6ef5 --- /dev/null +++ b/data/maps/UnknownMap_25_33/events.inc @@ -0,0 +1 @@ +UnknownMap_25_33_MapEvents:: @ 8391604 diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc new file mode 100644 index 000000000..7cca882bc --- /dev/null +++ b/data/maps/UnknownMap_25_34/events.inc @@ -0,0 +1,2 @@ +UnknownMap_25_34_MapEvents:: @ 8391604 + map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc new file mode 100644 index 000000000..920703b72 --- /dev/null +++ b/data/maps/VerdanturfTown/events.inc @@ -0,0 +1,27 @@ +VerdanturfTown_EventObjects:: @ 8380F00 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0 + +VerdanturfTown_MapWarps:: @ 8380F60 + warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_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:: @ 8380F98 + bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 + bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA + bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA + bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3 + bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 + bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA + bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC + bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 + +VerdanturfTown_MapEvents:: @ 8380FF8 + map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestHall/events.inc b/data/maps/VerdanturfTown_ContestHall/events.inc new file mode 100644 index 000000000..78224364f --- /dev/null +++ b/data/maps/VerdanturfTown_ContestHall/events.inc @@ -0,0 +1,15 @@ +VerdanturfTown_ContestHall_EventObjects:: @ 8386AEC + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, 2, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, 2, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, 2, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0 + +VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 + warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY + +VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 + bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + +VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C + map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestLobby/events.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc new file mode 100644 index 000000000..3ab316792 --- /dev/null +++ b/data/maps/VerdanturfTown_ContestLobby/events.inc @@ -0,0 +1,21 @@ +VerdanturfTown_ContestLobby_EventObjects:: @ 8386A00 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, 3, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0 + +VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 + warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN + warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL + +VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 + bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F + bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F + bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37 + bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89 + +VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 + map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc new file mode 100644 index 000000000..c03706d90 --- /dev/null +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -0,0 +1,10 @@ +VerdanturfTown_FriendshipRatersHouse_EventObjects:: @ 8386D88 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0 + +VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 + warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN + +VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 + map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc new file mode 100644 index 000000000..ca7d2a4dd --- /dev/null +++ b/data/maps/VerdanturfTown_House/events.inc @@ -0,0 +1,10 @@ +VerdanturfTown_House_EventObjects:: @ 8386DDC + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0 + +VerdanturfTown_House_MapWarps:: @ 8386E0C + warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN + warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN + +VerdanturfTown_House_MapEvents:: @ 8386E1C + map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc new file mode 100644 index 000000000..f4ca8b8f3 --- /dev/null +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -0,0 +1,12 @@ +VerdanturfTown_Mart_EventObjects:: @ 8386B70 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0 + +VerdanturfTown_Mart_MapWarps:: @ 8386BD0 + warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN + warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN + +VerdanturfTown_Mart_MapEvents:: @ 8386BE0 + map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc new file mode 100644 index 000000000..8cf8b1dab --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -0,0 +1,12 @@ +VerdanturfTown_PokemonCenter_1F_EventObjects:: @ 8386BF4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0 + +VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C + 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:: @ 8386C54 + map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc new file mode 100644 index 000000000..51fe22275 --- /dev/null +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -0,0 +1,14 @@ +VerdanturfTown_PokemonCenter_2F_EventObjects:: @ 8386C68 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0 + +VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 + warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F + warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM + warp_def 8, 1, 0, 0, MAP_TRADE_CENTER + warp_def 11, 1, 0, 0, MAP_RECORD_CORNER + warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM + +VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 + map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc new file mode 100644 index 000000000..709c5aeb6 --- /dev/null +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -0,0 +1,13 @@ +VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE + +VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 + warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN + warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN + +VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 + map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc new file mode 100644 index 000000000..916e9bfc2 --- /dev/null +++ b/data/maps/VictoryRoad_1F/events.inc @@ -0,0 +1,26 @@ +VictoryRoad_1F_EventObjects:: @ 838D8E4 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, 7, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + +VictoryRoad_1F_MapWarps:: @ 838D98C + 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:: @ 838D9B4 + coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF + +VictoryRoad_1F_MapBGEvents:: @ 838D9E4 + bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 + +VictoryRoad_1F_MapEvents:: @ 838D9F0 + map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc new file mode 100644 index 000000000..af5c86254 --- /dev/null +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -0,0 +1,32 @@ +VictoryRoad_B1F_EventObjects:: @ 838DA04 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2 + +VictoryRoad_B1F_MapWarps:: @ 838DBCC + 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:: @ 838DC04 + map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc new file mode 100644 index 000000000..b482e6f04 --- /dev/null +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -0,0 +1,19 @@ +VictoryRoad_B2F_EventObjects:: @ 838DC18 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1 + +VictoryRoad_B2F_MapWarps:: @ 838DC90 + 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:: @ 838DCB0 + bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_52 + bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53 + +VictoryRoad_B2F_MapEvents:: @ 838DCC8 + map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc deleted file mode 100644 index aec54aaab..000000000 --- a/data/maps/_assets.inc +++ /dev/null @@ -1,332 +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/UnreferencedMap/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/PokeMart/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/ContestLobby/layout.inc" - .include "data/layouts/ContestHall/layout.inc" - .include "data/layouts/LilycoveCity_House2/layout.inc" - .include "data/layouts/UnknownMap_082CF564/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_082D05D8/layout.inc" - .include "data/layouts/UnknownMap_082D05FC/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/LilycoveCity_EmptyMap/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_ShortCorridor/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_B1F/layout.inc" - .include "data/layouts/CaveOfOrigin_B2F/layout.inc" - .include "data/layouts/CaveOfOrigin_B3F/layout.inc" - .include "data/layouts/CaveOfOrigin_B4F/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_082E55C8/layout.inc" - .include "data/layouts/UnknownMap_082E55EC/layout.inc" - .include "data/layouts/UnknownMap_082E5610/layout.inc" - .include "data/layouts/UnknownMap_082E5634/layout.inc" - .include "data/layouts/UnknownMap_082E5658/layout.inc" - .include "data/layouts/UnknownMap_082E567C/layout.inc" - .include "data/layouts/UnknownMap_082E56A0/layout.inc" - .include "data/layouts/UnknownMap_082E56C4/layout.inc" - .include "data/layouts/UnknownMap_082E56E8/layout.inc" - .include "data/layouts/UnknownMap_082E570C/layout.inc" - .include "data/layouts/UnknownMap_082E5730/layout.inc" - .include "data/layouts/UnknownMap_082E5754/layout.inc" - .include "data/layouts/UnknownMap_082E5778/layout.inc" - .include "data/layouts/UnknownMap_082E579C/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_Northeast/layout.inc" - .include "data/layouts/SafariZone_Southwest/layout.inc" - .include "data/layouts/SafariZone_Southeast/layout.inc" - .include "data/layouts/UnknownMap_082EDF30/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_SeasideCyclingRoadEntrace/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/BattleTower_Lobby/layout.inc" - .include "data/layouts/BattleTower_Outside/layout.inc" - .include "data/layouts/BattleTower_Elevator/layout.inc" - .include "data/layouts/BattleTower_Corridor/layout.inc" - .include "data/layouts/BattleTower_BattleRoom/layout.inc" - .include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc" - .include "data/layouts/EverGrandeCity_PokemonLeague/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_House8/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_082FF894/layout.inc" - .include "data/layouts/RustboroCity_Flat1_1F/layout.inc" - .include "data/layouts/RustboroCity_Flat1_2F/layout.inc" - .include "data/layouts/EverGrandeCity_Corridor4/layout.inc" - .include "data/layouts/MagmaHideout_1F/layout.inc" - .include "data/layouts/MagmaHideout_B1F/layout.inc" - .include "data/layouts/MagmaHideout_B2F/layout.inc" - .include "data/layouts/UnknownMap_08302970/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_083041B4/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" diff --git a/data/maps/_groups.inc b/data/maps/_groups.inc deleted file mode 100644 index 478f03e86..000000000 --- a/data/maps/_groups.inc +++ /dev/null @@ -1,532 +0,0 @@ - .align 2 -gMapGroup0:: @ 8307F60 - .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 - - .align 2 -gMapGroup1:: @ 8308038 - .4byte LittlerootTown_BrendansHouse_1F - .4byte LittlerootTown_BrendansHouse_2F - .4byte LittlerootTown_MaysHouse_1F - .4byte LittlerootTown_MaysHouse_2F - .4byte LittlerootTown_ProfessorBirchsLab - - .align 2 -gMapGroup2:: @ 830804C - .4byte OldaleTown_House1 - .4byte OldaleTown_House2 - .4byte OldaleTown_PokemonCenter_1F - .4byte OldaleTown_PokemonCenter_2F - .4byte OldaleTown_Mart - - .align 2 -gMapGroup3:: @ 8308060 - .4byte DewfordTown_House1 - .4byte DewfordTown_PokemonCenter_1F - .4byte DewfordTown_PokemonCenter_2F - .4byte DewfordTown_Gym - .4byte DewfordTown_Hall - .4byte DewfordTown_House2 - - .align 2 -gMapGroup4:: @ 8308078 - .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 - - .align 2 -gMapGroup5:: @ 8308094 - .4byte FallarborTown_Mart - .4byte FallarborTown_ContestLobby - .4byte FallarborTown_ContestHall - .4byte FallarborTown_PokemonCenter_1F - .4byte FallarborTown_PokemonCenter_2F - .4byte FallarborTown_House1 - .4byte FallarborTown_House2 - - .align 2 -gMapGroup6:: @ 83080B0 - .4byte VerdanturfTown_ContestLobby - .4byte VerdanturfTown_ContestHall - .4byte VerdanturfTown_Mart - .4byte VerdanturfTown_PokemonCenter_1F - .4byte VerdanturfTown_PokemonCenter_2F - .4byte VerdanturfTown_WandasHouse - .4byte VerdanturfTown_FriendshipRatersHouse - .4byte VerdanturfTown_House - - .align 2 -gMapGroup7:: @ 83080D0 - .4byte PacifidlogTown_PokemonCenter_1F - .4byte PacifidlogTown_PokemonCenter_2F - .4byte PacifidlogTown_House1 - .4byte PacifidlogTown_House2 - .4byte PacifidlogTown_House3 - .4byte PacifidlogTown_House4 - .4byte PacifidlogTown_House5 - - .align 2 -gMapGroup8:: @ 83080EC - .4byte PetalburgCity_WallysHouse - .4byte PetalburgCity_Gym - .4byte PetalburgCity_House1 - .4byte PetalburgCity_House2 - .4byte PetalburgCity_PokemonCenter_1F - .4byte PetalburgCity_PokemonCenter_2F - .4byte PetalburgCity_Mart - - .align 2 -gMapGroup9:: @ 8308108 - .4byte SlateportCity_SternsShipyard_1F - .4byte SlateportCity_SternsShipyard_2F - .4byte SlateportCity_ContestLobby - .4byte SlateportCity_ContestHall - .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 - - .align 2 -gMapGroup10:: @ 830813C - .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 - - .align 2 -gMapGroup11:: @ 830815C - .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 - - .align 2 -gMapGroup12:: @ 83081A0 - .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 - - .align 2 -gMapGroup13:: @ 83081C8 - .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_EmptyMap - .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 - - .align 2 -gMapGroup14:: @ 8308228 - .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 - - .align 2 -gMapGroup15:: @ 830825C - .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_House8 - - .align 2 -gMapGroup16:: @ 8308290 - .4byte EverGrandeCity_SidneysRoom - .4byte EverGrandeCity_PhoebesRoom - .4byte EverGrandeCity_GlaciasRoom - .4byte EverGrandeCity_DrakesRoom - .4byte EverGrandeCity_ChampionsRoom - .4byte EverGrandeCity_Corridor1 - .4byte EverGrandeCity_Corridor2 - .4byte EverGrandeCity_Corridor3 - .4byte EverGrandeCity_Corridor4 - .4byte EverGrandeCity_Corridor5 - .4byte EverGrandeCity_PokemonLeague - .4byte EverGrandeCity_HallOfFame - .4byte EverGrandeCity_PokemonCenter_1F - .4byte EverGrandeCity_PokemonCenter_2F - - .align 2 -gMapGroup17:: @ 83082C8 - .4byte Route104_MrBrineysHouse - .4byte Route104_PrettyPetalFlowerShop - - .align 2 -gMapGroup18:: @ 83082D0 - .4byte Route111_WinstrateFamilysHouse - .4byte Route111_OldLadysRestStop - - .align 2 -gMapGroup19:: @ 83082D8 - .4byte Route112_CableCarStation - .4byte MtChimney_CableCarStation - - .align 2 -gMapGroup20:: @ 83082E0 - .4byte Route114_FossilManiacsHouse - .4byte Route114_FossilManiacsTunnel - .4byte Route114_LanettesHouse - - .align 2 -gMapGroup21:: @ 83082EC - .4byte Route116_TunnelersRestHouse - - .align 2 -gMapGroup22:: @ 83082F0 - .4byte Route117_PokemonDayCare - - .align 2 -gMapGroup23:: @ 83082F4 - .4byte Route121_SafariZoneEntrance - - .align 2 -gMapGroup24:: @ 83082F8 - .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_B1F - .4byte CaveOfOrigin_B2F - .4byte CaveOfOrigin_B3F - .4byte CaveOfOrigin_B4F - .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 MagmaHideout_1F - .4byte MagmaHideout_B1F - .4byte MagmaHideout_B2F - .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 - - .align 2 -gMapGroup25:: @ 8308450 - .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 - - .align 2 -gMapGroup26:: @ 8308500 - .4byte SafariZone_Northwest - .4byte SafariZone_Northeast - .4byte SafariZone_Southwest - .4byte SafariZone_Southeast - .4byte BattleTower_Outside - .4byte BattleTower_Lobby - .4byte BattleTower_Elevator - .4byte BattleTower_Corridor - .4byte BattleTower_BattleRoom - .4byte SouthernIsland_Exterior - .4byte SouthernIsland_Interior - .4byte SafariZone_RestHouse - - .align 2 -gMapGroup27:: @ 8308530 - .4byte Route104_Prototype - .4byte Route104_PrototypePrettyPetalFlowerShop - - .align 2 -gMapGroup28:: @ 8308538 - .4byte Route109_SeashoreHouse - - .align 2 -gMapGroup29:: @ 830853C - .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_SeasideCyclingRoadSouthEntrance - .4byte Route110_SeasideCyclingRoadNorthEntrance - - .align 2 -gMapGroup30:: @ 8308570 - .4byte Route113_GlassWorkshop - - .align 2 -gMapGroup31:: @ 8308574 - .4byte Route123_BerryMastersHouse - - .align 2 -gMapGroup32:: @ 8308578 - .4byte Route119_WeatherInstitute_1F - .4byte Route119_WeatherInstitute_2F - .4byte Route119_House - - .align 2 -gMapGroup33:: @ 8308584 - .4byte Route124_DivingTreasureHuntersHouse - - .align 2 -gMapGroups:: @ 8308588 - .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/attributes_table.inc b/data/maps/attributes_table.inc deleted file mode 100644 index b1a15d7ef..000000000 --- a/data/maps/attributes_table.inc +++ /dev/null @@ -1,334 +0,0 @@ - .align 2 -gMapAttributes:: @ 8304F18 - .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 UnreferencedMap_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 PokeMart_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 ContestLobby_Layout - .4byte ContestHall_Layout - .4byte LilycoveCity_House2_Layout - .4byte UnknownMap_082CF564_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_082D05D8_Layout - .4byte UnknownMap_082D05FC_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 LilycoveCity_EmptyMap_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_ShortCorridor_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_B1F_Layout - .4byte CaveOfOrigin_B2F_Layout - .4byte CaveOfOrigin_B3F_Layout - .4byte CaveOfOrigin_B4F_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_082E55C8_Layout @ unused maps - .4byte UnknownMap_082E55EC_Layout - .4byte UnknownMap_082E5610_Layout - .4byte UnknownMap_082E5634_Layout - .4byte UnknownMap_082E5658_Layout - .4byte UnknownMap_082E567C_Layout - .4byte UnknownMap_082E56A0_Layout - .4byte UnknownMap_082E56C4_Layout - .4byte UnknownMap_082E56E8_Layout - .4byte UnknownMap_082E570C_Layout - .4byte UnknownMap_082E5730_Layout - .4byte UnknownMap_082E5754_Layout - .4byte UnknownMap_082E5778_Layout - .4byte UnknownMap_082E579C_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_Northeast_Layout - .4byte SafariZone_Southwest_Layout - .4byte SafariZone_Southeast_Layout - .4byte UnknownMap_082EDF30_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_SeasideCyclingRoadEntrace_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 BattleTower_Lobby_Layout - .4byte BattleTower_Outside_Layout - .4byte BattleTower_Elevator_Layout - .4byte BattleTower_Corridor_Layout - .4byte BattleTower_BattleRoom_Layout - .4byte RustboroCity_DevonCorp_3F_Layout - .4byte EverGrandeCity_PokemonLeague_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_House8_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_082FF894_Layout - .4byte RustboroCity_Flat1_1F_Layout - .4byte RustboroCity_Flat1_2F_Layout - .4byte EverGrandeCity_Corridor4_Layout - .4byte MagmaHideout_1F_Layout - .4byte MagmaHideout_B1F_Layout - .4byte MagmaHideout_B2F_Layout - .4byte UnknownMap_08302970_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_083041B4_Layout - .4byte MossdeepCity_StevensHouse_Layout - .4byte ShoalCave_LowTideIceRoom_Layout - .4byte SafariZone_RestHouse_Layout - .4byte SkyPillar_5F_Layout - .4byte SkyPillar_Top_Layout diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc deleted file mode 100644 index 791ab9754..000000000 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ /dev/null @@ -1,10 +0,0 @@ -AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 - -AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C - warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK - -AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C - map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc deleted file mode 100644 index 82af88bce..000000000 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ /dev/null @@ -1,20 +0,0 @@ -AbandonedShip_Corridors_1F_EventObjects:: @ 838E120 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0 - -AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 - 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:: @ 838E1B0 - map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc deleted file mode 100644 index 35dc34437..000000000 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ /dev/null @@ -1,19 +0,0 @@ -AbandonedShip_Corridors_B1F_EventObjects:: @ 838E238 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0 - -AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 - 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:: @ 838E2A8 - bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 - -AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 - map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/events/AbandonedShip_Deck.inc deleted file mode 100644 index 15f54114b..000000000 --- a/data/maps/events/AbandonedShip_Deck.inc +++ /dev/null @@ -1,9 +0,0 @@ -AbandonedShip_Deck_MapWarps:: @ 838E0E4 - 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:: @ 838E10C - map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc deleted file mode 100644 index 97bdf37c5..000000000 --- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc +++ /dev/null @@ -1,16 +0,0 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC - 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:: @ 838E4FC - bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 - bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A - bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 - bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 - -AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C - map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc deleted file mode 100644 index 7c8135e89..000000000 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ /dev/null @@ -1,31 +0,0 @@ -AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 - -AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 - 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:: @ 838E5E8 - bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_1F - bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20 - bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21 - bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22 - bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - -AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 - map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc deleted file mode 100644 index e828890a5..000000000 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ /dev/null @@ -1,9 +0,0 @@ -AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 - -AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 - 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:: @ 838E3D4 - map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc deleted file mode 100644 index e29bd3b42..000000000 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 - -AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 - 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:: @ 838E448 - map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc deleted file mode 100644 index aa6eb759a..000000000 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 - -AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 - 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:: @ 838E374 - map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc deleted file mode 100644 index 6ffe06615..000000000 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 - -AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 - 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:: @ 838E224 - map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc deleted file mode 100644 index 405506b44..000000000 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 - -AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 - 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:: @ 838E310 - map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/events/AbandonedShip_Underwater1.inc deleted file mode 100644 index 17a89c2aa..000000000 --- a/data/maps/events/AbandonedShip_Underwater1.inc +++ /dev/null @@ -1,6 +0,0 @@ -AbandonedShip_Underwater1_MapWarps:: @ 838E388 - warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 - -AbandonedShip_Underwater1_MapEvents:: @ 838E398 - map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/events/AbandonedShip_Underwater2.inc deleted file mode 100644 index 6eb94059c..000000000 --- a/data/maps/events/AbandonedShip_Underwater2.inc +++ /dev/null @@ -1,5 +0,0 @@ -AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 - warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 - -AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 - map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc deleted file mode 100644 index 2699b9036..000000000 --- a/data/maps/events/AncientTomb.inc +++ /dev/null @@ -1,15 +0,0 @@ -AncientTomb_EventObjects:: @ 838E6DC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL - -AncientTomb_MapWarps:: @ 838E6F4 - 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:: @ 838E70C - bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 - -AncientTomb_MapEvents:: @ 838E730 - map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc deleted file mode 100644 index 3c87be0d7..000000000 --- a/data/maps/events/AquaHideout_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -AquaHideout_1F_EventObjects:: @ 838CD0C - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS - -AquaHideout_1F_MapWarps:: @ 838CD54 - 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:: @ 838CD6C - map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc deleted file mode 100644 index 0a53d4cf9..000000000 --- a/data/maps/events/AquaHideout_B1F.inc +++ /dev/null @@ -1,39 +0,0 @@ -AquaHideout_B1F_EventObjects:: @ 838CD80 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, 24, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, 27, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT - -AquaHideout_B1F_MapWarps:: @ 838CE40 - 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:: @ 838CF08 - map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc deleted file mode 100644 index 6eee30658..000000000 --- a/data/maps/events/AquaHideout_B2F.inc +++ /dev/null @@ -1,25 +0,0 @@ -AquaHideout_B2F_EventObjects:: @ 838CF1C - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, 7, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS - -AquaHideout_B2F_MapWarps:: @ 838CF94 - 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:: @ 838CFE4 - coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD - -AquaHideout_B2F_MapEvents:: @ 838D004 - map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc deleted file mode 100644 index a4bbe9849..000000000 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ /dev/null @@ -1,10 +0,0 @@ -BattleTower_BattleRoom_EventObjects:: @ 8391DAC - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 - -BattleTower_BattleRoom_MapWarps:: @ 8391DDC - warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY - warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY - -BattleTower_BattleRoom_MapEvents:: @ 8391DEC - map_events BattleTower_BattleRoom_EventObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/events/BattleTower_Corridor.inc deleted file mode 100644 index 1233ff32c..000000000 --- a/data/maps/events/BattleTower_Corridor.inc +++ /dev/null @@ -1,5 +0,0 @@ -BattleTower_Corridor_EventObjects:: @ 8391D80 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 - -BattleTower_Corridor_MapEvents:: @ 8391D98 - map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/events/BattleTower_Elevator.inc deleted file mode 100644 index 57434d3ac..000000000 --- a/data/maps/events/BattleTower_Elevator.inc +++ /dev/null @@ -1,5 +0,0 @@ -BattleTower_Elevator_EventObjects:: @ 8391D54 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 - -BattleTower_Elevator_MapEvents:: @ 8391D6C - map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc deleted file mode 100644 index ca33bdf95..000000000 --- a/data/maps/events/BattleTower_Lobby.inc +++ /dev/null @@ -1,18 +0,0 @@ -BattleTower_Lobby_EventObjects:: @ 8391C8C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, 1, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, 9, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - -BattleTower_Lobby_MapWarps:: @ 8391D1C - warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE - warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE - warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM - -BattleTower_Lobby_MapBGEvents:: @ 8391D34 - bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 - -BattleTower_Lobby_MapEvents:: @ 8391D40 - map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc deleted file mode 100644 index 2e02fcc1c..000000000 --- a/data/maps/events/BattleTower_Outside.inc +++ /dev/null @@ -1,15 +0,0 @@ -BattleTower_Outside_EventObjects:: @ 8391BEC - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0 - object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, 10, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, 7, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0 - -BattleTower_Outside_MapWarps:: @ 8391C64 - warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY - -BattleTower_Outside_MapBGEvents:: @ 8391C6C - bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A - -BattleTower_Outside_MapEvents:: @ 8391C78 - map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/events/CaveOfOrigin_1F.inc deleted file mode 100644 index b0d77795c..000000000 --- a/data/maps/events/CaveOfOrigin_1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -CaveOfOrigin_1F_MapWarps:: @ 838D718 - warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE - warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F - -CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 - coord_event 7, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - -CaveOfOrigin_1F_MapEvents:: @ 838D758 - map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc deleted file mode 100644 index a91ee50e4..000000000 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -CaveOfOrigin_B1F_MapWarps:: @ 838D76C - warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F - warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F - -CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C - coord_event 12, 15, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 16, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 17, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - -CaveOfOrigin_B1F_MapEvents:: @ 838D7AC - map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/events/CaveOfOrigin_B2F.inc deleted file mode 100644 index 5d03aaaa2..000000000 --- a/data/maps/events/CaveOfOrigin_B2F.inc +++ /dev/null @@ -1,11 +0,0 @@ -CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 - warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_B1F - warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F - -CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 - coord_event 10, 6, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 10, 5, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 14, 13, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB - -CaveOfOrigin_B2F_MapEvents:: @ 838D800 - map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc deleted file mode 100644 index dcf831a76..000000000 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ /dev/null @@ -1,14 +0,0 @@ -CaveOfOrigin_B3F_EventObjects:: @ 838D814 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, 1, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 - -CaveOfOrigin_B3F_MapWarps:: @ 838D82C - warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F - warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F - -CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C - coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF - coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB - coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB - -CaveOfOrigin_B3F_MapEvents:: @ 838D86C - map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc deleted file mode 100644 index faa146570..000000000 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ /dev/null @@ -1,13 +0,0 @@ -CaveOfOrigin_B4F_EventObjects:: @ 838D880 - object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN - -CaveOfOrigin_B4F_MapWarps:: @ 838D898 - warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F - -CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 - coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 - coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - -CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 - map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/events/CaveOfOrigin_Entrance.inc deleted file mode 100644 index cab14e4d7..000000000 --- a/data/maps/events/CaveOfOrigin_Entrance.inc +++ /dev/null @@ -1,6 +0,0 @@ -CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 - warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY - warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F - -CaveOfOrigin_Entrance_MapEvents:: @ 838D704 - map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc deleted file mode 100644 index b1d8690c1..000000000 --- a/data/maps/events/DesertRuins.inc +++ /dev/null @@ -1,15 +0,0 @@ -DesertRuins_EventObjects:: @ 838BEBC - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK - -DesertRuins_MapWarps:: @ 838BED4 - 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:: @ 838BEEC - bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 - -DesertRuins_MapEvents:: @ 838BF10 - map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc deleted file mode 100644 index 5cfb552ee..000000000 --- a/data/maps/events/DewfordTown.inc +++ /dev/null @@ -1,23 +0,0 @@ -DewfordTown_EventObjects:: @ 8380B88 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0 - -DewfordTown_MapWarps:: @ 8380C00 - 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:: @ 8380C28 - bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB - bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4 - bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD - -DewfordTown_MapEvents:: @ 8380C64 - map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc deleted file mode 100644 index 237748602..000000000 --- a/data/maps/events/DewfordTown_Gym.inc +++ /dev/null @@ -1,19 +0,0 @@ -DewfordTown_Gym_EventObjects:: @ 8385FBC - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0 - -DewfordTown_Gym_MapWarps:: @ 8386034 - warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN - warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN - -DewfordTown_Gym_MapBGEvents:: @ 8386044 - bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E - bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E - -DewfordTown_Gym_MapEvents:: @ 8386074 - map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc deleted file mode 100644 index 3eb9818fe..000000000 --- a/data/maps/events/DewfordTown_Hall.inc +++ /dev/null @@ -1,21 +0,0 @@ -DewfordTown_Hall_EventObjects:: @ 8386088 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL - -DewfordTown_Hall_MapWarps:: @ 8386160 - warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN - warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN - -DewfordTown_Hall_MapBGEvents:: @ 8386170 - bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 - bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363 - -DewfordTown_Hall_MapEvents:: @ 8386188 - map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc deleted file mode 100644 index 69fd54d9c..000000000 --- a/data/maps/events/DewfordTown_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -DewfordTown_House1_EventObjects:: @ 8385E58 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0 - -DewfordTown_House1_MapWarps:: @ 8385EA0 - warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN - warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN - -DewfordTown_House1_MapEvents:: @ 8385EB0 - map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc deleted file mode 100644 index f6858b846..000000000 --- a/data/maps/events/DewfordTown_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -DewfordTown_House2_EventObjects:: @ 838619C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0 - -DewfordTown_House2_MapWarps:: @ 83861CC - warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN - warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN - -DewfordTown_House2_MapEvents:: @ 83861DC - map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc deleted file mode 100644 index 97b0e761a..000000000 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -DewfordTown_PokemonCenter_1F_EventObjects:: @ 8385EC4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0 - -DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C - 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:: @ 8385F24 - map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc deleted file mode 100644 index 333823536..000000000 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -DewfordTown_PokemonCenter_2F_EventObjects:: @ 8385F38 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0 - -DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 - warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 - map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/events/DoubleBattleColosseum.inc deleted file mode 100644 index a04c7a3a9..000000000 --- a/data/maps/events/DoubleBattleColosseum.inc +++ /dev/null @@ -1,14 +0,0 @@ -DoubleBattleColosseum_MapWarps:: @ 8391428 - 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:: @ 8391448 - coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A4383 - coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 - coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A439E - coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 - -DoubleBattleColosseum_MapEvents:: @ 8391488 - map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/events/EverGrandeCity.inc deleted file mode 100644 index 0a619b93d..000000000 --- a/data/maps/events/EverGrandeCity.inc +++ /dev/null @@ -1,28 +0,0 @@ -EverGrandeCity_MapWarps:: @ 83807DC - warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE - 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:: @ 83807FC - coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - -EverGrandeCity_MapBGEvents:: @ 83808AC - bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 - bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA - bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_14D4EE - bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_14D4F7 - bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA - -EverGrandeCity_MapEvents:: @ 83808E8 - map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc deleted file mode 100644 index 832ddf206..000000000 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ /dev/null @@ -1,11 +0,0 @@ -EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM - -EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C - warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME - -EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C - map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/events/EverGrandeCity_Corridor1.inc deleted file mode 100644 index f3ec6727e..000000000 --- a/data/maps/events/EverGrandeCity_Corridor1.inc +++ /dev/null @@ -1,8 +0,0 @@ -EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 - 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_Corridor1_MapEvents:: @ 838B3C0 - map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/events/EverGrandeCity_Corridor2.inc deleted file mode 100644 index e9a9cdc4c..000000000 --- a/data/maps/events/EverGrandeCity_Corridor2.inc +++ /dev/null @@ -1,8 +0,0 @@ -EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 - 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_Corridor2_MapEvents:: @ 838B3F4 - map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/events/EverGrandeCity_Corridor3.inc deleted file mode 100644 index 98d5f7b81..000000000 --- a/data/maps/events/EverGrandeCity_Corridor3.inc +++ /dev/null @@ -1,8 +0,0 @@ -EverGrandeCity_Corridor3_MapWarps:: @ 838B408 - 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_Corridor3_MapEvents:: @ 838B428 - map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/events/EverGrandeCity_Corridor4.inc deleted file mode 100644 index cbcf9f77e..000000000 --- a/data/maps/events/EverGrandeCity_Corridor4.inc +++ /dev/null @@ -1,6 +0,0 @@ -EverGrandeCity_Corridor4_MapWarps:: @ 838B43C - 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_Corridor4_MapEvents:: @ 838B44C - map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/events/EverGrandeCity_Corridor5.inc deleted file mode 100644 index 5b77148ca..000000000 --- a/data/maps/events/EverGrandeCity_Corridor5.inc +++ /dev/null @@ -1,8 +0,0 @@ -EverGrandeCity_Corridor5_MapWarps:: @ 838B460 - warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE - warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM - warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE - warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE - -EverGrandeCity_Corridor5_MapEvents:: @ 838B480 - map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc deleted file mode 100644 index 6b69d45da..000000000 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_DrakesRoom_EventObjects:: @ 838B2F8 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0 - -EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 - -EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 - map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc deleted file mode 100644 index 8dba287fe..000000000 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_GlaciasRoom_EventObjects:: @ 838B2BC - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0 - -EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 - -EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 - map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc deleted file mode 100644 index f5a3f9137..000000000 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ /dev/null @@ -1,8 +0,0 @@ -EverGrandeCity_HallOfFame_EventObjects:: @ 838B528 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 - -EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 - warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM - -EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 - map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc deleted file mode 100644 index aa67e5912..000000000 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_PhoebesRoom_EventObjects:: @ 838B280 - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0 - -EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 - -EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 - map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc deleted file mode 100644 index ea1045d22..000000000 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects:: @ 838B55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0 - -EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 - 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:: @ 838B5BC - map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc deleted file mode 100644 index 36dfa01f7..000000000 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects:: @ 838B5D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0 - -EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 - warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 - map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc deleted file mode 100644 index 89c6973a5..000000000 --- a/data/maps/events/EverGrandeCity_PokemonLeague.inc +++ /dev/null @@ -1,14 +0,0 @@ -EverGrandeCity_PokemonLeague_EventObjects:: @ 838B494 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 - -EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 - 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_CORRIDOR5 - warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 - -EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 - map_events EverGrandeCity_PokemonLeague_EventObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc deleted file mode 100644 index 552981282..000000000 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ /dev/null @@ -1,9 +0,0 @@ -EverGrandeCity_SidneysRoom_EventObjects:: @ 838B244 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0 - -EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C - warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 - warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 - -EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C - map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc deleted file mode 100644 index 37308b07c..000000000 --- a/data/maps/events/FallarborTown.inc +++ /dev/null @@ -1,25 +0,0 @@ -FallarborTown_EventObjects:: @ 8380E04 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR - -FallarborTown_MapWarps:: @ 8380E64 - warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART - warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_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:: @ 8380E8C - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B - bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C - -FallarborTown_MapEvents:: @ 8380EEC - map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc deleted file mode 100644 index 9479c8db1..000000000 --- a/data/maps/events/FallarborTown_ContestHall.inc +++ /dev/null @@ -1,15 +0,0 @@ -FallarborTown_ContestHall_EventObjects:: @ 83867DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, 2, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, 2, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, 2, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0 - -FallarborTown_ContestHall_MapWarps:: @ 8386824 - warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY - warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY - -FallarborTown_ContestHall_MapBGEvents:: @ 8386834 - bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA - bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA - -FallarborTown_ContestHall_MapEvents:: @ 838684C - map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc deleted file mode 100644 index 47144a554..000000000 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ /dev/null @@ -1,21 +0,0 @@ -FallarborTown_ContestLobby_EventObjects:: @ 83866F0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, 5, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR - object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0 - -FallarborTown_ContestLobby_MapWarps:: @ 8386780 - warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN - warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN - warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL - -FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 - bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 - bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604 - bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB - bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2 - -FallarborTown_ContestLobby_MapEvents:: @ 83867C8 - map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc deleted file mode 100644 index fefaadc51..000000000 --- a/data/maps/events/FallarborTown_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -FallarborTown_House1_EventObjects:: @ 8386970 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0 - -FallarborTown_House1_MapWarps:: @ 83869A0 - warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN - warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN - -FallarborTown_House1_MapEvents:: @ 83869B0 - map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc deleted file mode 100644 index b873f95c8..000000000 --- a/data/maps/events/FallarborTown_House2.inc +++ /dev/null @@ -1,9 +0,0 @@ -FallarborTown_House2_EventObjects:: @ 83869C4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0 - -FallarborTown_House2_MapWarps:: @ 83869DC - warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN - -FallarborTown_House2_MapEvents:: @ 83869EC - map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc deleted file mode 100644 index bf3195eea..000000000 --- a/data/maps/events/FallarborTown_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -FallarborTown_Mart_EventObjects:: @ 838666C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0 - -FallarborTown_Mart_MapWarps:: @ 83866CC - warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN - warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN - -FallarborTown_Mart_MapEvents:: @ 83866DC - map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc deleted file mode 100644 index 06f8068c6..000000000 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR - -FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 - 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:: @ 83868D8 - map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc deleted file mode 100644 index 381051d01..000000000 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 - -FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 - warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 3, 0, MAP_TRADE_CENTER - warp_def 11, 1, 3, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C - map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc deleted file mode 100644 index faf6d5011..000000000 --- a/data/maps/events/FieryPath.inc +++ /dev/null @@ -1,16 +0,0 @@ -FieryPath_EventObjects:: @ 838C718 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2 - -FieryPath_MapWarps:: @ 838C7D8 - warp_def 26, 36, 3, 4, MAP_ROUTE112 - warp_def 26, 4, 3, 5, MAP_ROUTE112 - -FieryPath_MapEvents:: @ 838C7E8 - map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc deleted file mode 100644 index 485fd836f..000000000 --- a/data/maps/events/FortreeCity.inc +++ /dev/null @@ -1,30 +0,0 @@ -FortreeCity_EventObjects:: @ 8380020 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE - -FortreeCity_MapWarps:: @ 83800C8 - 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:: @ 8380110 - bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 - bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 - bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA - bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 - -FortreeCity_MapEvents:: @ 8380158 - map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc deleted file mode 100644 index 47e635fa8..000000000 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_DecorationShop_EventObjects:: @ 83893E0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0 - -FortreeCity_DecorationShop_MapWarps:: @ 8389440 - warp_def 3, 5, 0, 8, MAP_FORTREE_CITY - warp_def 4, 5, 0, 8, MAP_FORTREE_CITY - -FortreeCity_DecorationShop_MapEvents:: @ 8389450 - map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc deleted file mode 100644 index 9ff31951b..000000000 --- a/data/maps/events/FortreeCity_Gym.inc +++ /dev/null @@ -1,18 +0,0 @@ -FortreeCity_Gym_EventObjects:: @ 8389018 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, 7, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, 9, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, 8, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0 - -FortreeCity_Gym_MapWarps:: @ 83890A8 - warp_def 2, 24, 0, 2, MAP_FORTREE_CITY - warp_def 3, 24, 0, 2, MAP_FORTREE_CITY - -FortreeCity_Gym_MapBGEvents:: @ 83890B8 - bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD - bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED - -FortreeCity_Gym_MapEvents:: @ 83890D0 - map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc deleted file mode 100644 index 5e91f873e..000000000 --- a/data/maps/events/FortreeCity_House1.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House1_EventObjects:: @ 8388FAC - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0 - -FortreeCity_House1_MapWarps:: @ 8388FF4 - warp_def 3, 5, 0, 1, MAP_FORTREE_CITY - warp_def 4, 5, 0, 1, MAP_FORTREE_CITY - -FortreeCity_House1_MapEvents:: @ 8389004 - map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc deleted file mode 100644 index 41d8962fe..000000000 --- a/data/maps/events/FortreeCity_House2.inc +++ /dev/null @@ -1,9 +0,0 @@ -FortreeCity_House2_EventObjects:: @ 8389278 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0 - -FortreeCity_House2_MapWarps:: @ 8389290 - warp_def 3, 5, 0, 4, MAP_FORTREE_CITY - warp_def 4, 5, 0, 4, MAP_FORTREE_CITY - -FortreeCity_House2_MapEvents:: @ 83892A0 - map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc deleted file mode 100644 index e02749d0e..000000000 --- a/data/maps/events/FortreeCity_House3.inc +++ /dev/null @@ -1,10 +0,0 @@ -FortreeCity_House3_EventObjects:: @ 83892B4 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0 - -FortreeCity_House3_MapWarps:: @ 83892E4 - warp_def 3, 5, 0, 5, MAP_FORTREE_CITY - warp_def 4, 5, 0, 5, MAP_FORTREE_CITY - -FortreeCity_House3_MapEvents:: @ 83892F4 - map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc deleted file mode 100644 index 58285c7f4..000000000 --- a/data/maps/events/FortreeCity_House4.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House4_EventObjects:: @ 8389308 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE - -FortreeCity_House4_MapWarps:: @ 8389350 - warp_def 3, 5, 0, 6, MAP_FORTREE_CITY - warp_def 4, 5, 0, 6, MAP_FORTREE_CITY - -FortreeCity_House4_MapEvents:: @ 8389360 - map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc deleted file mode 100644 index 93447f739..000000000 --- a/data/maps/events/FortreeCity_House5.inc +++ /dev/null @@ -1,11 +0,0 @@ -FortreeCity_House5_EventObjects:: @ 8389374 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0 - -FortreeCity_House5_MapWarps:: @ 83893BC - warp_def 3, 5, 0, 7, MAP_FORTREE_CITY - warp_def 4, 5, 0, 7, MAP_FORTREE_CITY - -FortreeCity_House5_MapEvents:: @ 83893CC - map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc deleted file mode 100644 index a9c48da93..000000000 --- a/data/maps/events/FortreeCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -FortreeCity_Mart_EventObjects:: @ 83891F4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0 - -FortreeCity_Mart_MapWarps:: @ 8389254 - warp_def 3, 7, 0, 3, MAP_FORTREE_CITY - warp_def 4, 7, 0, 3, MAP_FORTREE_CITY - -FortreeCity_Mart_MapEvents:: @ 8389264 - map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc deleted file mode 100644 index dcf0e088a..000000000 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -FortreeCity_PokemonCenter_1F_EventObjects:: @ 83890E4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0 - -FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 - 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:: @ 838915C - map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc deleted file mode 100644 index 2e410c319..000000000 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -FortreeCity_PokemonCenter_2F_EventObjects:: @ 8389170 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0 - -FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 - warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 - map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc deleted file mode 100644 index 20ea8d4d5..000000000 --- a/data/maps/events/GraniteCave_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -GraniteCave_1F_EventObjects:: @ 838BF24 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1 - -GraniteCave_1F_MapWarps:: @ 838BF54 - 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:: @ 838BF74 - map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc deleted file mode 100644 index 3d148a922..000000000 --- a/data/maps/events/GraniteCave_B1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -GraniteCave_B1F_EventObjects:: @ 838BF88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1 - -GraniteCave_B1F_MapWarps:: @ 838BFA0 - 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:: @ 838BFD8 - map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc deleted file mode 100644 index e5c7b1768..000000000 --- a/data/maps/events/GraniteCave_B2F.inc +++ /dev/null @@ -1,24 +0,0 @@ -GraniteCave_B2F_EventObjects:: @ 838BFEC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17 - -GraniteCave_B2F_MapWarps:: @ 838C0C4 - 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:: @ 838C0EC - bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_30 - bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31 - -GraniteCave_B2F_MapEvents:: @ 838C104 - map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc deleted file mode 100644 index 9d8f4b2ba..000000000 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ /dev/null @@ -1,8 +0,0 @@ -GraniteCave_StevensRoom_EventObjects:: @ 838C118 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE - -GraniteCave_StevensRoom_MapWarps:: @ 838C130 - warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F - -GraniteCave_StevensRoom_MapEvents:: @ 838C138 - map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc deleted file mode 100644 index 3aa3036de..000000000 --- a/data/maps/events/InsideOfTruck.inc +++ /dev/null @@ -1,24 +0,0 @@ -InsideOfTruck_EventObjects:: @ 8391618 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - -InsideOfTruck_MapWarps:: @ 8391660 - 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:: @ 8391678 - coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - -InsideOfTruck_MapBGEvents:: @ 83916A8 - bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - -InsideOfTruck_MapEvents:: @ 83916E4 - map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc deleted file mode 100644 index 8c279596d..000000000 --- a/data/maps/events/IslandCave.inc +++ /dev/null @@ -1,15 +0,0 @@ -IslandCave_EventObjects:: @ 838E674 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE - -IslandCave_MapWarps:: @ 838E68C - 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:: @ 838E6A4 - bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C - -IslandCave_MapEvents:: @ 838E6C8 - map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc deleted file mode 100644 index 4b656e76e..000000000 --- a/data/maps/events/JaggedPass.inc +++ /dev/null @@ -1,25 +0,0 @@ -JaggedPass_EventObjects:: @ 838C61C - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, 8, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, 14, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, 15, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0 - -JaggedPass_MapWarps:: @ 838C67C - 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 - -JaggedPass_MapCoordEvents:: @ 838C69C - 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 - -JaggedPass_MapBGEvents:: @ 838C6EC - bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_4D - bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C - -JaggedPass_MapEvents:: @ 838C704 - map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc deleted file mode 100644 index 895c792f4..000000000 --- a/data/maps/events/LavaridgeTown.inc +++ /dev/null @@ -1,34 +0,0 @@ -LavaridgeTown_EventObjects:: @ 8380C78 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0 - object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2 - object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0 - -LavaridgeTown_MapWarps:: @ 8380D50 - 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:: @ 8380D80 - coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 - -LavaridgeTown_MapBGEvents:: @ 8380D90 - bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7 - bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5 - bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC - bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA - bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA - bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 - -LavaridgeTown_MapEvents:: @ 8380DF0 - map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc deleted file mode 100644 index ed3cc738f..000000000 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ /dev/null @@ -1,39 +0,0 @@ -LavaridgeTown_Gym_1F_EventObjects:: @ 838625C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0 - -LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 - warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN - warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F - warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F - -LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 - bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 - bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888 - -LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC - map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc deleted file mode 100644 index 9492194a8..000000000 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ /dev/null @@ -1,24 +0,0 @@ -LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 - warp_def 3, 21, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 9, 2, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 1, 14, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 1, 6, 3, 5, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 6, 20, 3, 7, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 23, 3, 8, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 17, 3, 9, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 17, 3, 10, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 11, 3, 11, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 12, 3, 12, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 9, 3, 13, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 0, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 6, 3, 15, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 4, 2, 3, 16, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 10, 18, 3, 17, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 10, 14, 3, 18, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 6, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 6, 2, 3, 20, MAP_LAVARIDGE_TOWN_GYM_1F - warp_def 10, 6, 3, 21, MAP_LAVARIDGE_TOWN_GYM_1F - -LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 - map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc deleted file mode 100644 index 0e2c546b6..000000000 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ /dev/null @@ -1,11 +0,0 @@ -LavaridgeTown_HerbShop_EventObjects:: @ 83861F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0 - -LavaridgeTown_HerbShop_MapWarps:: @ 8386238 - warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN - -LavaridgeTown_HerbShop_MapEvents:: @ 8386248 - map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc deleted file mode 100644 index 90e33480c..000000000 --- a/data/maps/events/LavaridgeTown_House.inc +++ /dev/null @@ -1,10 +0,0 @@ -LavaridgeTown_House_EventObjects:: @ 8386494 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0 - -LavaridgeTown_House_MapWarps:: @ 83864C4 - warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN - -LavaridgeTown_House_MapEvents:: @ 83864D4 - map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc deleted file mode 100644 index 2d365da54..000000000 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ /dev/null @@ -1,11 +0,0 @@ -LavaridgeTown_Mart_EventObjects:: @ 83864E8 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0 - -LavaridgeTown_Mart_MapWarps:: @ 8386530 - warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN - warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN - -LavaridgeTown_Mart_MapEvents:: @ 8386540 - map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc deleted file mode 100644 index 98f670755..000000000 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects:: @ 8386554 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0 - -LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 - 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:: @ 83865D4 - map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc deleted file mode 100644 index 370feb889..000000000 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects:: @ 83865E8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0 - -LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 - warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 - map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc deleted file mode 100644 index e2aa43d2d..000000000 --- a/data/maps/events/LilycoveCity.inc +++ /dev/null @@ -1,53 +0,0 @@ -LilycoveCity_EventObjects:: @ 838016C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0 - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1 - object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0 - object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART - -LilycoveCity_MapWarps:: @ 8380304 - 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 - warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F - -LilycoveCity_MapBGEvents:: @ 838037C - bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 - bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3 - bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67 - bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70 - bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79 - bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC - bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA - bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC - bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B - bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B - bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B - -LilycoveCity_MapEvents:: @ 8380418 - map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc deleted file mode 100644 index bc4331484..000000000 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ /dev/null @@ -1,50 +0,0 @@ -LilycoveCity_ContestHall_EventObjects:: @ 8389A18 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0 - -LilycoveCity_ContestHall_MapWarps:: @ 8389D18 - 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:: @ 8389D38 - bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 - bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 - -LilycoveCity_ContestHall_MapEvents:: @ 8389D80 - map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc deleted file mode 100644 index b44590d65..000000000 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ /dev/null @@ -1,32 +0,0 @@ -LilycoveCity_ContestLobby_EventObjects:: @ 838984C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0 - object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0 - -LilycoveCity_ContestLobby_MapWarps:: @ 838999C - warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY - warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL - warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL - -LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC - bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 - bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659 - bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066 - bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D - bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074 - bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D - -LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 - map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc deleted file mode 100644 index eee09c890..000000000 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects:: @ 8389464 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0 - -LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C - 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:: @ 8389494 - coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D - -LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 - map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc deleted file mode 100644 index 4469cddb0..000000000 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ /dev/null @@ -1,13 +0,0 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - -LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 - warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F - -LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 - map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc deleted file mode 100644 index eca98b599..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ /dev/null @@ -1,9 +0,0 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects:: @ 838A624 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0 - -LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C - warp_def 1, 5, 3, 127, MAP_NONE - warp_def 2, 5, 3, 127, MAP_NONE - -LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C - map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc deleted file mode 100644 index 71d34fa68..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART - -LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 - warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F - -LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 - bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD - bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD - -LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 - map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc deleted file mode 100644 index d5170d4c1..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ /dev/null @@ -1,19 +0,0 @@ -LilycoveCity_DepartmentStore_1F_EventObjects:: @ 838A218 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0 - -LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 - 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:: @ 838A2C8 - bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 - -LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 - map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc deleted file mode 100644 index 65c22a60f..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_2F_EventObjects:: @ 838A2E8 - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0 - -LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 - 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:: @ 838A378 - map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc deleted file mode 100644 index 212d44971..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_3F_EventObjects:: @ 838A38C - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0 - -LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 - 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:: @ 838A41C - map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc deleted file mode 100644 index 40b8eab37..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_DepartmentStore_4F_EventObjects:: @ 838A430 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0 - -LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 - 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:: @ 838A4C0 - map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc deleted file mode 100644 index 2883d167b..000000000 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ /dev/null @@ -1,16 +0,0 @@ -LilycoveCity_DepartmentStore_5F_EventObjects:: @ 838A4D4 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0 - -LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C - 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:: @ 838A594 - map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/events/LilycoveCity_EmptyMap.inc deleted file mode 100644 index 4ac5c42b8..000000000 --- a/data/maps/events/LilycoveCity_EmptyMap.inc +++ /dev/null @@ -1,5 +0,0 @@ -LilycoveCity_EmptyMap_MapWarps:: @ 838A028 - warp_def 7, 5, 0, 2, MAP_LILYCOVE_CITY_HARBOR - -LilycoveCity_EmptyMap_MapEvents:: @ 838A030 - map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc deleted file mode 100644 index 35a34928f..000000000 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_Harbor_EventObjects:: @ 8389F94 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE - -LilycoveCity_Harbor_MapWarps:: @ 8389FF4 - warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY - warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY - warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP - warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP - -LilycoveCity_Harbor_MapEvents:: @ 838A014 - map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc deleted file mode 100644 index 482ebf0b6..000000000 --- a/data/maps/events/LilycoveCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_House1_EventObjects:: @ 838A080 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0 - -LilycoveCity_House1_MapWarps:: @ 838A0B0 - warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY - -LilycoveCity_House1_MapEvents:: @ 838A0C0 - map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc deleted file mode 100644 index d557cd75a..000000000 --- a/data/maps/events/LilycoveCity_House2.inc +++ /dev/null @@ -1,9 +0,0 @@ -LilycoveCity_House2_EventObjects:: @ 838A0D4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0 - -LilycoveCity_House2_MapWarps:: @ 838A0EC - warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY - warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY - -LilycoveCity_House2_MapEvents:: @ 838A0FC - map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc deleted file mode 100644 index 2186eb0d2..000000000 --- a/data/maps/events/LilycoveCity_House3.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_House3_EventObjects:: @ 838A110 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0 - -LilycoveCity_House3_MapWarps:: @ 838A1A0 - warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY - -LilycoveCity_House3_MapEvents:: @ 838A1B0 - map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc deleted file mode 100644 index d5ebda9f2..000000000 --- a/data/maps/events/LilycoveCity_House4.inc +++ /dev/null @@ -1,10 +0,0 @@ -LilycoveCity_House4_EventObjects:: @ 838A1C4 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0 - -LilycoveCity_House4_MapWarps:: @ 838A1F4 - warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY - warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY - -LilycoveCity_House4_MapEvents:: @ 838A204 - map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc deleted file mode 100644 index a081a6523..000000000 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ /dev/null @@ -1,37 +0,0 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN - -LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 - 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:: @ 838966C - bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D - bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B - bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 - bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - -LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C - map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc deleted file mode 100644 index 4e2ffe49f..000000000 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ /dev/null @@ -1,25 +0,0 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - -LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 - warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F - -LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 - bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D - bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D - -LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 - map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc deleted file mode 100644 index d28c4631c..000000000 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ /dev/null @@ -1,9 +0,0 @@ -LilycoveCity_MoveDeletersHouse_EventObjects:: @ 838A044 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0 - -LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C - warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY - -LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C - map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc deleted file mode 100644 index 2505adbc3..000000000 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -LilycoveCity_PokemonCenter_1F_EventObjects:: @ 8389D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0 - -LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC - 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:: @ 8389DF4 - map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc deleted file mode 100644 index b8fd09d02..000000000 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -LilycoveCity_PokemonCenter_2F_EventObjects:: @ 8389E08 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0 - -LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 - warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 - map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc deleted file mode 100644 index 4f1d4ff4d..000000000 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ /dev/null @@ -1,16 +0,0 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY - -LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 - warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY - warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY - -LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 - map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/events/LilycoveCity_UnusedMart.inc deleted file mode 100644 index 4a0127506..000000000 --- a/data/maps/events/LilycoveCity_UnusedMart.inc +++ /dev/null @@ -1,6 +0,0 @@ -LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C - warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY - warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY - -LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C - map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc deleted file mode 100644 index 9bcf27a90..000000000 --- a/data/maps/events/LinkContestRoom1.inc +++ /dev/null @@ -1,18 +0,0 @@ -LinkContestRoom1_EventObjects:: @ 839149C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL - object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 - -LinkContestRoom1_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/events/LinkContestRoom2.inc deleted file mode 100644 index 562a96523..000000000 --- a/data/maps/events/LinkContestRoom2.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom2_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/events/LinkContestRoom3.inc deleted file mode 100644 index 8c93f28c9..000000000 --- a/data/maps/events/LinkContestRoom3.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom3_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/events/LinkContestRoom4.inc deleted file mode 100644 index a5e455811..000000000 --- a/data/maps/events/LinkContestRoom4.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom4_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/events/LinkContestRoom5.inc deleted file mode 100644 index f0f8fa508..000000000 --- a/data/maps/events/LinkContestRoom5.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom5_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/events/LinkContestRoom6.inc deleted file mode 100644 index a8fd4962f..000000000 --- a/data/maps/events/LinkContestRoom6.inc +++ /dev/null @@ -1 +0,0 @@ -LinkContestRoom6_MapEvents:: @ 8391604 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc deleted file mode 100644 index b50dbc7e1..000000000 --- a/data/maps/events/LittlerootTown.inc +++ /dev/null @@ -1,32 +0,0 @@ -LittlerootTown_EventObjects:: @ 83808FC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY - -LittlerootTown_MapWarps:: @ 838098C - 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:: @ 83809A4 - coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 - coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E - coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA - coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 - coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 - coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 - coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 - -LittlerootTown_MapBGEvents:: @ 8380A34 - bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 - bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF - bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808 - bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 - -LittlerootTown_MapEvents:: @ 8380A64 - map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc deleted file mode 100644 index 4ac7d4b3c..000000000 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ /dev/null @@ -1,17 +0,0 @@ -LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674 - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS - object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 - object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT - -LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC - 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:: @ 8385704 - coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 - -LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 - map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc deleted file mode 100644 index 2e4c4b6ae..000000000 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ /dev/null @@ -1,27 +0,0 @@ -LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS - -LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 - warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F - -LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 - bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E - bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867 - bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 - bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870 - -LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 - map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc deleted file mode 100644 index 353dc00a8..000000000 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ /dev/null @@ -1,17 +0,0 @@ -LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4 - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS - object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 - object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT - -LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C - 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:: @ 8385954 - coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 - -LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 - map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc deleted file mode 100644 index 98a144305..000000000 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ /dev/null @@ -1,28 +0,0 @@ -LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL - -LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 - warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F - -LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 - bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 - bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867 - bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF - bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39 - -LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 - map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc deleted file mode 100644 index bca8009b5..000000000 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ /dev/null @@ -1,28 +0,0 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB - -LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 - warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN - warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN - -LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 - bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - -LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 - map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc deleted file mode 100644 index 362d9b719..000000000 --- a/data/maps/events/MagmaHideout_1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -MagmaHideout_1F_EventObjects:: @ 838E9BC - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, 50, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0 - -MagmaHideout_1F_MapWarps:: @ 838EA04 - warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY - warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F - -MagmaHideout_1F_MapEvents:: @ 838EA14 - map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc deleted file mode 100644 index 5e4c3a078..000000000 --- a/data/maps/events/MagmaHideout_B1F.inc +++ /dev/null @@ -1,43 +0,0 @@ -MagmaHideout_B1F_EventObjects:: @ 838EA28 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, 9, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, 23, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0 - object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, 27, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT - -MagmaHideout_B1F_MapWarps:: @ 838EAE8 - warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F - warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F - warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F - warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F - warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F - warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F - warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F - warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F - warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F - warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F - warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F - warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F - warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F - warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F - warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F - warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F - warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F - warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F - warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F - warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F - warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F - warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F - warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F - warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F - warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F - warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F - warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F - warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F - warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F - -MagmaHideout_B1F_MapEvents:: @ 838EBD0 - map_events MagmaHideout_B1F_EventObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc deleted file mode 100644 index 111b97e42..000000000 --- a/data/maps/events/MagmaHideout_B2F.inc +++ /dev/null @@ -1,25 +0,0 @@ -MagmaHideout_B2F_EventObjects:: @ 838EBE4 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, 10, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, 51, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, 9, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, 8, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1 - -MagmaHideout_B2F_MapWarps:: @ 838EC5C - warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F - warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F - warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F - warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F - warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F - warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F - warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F - warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F - -MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C - coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - -MagmaHideout_B2F_MapEvents:: @ 838ECDC - map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc deleted file mode 100644 index 6b26c7973..000000000 --- a/data/maps/events/MauvilleCity.inc +++ /dev/null @@ -1,32 +0,0 @@ -MauvilleCity_EventObjects:: @ 837FB90 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1 - -MauvilleCity_MapWarps:: @ 837FC68 - 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:: @ 837FCA0 - bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087 - bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E - bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090 - bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 - -MauvilleCity_MapEvents:: @ 837FD00 - map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc deleted file mode 100644 index 83b5f66d8..000000000 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_BikeShop_EventObjects:: @ 8388318 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0 - -MauvilleCity_BikeShop_MapWarps:: @ 8388348 - warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY - -MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 - bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 - bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988 - -MauvilleCity_BikeShop_MapEvents:: @ 8388370 - map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc deleted file mode 100644 index 7b789a34e..000000000 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ /dev/null @@ -1,46 +0,0 @@ -MauvilleCity_GameCorner_EventObjects:: @ 83883C0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0 - -MauvilleCity_GameCorner_MapWarps:: @ 83884E0 - warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY - warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY - -MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 - bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 - bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155 - bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175 - bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195 - bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5 - bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5 - bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5 - bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215 - bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235 - bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255 - bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275 - bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295 - bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - -MauvilleCity_GameCorner_MapEvents:: @ 8388610 - map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc deleted file mode 100644 index cfcbbc4c6..000000000 --- a/data/maps/events/MauvilleCity_Gym.inc +++ /dev/null @@ -1,23 +0,0 @@ -MauvilleCity_Gym_EventObjects:: @ 838821C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, 10, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0 - -MauvilleCity_Gym_MapWarps:: @ 83882AC - warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY - warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY - -MauvilleCity_Gym_MapCoordEvents:: @ 83882BC - coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B - coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670 - coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 - -MauvilleCity_Gym_MapBGEvents:: @ 83882EC - bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 - bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771 - -MauvilleCity_Gym_MapEvents:: @ 8388304 - map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc deleted file mode 100644 index 07044121d..000000000 --- a/data/maps/events/MauvilleCity_House1.inc +++ /dev/null @@ -1,9 +0,0 @@ -MauvilleCity_House1_EventObjects:: @ 8388384 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0 - -MauvilleCity_House1_MapWarps:: @ 838839C - warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY - -MauvilleCity_House1_MapEvents:: @ 83883AC - map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc deleted file mode 100644 index 58d8d5a24..000000000 --- a/data/maps/events/MauvilleCity_House2.inc +++ /dev/null @@ -1,9 +0,0 @@ -MauvilleCity_House2_EventObjects:: @ 8388624 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0 - -MauvilleCity_House2_MapWarps:: @ 838863C - warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY - warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY - -MauvilleCity_House2_MapEvents:: @ 838864C - map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc deleted file mode 100644 index cb8397726..000000000 --- a/data/maps/events/MauvilleCity_Mart.inc +++ /dev/null @@ -1,11 +0,0 @@ -MauvilleCity_Mart_EventObjects:: @ 83887A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0 - -MauvilleCity_Mart_MapWarps:: @ 83887E8 - warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY - warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY - -MauvilleCity_Mart_MapEvents:: @ 83887F8 - map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc deleted file mode 100644 index 30f702a6f..000000000 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -MauvilleCity_PokemonCenter_1F_EventObjects:: @ 8388660 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0 - -MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 - 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:: @ 83886F0 - map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc deleted file mode 100644 index aef1d63ed..000000000 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -MauvilleCity_PokemonCenter_2F_EventObjects:: @ 8388704 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, 5, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0 - -MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 - warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C - map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc deleted file mode 100644 index 0b85c4e98..000000000 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ /dev/null @@ -1,28 +0,0 @@ -MeteorFalls_1F_1R_EventObjects:: @ 838BACC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4 - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F - object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS - -MeteorFalls_1F_1R_MapWarps:: @ 838BBBC - 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 - -MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 - coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C - -MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 - -MeteorFalls_1F_1R_MapEvents:: @ 838BC0C - map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc deleted file mode 100644 index 5264fcb5e..000000000 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ /dev/null @@ -1,17 +0,0 @@ -MeteorFalls_1F_2R_EventObjects:: @ 838BC20 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0 - -MeteorFalls_1F_2R_MapWarps:: @ 838BC68 - 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:: @ 838BC88 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 - -MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 - map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/events/MeteorFalls_B1F_1R.inc deleted file mode 100644 index 053c932ce..000000000 --- a/data/maps/events/MeteorFalls_B1F_1R.inc +++ /dev/null @@ -1,10 +0,0 @@ -MeteorFalls_B1F_1R_MapWarps:: @ 838BCB4 - 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:: @ 838BCE4 - map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc deleted file mode 100644 index 964a6c447..000000000 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ /dev/null @@ -1,8 +0,0 @@ -MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1 - -MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 - warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R - -MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 - map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc deleted file mode 100644 index 4803f9347..000000000 --- a/data/maps/events/MossdeepCity.inc +++ /dev/null @@ -1,41 +0,0 @@ -MossdeepCity_EventObjects:: @ 838042C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0 - -MossdeepCity_MapWarps:: @ 8380504 - 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, 24, 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, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_MapCoordEvents:: @ 8380554 - coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - -MossdeepCity_MapBGEvents:: @ 8380594 - bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 - bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED - bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF - bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 - -MossdeepCity_MapEvents:: @ 83805F4 - map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc deleted file mode 100644 index 2d10740b1..000000000 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -MossdeepCity_GameCorner_1F_EventObjects:: @ 838AC6C - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0 - -MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 - warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY - warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F - -MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C - bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C - -MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 - map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc deleted file mode 100644 index da6316421..000000000 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ /dev/null @@ -1,8 +0,0 @@ -MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 - -MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 - warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F - -MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC - map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc deleted file mode 100644 index 7c7a25777..000000000 --- a/data/maps/events/MossdeepCity_Gym.inc +++ /dev/null @@ -1,28 +0,0 @@ -MossdeepCity_Gym_EventObjects:: @ 838A660 - object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, 9, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, 10, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, 8, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, 10, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 - -MossdeepCity_Gym_MapWarps:: @ 838A738 - warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY - warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY - -MossdeepCity_Gym_MapCoordEvents:: @ 838A748 - coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 - -MossdeepCity_Gym_MapBGEvents:: @ 838A758 - bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA - bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646 - bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A - bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE - bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA - bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A - -MossdeepCity_Gym_MapEvents:: @ 838A7A0 - map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc deleted file mode 100644 index 2fe9e0373..000000000 --- a/data/maps/events/MossdeepCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -MossdeepCity_House1_EventObjects:: @ 838A7B4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0 - -MossdeepCity_House1_MapWarps:: @ 838A7E4 - warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY - -MossdeepCity_House1_MapEvents:: @ 838A7F4 - map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc deleted file mode 100644 index 743350683..000000000 --- a/data/maps/events/MossdeepCity_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -MossdeepCity_House2_EventObjects:: @ 838A808 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE - -MossdeepCity_House2_MapWarps:: @ 838A850 - warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY - warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY - -MossdeepCity_House2_MapEvents:: @ 838A860 - map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc deleted file mode 100644 index f601038e6..000000000 --- a/data/maps/events/MossdeepCity_House3.inc +++ /dev/null @@ -1,9 +0,0 @@ -MossdeepCity_House3_EventObjects:: @ 838AA08 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0 - -MossdeepCity_House3_MapWarps:: @ 838AA20 - warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY - -MossdeepCity_House3_MapEvents:: @ 838AA30 - map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc deleted file mode 100644 index cfde3a35e..000000000 --- a/data/maps/events/MossdeepCity_House4.inc +++ /dev/null @@ -1,11 +0,0 @@ -MossdeepCity_House4_EventObjects:: @ 838AAF8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0 - -MossdeepCity_House4_MapWarps:: @ 838AB40 - warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY - warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY - -MossdeepCity_House4_MapEvents:: @ 838AB50 - map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc deleted file mode 100644 index 92f4a8cbd..000000000 --- a/data/maps/events/MossdeepCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_Mart_EventObjects:: @ 838A984 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0 - -MossdeepCity_Mart_MapWarps:: @ 838A9E4 - warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY - -MossdeepCity_Mart_MapEvents:: @ 838A9F4 - map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc deleted file mode 100644 index da310c9f7..000000000 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -MossdeepCity_PokemonCenter_1F_EventObjects:: @ 838A874 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0 - -MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC - 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:: @ 838A8D4 - map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc deleted file mode 100644 index 4af09479f..000000000 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,15 +0,0 @@ -MossdeepCity_PokemonCenter_2F_EventObjects:: @ 838A8E8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, 5, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0 - -MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 - warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 - map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc deleted file mode 100644 index 85e716a93..000000000 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -MossdeepCity_SpaceCenter_1F_EventObjects:: @ 838AB64 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0 - -MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC - 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:: @ 838ABF4 - map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc deleted file mode 100644 index faf5d89fa..000000000 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ /dev/null @@ -1,10 +0,0 @@ -MossdeepCity_SpaceCenter_2F_EventObjects:: @ 838AC08 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0 - -MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 - warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F - -MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 - map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc deleted file mode 100644 index 7a8fee393..000000000 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ /dev/null @@ -1,18 +0,0 @@ -MossdeepCity_StevensHouse_EventObjects:: @ 838AA44 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER - -MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 - warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY - warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY - -MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 - bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - -MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 - map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc deleted file mode 100644 index f011502f2..000000000 --- a/data/maps/events/MtChimney.inc +++ /dev/null @@ -1,42 +0,0 @@ -MtChimney_EventObjects:: @ 838C330 - object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE - -MtChimney_MapWarps:: @ 838C5D0 - 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:: @ 838C5F0 - bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA - -MtChimney_MapEvents:: @ 838C608 - map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc deleted file mode 100644 index e5d69ee75..000000000 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ /dev/null @@ -1,10 +0,0 @@ -MtChimney_CableCarStation_EventObjects:: @ 838B828 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 - -MtChimney_CableCarStation_MapWarps:: @ 838B858 - warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY - warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY - -MtChimney_CableCarStation_MapEvents:: @ 838B868 - map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc deleted file mode 100644 index f547a9a98..000000000 --- a/data/maps/events/MtPyre_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_1F_EventObjects:: @ 838C7FC - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0 - -MtPyre_1F_MapWarps:: @ 838C844 - 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:: @ 838C874 - map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc deleted file mode 100644 index 9f8041366..000000000 --- a/data/maps/events/MtPyre_2F.inc +++ /dev/null @@ -1,17 +0,0 @@ -MtPyre_2F_EventObjects:: @ 838C888 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0 - -MtPyre_2F_MapWarps:: @ 838C918 - 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:: @ 838C940 - map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc deleted file mode 100644 index fbaf6fa4b..000000000 --- a/data/maps/events/MtPyre_3F.inc +++ /dev/null @@ -1,15 +0,0 @@ -MtPyre_3F_EventObjects:: @ 838C954 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, 17, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 - -MtPyre_3F_MapWarps:: @ 838C99C - 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:: @ 838C9CC - map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc deleted file mode 100644 index 9de527f2d..000000000 --- a/data/maps/events/MtPyre_4F.inc +++ /dev/null @@ -1,14 +0,0 @@ -MtPyre_4F_EventObjects:: @ 838C9E0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 - -MtPyre_4F_MapWarps:: @ 838CA10 - 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:: @ 838CA40 - map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc deleted file mode 100644 index cbf1b64b4..000000000 --- a/data/maps/events/MtPyre_5F.inc +++ /dev/null @@ -1,13 +0,0 @@ -MtPyre_5F_EventObjects:: @ 838CA54 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1 - -MtPyre_5F_MapWarps:: @ 838CA84 - 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:: @ 838CAAC - map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc deleted file mode 100644 index d65a3a8c6..000000000 --- a/data/maps/events/MtPyre_6F.inc +++ /dev/null @@ -1,10 +0,0 @@ -MtPyre_6F_EventObjects:: @ 838CAC0 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1 - -MtPyre_6F_MapWarps:: @ 838CAF0 - warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F - warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F - -MtPyre_6F_MapEvents:: @ 838CB00 - map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc deleted file mode 100644 index 48593481e..000000000 --- a/data/maps/events/MtPyre_Exterior.inc +++ /dev/null @@ -1,22 +0,0 @@ -MtPyre_Exterior_EventObjects:: @ 838CB14 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2 - -MtPyre_Exterior_MapWarps:: @ 838CB44 - 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:: @ 838CB5C - coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - -MtPyre_Exterior_MapBGEvents:: @ 838CBAC - bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D - bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E - -MtPyre_Exterior_MapEvents:: @ 838CBC4 - map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc deleted file mode 100644 index 3ddc6f36b..000000000 --- a/data/maps/events/MtPyre_Summit.inc +++ /dev/null @@ -1,27 +0,0 @@ -MtPyre_Summit_EventObjects:: @ 838CBD8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0 - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - -MtPyre_Summit_MapWarps:: @ 838CC68 - 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:: @ 838CC80 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 - -MtPyre_Summit_MapBGEvents:: @ 838CCE0 - bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F - bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50 - -MtPyre_Summit_MapEvents:: @ 838CCF8 - map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc deleted file mode 100644 index 8967a1df0..000000000 --- a/data/maps/events/NewMauville_Entrance.inc +++ /dev/null @@ -1,9 +0,0 @@ -NewMauville_Entrance_MapWarps:: @ 838DED4 - warp_def 4, 6, 3, 0, MAP_ROUTE110 - warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE - -NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 - coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC - -NewMauville_Entrance_MapEvents:: @ 838DEF4 - map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc deleted file mode 100644 index be85150e3..000000000 --- a/data/maps/events/NewMauville_Inside.inc +++ /dev/null @@ -1,37 +0,0 @@ -NewMauville_Inside_EventObjects:: @ 838DF08 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE - -NewMauville_Inside_MapWarps:: @ 838DFC8 - warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE - -NewMauville_Inside_MapCoordEvents:: @ 838DFD0 - coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 - -NewMauville_Inside_MapBGEvents:: @ 838E070 - bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 - -NewMauville_Inside_MapEvents:: @ 838E0D0 - map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc deleted file mode 100644 index ac50e1197..000000000 --- a/data/maps/events/OldaleTown.inc +++ /dev/null @@ -1,27 +0,0 @@ -OldaleTown_EventObjects:: @ 8380A78 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN - -OldaleTown_MapWarps:: @ 8380AD8 - 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:: @ 8380AF8 - coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF - coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 - coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C - coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 - -OldaleTown_MapBGEvents:: @ 8380B38 - bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA - bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 - bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 - -OldaleTown_MapEvents:: @ 8380B74 - map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc deleted file mode 100644 index e037e3b0e..000000000 --- a/data/maps/events/OldaleTown_House1.inc +++ /dev/null @@ -1,9 +0,0 @@ -OldaleTown_House1_EventObjects:: @ 8385C4C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0 - -OldaleTown_House1_MapWarps:: @ 8385C64 - warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN - warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN - -OldaleTown_House1_MapEvents:: @ 8385C74 - map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc deleted file mode 100644 index 0968fda57..000000000 --- a/data/maps/events/OldaleTown_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -OldaleTown_House2_EventObjects:: @ 8385C88 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0 - -OldaleTown_House2_MapWarps:: @ 8385CB8 - warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN - -OldaleTown_House2_MapEvents:: @ 8385CC8 - map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc deleted file mode 100644 index 9d0b70937..000000000 --- a/data/maps/events/OldaleTown_Mart.inc +++ /dev/null @@ -1,11 +0,0 @@ -OldaleTown_Mart_EventObjects:: @ 8385DEC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0 - -OldaleTown_Mart_MapWarps:: @ 8385E34 - warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN - warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN - -OldaleTown_Mart_MapEvents:: @ 8385E44 - map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc deleted file mode 100644 index 89ad23d8f..000000000 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -OldaleTown_PokemonCenter_1F_EventObjects:: @ 8385CDC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0 - -OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C - 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:: @ 8385D54 - map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc deleted file mode 100644 index 9af6ec676..000000000 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -OldaleTown_PokemonCenter_2F_EventObjects:: @ 8385D68 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0 - -OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 - warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 - map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc deleted file mode 100644 index f8db75501..000000000 --- a/data/maps/events/PacifidlogTown.inc +++ /dev/null @@ -1,20 +0,0 @@ -PacifidlogTown_EventObjects:: @ 838100C - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0 - -PacifidlogTown_MapWarps:: @ 8381054 - 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:: @ 8381084 - bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA - -PacifidlogTown_MapEvents:: @ 83810A8 - map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc deleted file mode 100644 index 95d0009d9..000000000 --- a/data/maps/events/PacifidlogTown_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -PacifidlogTown_House1_EventObjects:: @ 8386F40 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0 - -PacifidlogTown_House1_MapWarps:: @ 8386F70 - warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House1_MapEvents:: @ 8386F80 - map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc deleted file mode 100644 index 00493650a..000000000 --- a/data/maps/events/PacifidlogTown_House2.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House2_EventObjects:: @ 8386F94 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0 - -PacifidlogTown_House2_MapWarps:: @ 8386FDC - warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House2_MapEvents:: @ 8386FEC - map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc deleted file mode 100644 index 0f7bb798b..000000000 --- a/data/maps/events/PacifidlogTown_House3.inc +++ /dev/null @@ -1,10 +0,0 @@ -PacifidlogTown_House3_EventObjects:: @ 8387000 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0 - -PacifidlogTown_House3_MapWarps:: @ 8387030 - warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House3_MapEvents:: @ 8387040 - map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc deleted file mode 100644 index e41a86e44..000000000 --- a/data/maps/events/PacifidlogTown_House4.inc +++ /dev/null @@ -1,11 +0,0 @@ -PacifidlogTown_House4_EventObjects:: @ 8387054 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0 - -PacifidlogTown_House4_MapWarps:: @ 838709C - warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House4_MapEvents:: @ 83870AC - map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc deleted file mode 100644 index bac0ca3e1..000000000 --- a/data/maps/events/PacifidlogTown_House5.inc +++ /dev/null @@ -1,10 +0,0 @@ -PacifidlogTown_House5_EventObjects:: @ 83870C0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0 - -PacifidlogTown_House5_MapWarps:: @ 83870F0 - warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN - warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN - -PacifidlogTown_House5_MapEvents:: @ 8387100 - map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc deleted file mode 100644 index 05f1e9698..000000000 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects:: @ 8386E30 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0 - -PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 - 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:: @ 8386EA8 - map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc deleted file mode 100644 index 8bc70f400..000000000 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects:: @ 8386EBC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0 - -PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 - warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C - map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc deleted file mode 100644 index 43216cdc9..000000000 --- a/data/maps/events/PetalburgCity.inc +++ /dev/null @@ -1,37 +0,0 @@ -PetalburgCity_EventObjects:: @ 837F5F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0 - -PetalburgCity_MapWarps:: @ 837F6C8 - 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:: @ 837F6F8 - coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 - coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 - coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E - coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A - -PetalburgCity_MapBGEvents:: @ 837F738 - bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 - bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B - bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D - bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F - -PetalburgCity_MapEvents:: @ 837F798 - map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc deleted file mode 100644 index b5dd1f57b..000000000 --- a/data/maps/events/PetalburgCity_Gym.inc +++ /dev/null @@ -1,70 +0,0 @@ -PetalburgCity_Gym_EventObjects:: @ 8387168 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM - -PetalburgCity_Gym_MapWarps:: @ 8387258 - 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:: @ 8387388 - bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 - bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3 - bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8 - bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B - bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E - bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91 - bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4 - bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7 - bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A - bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D - bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90 - bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3 - bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA - bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA - -PetalburgCity_Gym_MapEvents:: @ 8387430 - map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc deleted file mode 100644 index df1970bd4..000000000 --- a/data/maps/events/PetalburgCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -PetalburgCity_House1_EventObjects:: @ 8387444 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0 - -PetalburgCity_House1_MapWarps:: @ 8387474 - warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY - warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY - -PetalburgCity_House1_MapEvents:: @ 8387484 - map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc deleted file mode 100644 index b26cc139f..000000000 --- a/data/maps/events/PetalburgCity_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -PetalburgCity_House2_EventObjects:: @ 8387498 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0 - -PetalburgCity_House2_MapWarps:: @ 83874C8 - warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY - -PetalburgCity_House2_MapEvents:: @ 83874D8 - map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc deleted file mode 100644 index 3171dca99..000000000 --- a/data/maps/events/PetalburgCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -PetalburgCity_Mart_EventObjects:: @ 8387614 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0 - -PetalburgCity_Mart_MapWarps:: @ 8387674 - warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY - -PetalburgCity_Mart_MapEvents:: @ 8387684 - map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc deleted file mode 100644 index d4dc0c63e..000000000 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_1F_EventObjects:: @ 83874EC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0 - -PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 - 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:: @ 838757C - map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc deleted file mode 100644 index 365e3a258..000000000 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -PetalburgCity_PokemonCenter_2F_EventObjects:: @ 8387590 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0 - -PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 - warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 - map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc deleted file mode 100644 index bc33ab969..000000000 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -PetalburgCity_WallysHouse_EventObjects:: @ 8387114 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0 - -PetalburgCity_WallysHouse_MapWarps:: @ 8387144 - warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY - warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY - -PetalburgCity_WallysHouse_MapEvents:: @ 8387154 - map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc deleted file mode 100644 index d624d94dc..000000000 --- a/data/maps/events/PetalburgWoods.inc +++ /dev/null @@ -1,37 +0,0 @@ -PetalburgWoods_EventObjects:: @ 838C14C - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0 - -PetalburgWoods_MapWarps:: @ 838C284 - 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:: @ 838C2B4 - coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 - coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 - -PetalburgWoods_MapBGEvents:: @ 838C2D4 - bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 - bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A - bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B - bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C - bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D - bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E - -PetalburgWoods_MapEvents:: @ 838C31C - map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc deleted file mode 100644 index e8c27a9c9..000000000 --- a/data/maps/events/RecordCorner.inc +++ /dev/null @@ -1,17 +0,0 @@ -RecordCorner_EventObjects:: @ 839139C - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0 - -RecordCorner_MapWarps:: @ 83913B4 - 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:: @ 83913D4 - coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418 - coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442 - coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D - coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 - -RecordCorner_MapEvents:: @ 8391414 - map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc deleted file mode 100644 index 933509835..000000000 --- a/data/maps/events/Route101.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route101_EventObjects:: @ 83810BC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA64, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG - object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 - -Route101_MapCoordEvents:: @ 838114C - coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 - -Route101_MapBGEvents:: @ 83811DC - bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 - -Route101_MapEvents:: @ 83811E8 - map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc deleted file mode 100644 index 4de0e95d2..000000000 --- a/data/maps/events/Route102.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route102_EventObjects:: @ 83811FC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_14EADA, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_14EB53, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 - -Route102_MapBGEvents:: @ 83812D4 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC - bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3 - -Route102_MapEvents:: @ 83812EC - map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc deleted file mode 100644 index f131106da..000000000 --- a/data/maps/events/Route103.inc +++ /dev/null @@ -1,22 +0,0 @@ -Route103_EventObjects:: @ 8381300 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_14ED82, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, 7, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, 18, 0, 0, 1, 3, Route103_EventScript_14ED94, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_14EE37, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_14ED79, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, 10, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 - -Route103_MapBGEvents:: @ 8381468 - bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B - -Route103_MapEvents:: @ 8381474 - map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc deleted file mode 100644 index 61934c590..000000000 --- a/data/maps/events/Route104.inc +++ /dev/null @@ -1,58 +0,0 @@ -Route104_EventObjects:: @ 8381488 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF42, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_14EF81, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F172, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, S_BerryTree, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, S_BerryTree, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, S_BerryTree, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, S_BerryTree, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F25A, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F279, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_14F21C, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_14F189, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_14EF93, 0 - -Route104_MapWarps:: @ 8381788 - 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_MapBGEvents:: @ 83817C8 - bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 - bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D - bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 - bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F - bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 - bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C - bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E - bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25 - bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_55 - bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58 - -Route104_MapEvents:: @ 8381840 - map_events Route104_EventObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc deleted file mode 100644 index 9ae66cabb..000000000 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route104_MrBrineysHouse_EventObjects:: @ 838B654 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE - -Route104_MrBrineysHouse_MapWarps:: @ 838B684 - warp_def 5, 8, 0, 0, MAP_ROUTE104 - warp_def 6, 8, 0, 0, MAP_ROUTE104 - -Route104_MrBrineysHouse_MapEvents:: @ 838B694 - map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc deleted file mode 100644 index edf18089d..000000000 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route104_PrettyPetalFlowerShop_EventObjects:: @ 838B6A8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0 - -Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 - warp_def 2, 8, 0, 1, MAP_ROUTE104 - warp_def 3, 8, 0, 1, MAP_ROUTE104 - -Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 - map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc deleted file mode 100644 index 2d7c90dc1..000000000 --- a/data/maps/events/Route104_Prototype.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route104_Prototype_EventObjects:: @ 8391F2C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, 23, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, 8, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, 24, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, 8, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0 - object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 - object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, 7, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, 2, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0 - -Route104_Prototype_MapWarps:: @ 839204C - warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP - -Route104_Prototype_MapBGEvents:: @ 8392054 - bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C - bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25 - -Route104_Prototype_MapEvents:: @ 839206C - map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc deleted file mode 100644 index 89ceb8270..000000000 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route104_PrototypePrettyPetalFlowerShop_EventObjects:: @ 8392080 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0 - -Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 - warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE - warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE - -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 - map_events Route104_PrototypePrettyPetalFlowerShop_EventObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc deleted file mode 100644 index 999966093..000000000 --- a/data/maps/events/Route105.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route105_EventObjects:: @ 8381854 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, 27, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, 25, 0, 7, 1, 3, Route105_EventScript_14F300, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_14F317, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, 13, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0 - -Route105_MapWarps:: @ 83818E4 - warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE - -Route105_MapBGEvents:: @ 83818EC - bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59 - -Route105_MapEvents:: @ 83818F8 - map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc deleted file mode 100644 index 55f395ded..000000000 --- a/data/maps/events/Route106.inc +++ /dev/null @@ -1,18 +0,0 @@ -Route106_EventObjects:: @ 838190C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, 27, 4, 0, 1, 3, Route106_EventScript_14F338, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F34F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_14F366, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1 - -Route106_MapWarps:: @ 8381984 - warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F - -Route106_MapBGEvents:: @ 838198C - bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F - bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E - bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F - bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F - -Route106_MapEvents:: @ 83819BC - map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc deleted file mode 100644 index 9bdeaf3b0..000000000 --- a/data/maps/events/Route107.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route107_EventObjects:: @ 83819D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, 14, 0, 0, 1, 3, Route107_EventScript_14F411, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, 7, 0, 0, 1, 4, Route107_EventScript_14F428, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F43F, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F45A, 0 - -Route107_MapEvents:: @ 8381A60 - map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc deleted file mode 100644 index 997fb5ce2..000000000 --- a/data/maps/events/Route108.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route108_EventObjects:: @ 8381A74 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_14F476, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, 13, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, 24, 0, 0, 1, 3, Route108_EventScript_14F48D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, 51, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0 - -Route108_MapWarps:: @ 8381AD4 - warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK - -Route108_MapBGEvents:: @ 8381ADC - bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56 - -Route108_MapEvents:: @ 8381AE8 - map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc deleted file mode 100644 index 7376fd4bf..000000000 --- a/data/maps/events/Route109.inc +++ /dev/null @@ -1,37 +0,0 @@ -Route109_EventObjects:: @ 8381AFC - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, 15, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, 8, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, 23, 0, 0, 1, 3, Route109_EventScript_14F809, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F847, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_14F705, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, 1, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_14F89C, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_14F885, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, 10, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, 10, 1, 1, 0, 0, Route109_EventScript_14F70E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, 9, 1, 1, 0, 0, Route109_EventScript_14F725, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_14F776, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F77F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F788, 0 - -Route109_MapWarps:: @ 8381CDC - warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE - -Route109_MapBGEvents:: @ 8381CE4 - bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B - bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 - bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32 - bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34 - bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33 - bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_40 - bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5A - bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B - -Route109_MapEvents:: @ 8381D44 - map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc deleted file mode 100644 index f82513f08..000000000 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route109_SeashoreHouse_EventObjects:: @ 83920BC - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0 - -Route109_SeashoreHouse_MapWarps:: @ 839211C - warp_def 6, 9, 0, 0, MAP_ROUTE109 - warp_def 7, 9, 0, 0, MAP_ROUTE109 - -Route109_SeashoreHouse_MapEvents:: @ 839212C - map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc deleted file mode 100644 index eb032e0cc..000000000 --- a/data/maps/events/Route110.inc +++ /dev/null @@ -1,69 +0,0 @@ -Route110_EventObjects:: @ 8381D58 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F99E, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_14FB28, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_14FB94, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, 23, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, 20, 0, 0, 1, 3, Route110_EventScript_14FABC, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, S_BerryTree, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, S_BerryTree, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_14FA53, 0 - object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_14FB11, 0 - object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110 - object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_14FC10, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, 9, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0 - -Route110_MapWarps:: @ 8382040 - 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_NORTH_ENTRANCE - warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE - warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE - -Route110_MapCoordEvents:: @ 8382070 - coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 - coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E - coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 - -Route110_MapBGEvents:: @ 83820C0 - bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF - bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01 - bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6 - bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD - bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 - bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A - bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 - bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 - bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C - bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 - bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E - bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36 - bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35 - bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41 - bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37 - bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 - -Route110_MapEvents:: @ 838218C - map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc deleted file mode 100644 index 0474772cb..000000000 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects:: @ 8392CAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0 - -Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 - 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_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A - -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 - map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc deleted file mode 100644 index 996562b61..000000000 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects:: @ 8392C40 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0 - -Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 - 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_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD - -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 - map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/events/Route110_TrickHouseCorridor.inc deleted file mode 100644 index 4b7e39efd..000000000 --- a/data/maps/events/Route110_TrickHouseCorridor.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route110_TrickHouseCorridor_MapWarps:: @ 8392228 - 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:: @ 8392248 - map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc deleted file mode 100644 index 732c6c705..000000000 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route110_TrickHouseEnd_EventObjects:: @ 83921D0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END - -Route110_TrickHouseEnd_MapWarps:: @ 83921E8 - 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:: @ 83921F8 - coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 - -Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 - bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 - -Route110_TrickHouseEnd_MapEvents:: @ 8392214 - map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc deleted file mode 100644 index 07c5a6555..000000000 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route110_TrickHouseEntrance_EventObjects:: @ 8392140 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE - -Route110_TrickHouseEntrance_MapWarps:: @ 8392158 - 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:: @ 8392170 - coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - -Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 - bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A - -Route110_TrickHouseEntrance_MapEvents:: @ 83921BC - map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc deleted file mode 100644 index ef5b7732f..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ /dev/null @@ -1,31 +0,0 @@ -Route110_TrickHousePuzzle1_EventObjects:: @ 839225C - object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, 9, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D - object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F - -Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 - 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:: @ 839243C - bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 - -Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 - map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc deleted file mode 100644 index c815a1624..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ /dev/null @@ -1,23 +0,0 @@ -Route110_TrickHousePuzzle2_EventObjects:: @ 839245C - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 - -Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 - 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:: @ 83924EC - coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 - coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 - coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 - coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 - -Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C - bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 - -Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 - map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc deleted file mode 100644 index e45f2d33b..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ /dev/null @@ -1,32 +0,0 @@ -Route110_TrickHousePuzzle3_EventObjects:: @ 839254C - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - -Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 - 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:: @ 839266C - coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB - coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 - coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF - coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB - coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 - coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 - -Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC - bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB - -Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 - map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc deleted file mode 100644 index 4d7189920..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ /dev/null @@ -1,27 +0,0 @@ -Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A - object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B - -Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 - 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:: @ 839287C - bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E - -Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 - map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc deleted file mode 100644 index 66884fc3d..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ /dev/null @@ -1,33 +0,0 @@ -Route110_TrickHousePuzzle5_EventObjects:: @ 839289C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0 - -Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 - 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:: @ 839292C - coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 - coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 - coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF - coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB - coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 - coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF - coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB - coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 - coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 - coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F - coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B - coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 - coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 - -Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C - bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 - -Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 - map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc deleted file mode 100644 index 6ac299c5f..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, 10, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 - -Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C - 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:: @ 8392AA4 - bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA - -Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 - map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc deleted file mode 100644 index d57546ce1..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ /dev/null @@ -1,24 +0,0 @@ -Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, 23, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 - -Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 - 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_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C - coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 - -Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C - bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B - bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9 - bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317 - bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8 - bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346 - bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375 - -Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 - map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc deleted file mode 100644 index 481b2d926..000000000 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 - -Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 - 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:: @ 8392C20 - bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C - -Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C - map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc deleted file mode 100644 index 837c17c39..000000000 --- a/data/maps/events/Route111.inc +++ /dev/null @@ -1,100 +0,0 @@ -Route111_EventObjects:: @ 83821A0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1503BE, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_150395, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, 21, 0, 0, 1, 3, Route111_EventScript_1503A7, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_150403, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1503D5, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, 24, 0, 0, 1, 3, Route111_EventScript_1503EC, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1500C5, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, S_BerryTree, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, S_BerryTree, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_150458, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_150441, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_15046F, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, 7, 4, 0, 1, 4, Route111_EventScript_1504C4, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_150486, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN - object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL - object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL - object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_15039E, 0 - -Route111_MapWarps:: @ 8382500 - 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 - -Route111_MapCoordEvents:: @ 8382518 - coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - -Route111_MapBGEvents:: @ 8382738 - bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368 - bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F - bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 - bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A - 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, 0, 0, Route111_EventScript_150383 - 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_2 - bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C - 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_38 - bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39 - -Route111_MapEvents:: @ 8382804 - map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc deleted file mode 100644 index da7f2f605..000000000 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route111_OldLadysRestStop_EventObjects:: @ 838B798 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0 - -Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 - warp_def 3, 7, 0, 2, MAP_ROUTE111 - warp_def 4, 7, 0, 2, MAP_ROUTE111 - -Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 - map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc deleted file mode 100644 index 70d00eabc..000000000 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route111_WinstrateFamilysHouse_EventObjects:: @ 838B714 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0 - -Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 - warp_def 3, 7, 0, 0, MAP_ROUTE111 - warp_def 4, 7, 0, 0, MAP_ROUTE111 - -Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 - map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc deleted file mode 100644 index e1673dc69..000000000 --- a/data/maps/events/Route112.inc +++ /dev/null @@ -1,29 +0,0 @@ -Route112_EventObjects:: @ 8382818 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, 8, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_150549, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_15059E, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1505B5, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, 16, 0, 0, 1, 4, Route112_EventScript_150560, 0 - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, 8, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_150540, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1 - -Route112_MapWarps:: @ 8382938 - 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:: @ 8382968 - bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E - bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 - -Route112_MapEvents:: @ 838298C - map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc deleted file mode 100644 index a2c93ca9d..000000000 --- a/data/maps/events/Route112_CableCarStation.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route112_CableCarStation_EventObjects:: @ 838B7D4 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 - -Route112_CableCarStation_MapWarps:: @ 838B804 - warp_def 6, 11, 0, 0, MAP_ROUTE112 - warp_def 7, 11, 0, 1, MAP_ROUTE112 - -Route112_CableCarStation_MapEvents:: @ 838B814 - map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc deleted file mode 100644 index 3fd5ea281..000000000 --- a/data/maps/events/Route113.inc +++ /dev/null @@ -1,48 +0,0 @@ -Route113_EventObjects:: @ 83829A0 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_15060E, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_150605, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_15063B, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_150652, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_150669, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506A7, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506E5, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_1506FC, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_150717, 0 - -Route113_MapWarps:: @ 8382AA8 - warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP - -Route113_MapCoordEvents:: @ 8382AB0 - 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 87, 9, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 86, 10, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 86, 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 88, 8, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 88, 6, 3, COORD_EVENT_WEATHER_ASH - coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH - -Route113_MapBGEvents:: @ 8382BE0 - bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 - bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 - bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 - bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 - bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 - bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 - bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E - -Route113_MapEvents:: @ 8382C34 - map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc deleted file mode 100644 index 24b90b2d7..000000000 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route113_GlassWorkshop_EventObjects:: @ 8392D18 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0 - -Route113_GlassWorkshop_MapWarps:: @ 8392D48 - warp_def 3, 8, 0, 0, MAP_ROUTE113 - warp_def 4, 8, 0, 0, MAP_ROUTE113 - -Route113_GlassWorkshop_MapEvents:: @ 8392D58 - map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc deleted file mode 100644 index eb05dd1ce..000000000 --- a/data/maps/events/Route114.inc +++ /dev/null @@ -1,46 +0,0 @@ -Route114_EventObjects:: @ 8382C48 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1507F1, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 15, 0, 0, 1, 4, Route114_EventScript_150808, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_15081F, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_150836, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_15084D, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_150782, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1507C3, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_150733, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, 8, 0, 0, 1, 0, Route114_EventScript_1508E0, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1508C9, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_15088B, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_150912, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_1508F7, 0 - -Route114_MapWarps:: @ 8382E70 - 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 - -Route114_MapBGEvents:: @ 8382E88 - bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 - bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF - 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, 0, 0, Route114_EventScript_1507E8 - bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 - bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 - bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A - -Route114_MapEvents:: @ 8382F18 - map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc deleted file mode 100644 index 1f41db668..000000000 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ /dev/null @@ -1,16 +0,0 @@ -Route114_FossilManiacsHouse_EventObjects:: @ 838B87C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0 - -Route114_FossilManiacsHouse_MapWarps:: @ 838B894 - 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:: @ 838B8AC - bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 - bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 - -Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC - map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc deleted file mode 100644 index 13db6a8ca..000000000 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route114_FossilManiacsTunnel_EventObjects:: @ 838B8F0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0 - -Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 - warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE - -Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 - map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc deleted file mode 100644 index 86ebf06de..000000000 --- a/data/maps/events/Route114_LanettesHouse.inc +++ /dev/null @@ -1,14 +0,0 @@ -Route114_LanettesHouse_EventObjects:: @ 838B92C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE - -Route114_LanettesHouse_MapWarps:: @ 838B944 - warp_def 5, 7, 0, 2, MAP_ROUTE114 - warp_def 6, 7, 0, 2, MAP_ROUTE114 - -Route114_LanettesHouse_MapBGEvents:: @ 838B954 - bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 - bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 - -Route114_LanettesHouse_MapEvents:: @ 838B978 - map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc deleted file mode 100644 index e03d62fb4..000000000 --- a/data/maps/events/Route115.inc +++ /dev/null @@ -1,39 +0,0 @@ -Route115_EventObjects:: @ 8382F2C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_15092E, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_150949, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_15099E, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 69, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 70, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 71, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1509DC, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, 50, 3, 3, 1, 2, Route115_EventScript_150987, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, 14, 0, 0, 1, 3, Route115_EventScript_150A1A, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4 - -Route115_MapWarps:: @ 83830AC - warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R - -Route115_MapBGEvents:: @ 83830B4 - 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, 0, 0, Route115_EventScript_150937 - bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 - 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_61 - -Route115_MapEvents:: @ 838315C - map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc deleted file mode 100644 index fd1b98f0a..000000000 --- a/data/maps/events/Route116.inc +++ /dev/null @@ -1,47 +0,0 @@ -Route116_EventObjects:: @ 8383170 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_150C62, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_150C79, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, 13, 0, 0, 1, 2, Route116_EventScript_150CCE, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_150CE5, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, 8, 0, 0, 1, 2, Route116_EventScript_150CFC, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, 9, 0, 0, 1, 2, Route116_EventScript_150C90, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN - -Route116_MapWarps:: @ 8383380 - 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 - -Route116_MapCoordEvents:: @ 8383398 - coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E - -Route116_MapBGEvents:: @ 83833A8 - bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 - bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 - bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 - 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, 0, 0, Route116_EventScript_150B4B - bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 - 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_2D - bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES - -Route116_MapEvents:: @ 838342C - map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc deleted file mode 100644 index 454f184e3..000000000 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route116_TunnelersRestHouse_EventObjects:: @ 838B98C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0 - -Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 - warp_def 4, 8, 0, 1, MAP_ROUTE116 - warp_def 5, 8, 0, 1, MAP_ROUTE116 - -Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 - map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc deleted file mode 100644 index a668f4b32..000000000 --- a/data/maps/events/Route117.inc +++ /dev/null @@ -1,34 +0,0 @@ -Route117_EventObjects:: @ 8383440 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_150D57, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, 33, 2, 2, 0, 0, Route117_EventScript_150D60, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_1B222D, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, 28, 7, 0, 1, 4, Route117_EventScript_150E09, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 23, 0, 0, 1, 3, Route117_EventScript_150DCB, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, 18, 0, 0, 1, 3, Route117_EventScript_150D8D, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, 40, 4, 4, 1, 3, Route117_EventScript_150E47, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_150E85, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150EE2, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150E9C, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_150D69, 0 - -Route117_MapWarps:: @ 8383638 - warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE - -Route117_MapBGEvents:: @ 8383640 - bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 - bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B - bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 - bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 - -Route117_MapEvents:: @ 8383670 - map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc deleted file mode 100644 index 3f2c3be51..000000000 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route117_PokemonDayCare_EventObjects:: @ 838B9F8 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0 - -Route117_PokemonDayCare_MapWarps:: @ 838BA10 - warp_def 2, 8, 0, 0, MAP_ROUTE117 - warp_def 3, 8, 0, 0, MAP_ROUTE117 - -Route117_PokemonDayCare_MapEvents:: @ 838BA20 - map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc deleted file mode 100644 index c12e77bd9..000000000 --- a/data/maps/events/Route118.inc +++ /dev/null @@ -1,40 +0,0 @@ -Route118_EventObjects:: @ 8383684 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_151139, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, 2, 1, 1, 0, 0, Route118_EventScript_150F93, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_150F34, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, 24, 0, 0, 1, 4, Route118_EventScript_15108F, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1510E4, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_151150, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1510CD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1510FB, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 - -Route118_MapCoordEvents:: @ 8383864 - coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE - coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE - coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 - -Route118_MapBGEvents:: @ 8383894 - bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C - bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 - 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_43 - bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42 - -Route118_MapEvents:: @ 8383900 - map_events Route118_EventObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc deleted file mode 100644 index 49677e8e5..000000000 --- a/data/maps/events/Route119.inc +++ /dev/null @@ -1,94 +0,0 @@ -Route119_EventObjects:: @ 8383914 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_151491, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_151463, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_15144C, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1514BF, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_151435, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1514FD, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_15147A, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1514A8, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, 57, 0, 0, 1, 2, Route119_EventScript_151569, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_151580, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_15153B, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, 8, 0, 0, 1, 3, Route119_EventScript_151552, 0 - object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6 - object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1515F3, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, S_BerryTree, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, S_BerryTree, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, S_BerryTree, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, S_BerryTree, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_15141A, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1515FC, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_151597, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, 76, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1515AE, 0 - -Route119_MapWarps:: @ 8383C8C - warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F - warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE - -Route119_MapCoordEvents:: @ 8383C9C - coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 - coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 - coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE - 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 33, 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 34, 10, 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 - -Route119_MapBGEvents:: @ 8383E2C - bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C - bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 - 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_5 - bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6 - 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_44 - bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 - bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 - -Route119_MapEvents:: @ 8383F1C - map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc deleted file mode 100644 index 0b7bc6b70..000000000 --- a/data/maps/events/Route119_House.inc +++ /dev/null @@ -1,15 +0,0 @@ -Route119_House_EventObjects:: @ 8392F40 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0 - -Route119_House_MapWarps:: @ 8392FE8 - warp_def 3, 8, 0, 1, MAP_ROUTE119 - warp_def 4, 8, 0, 1, MAP_ROUTE119 - -Route119_House_MapEvents:: @ 8392FF8 - map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc deleted file mode 100644 index 0107020cd..000000000 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route119_WeatherInstitute_1F_EventObjects:: @ 8392DC0 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0 - -Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 - 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:: @ 8392E50 - bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - -Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 - map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc deleted file mode 100644 index 62cb0391f..000000000 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F - -Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 - warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F - -Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C - map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc deleted file mode 100644 index 1c0444b22..000000000 --- a/data/maps/events/Route120.inc +++ /dev/null @@ -1,86 +0,0 @@ -Route120_EventObjects:: @ 8383F30 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1519B3, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1519CA, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_151A08, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_151A1F, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_151A36, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_151739, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, 15, 0, 0, 1, 4, Route120_EventScript_151A74, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_151A8B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_151AA2, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 17, 0, 0, 1, 3, Route120_EventScript_151AB9, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_151AD0, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_151AE7, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6 - -Route120_MapWarps:: @ 8384308 - warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB - warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB - -Route120_MapCoordEvents:: @ 8384318 - 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:: @ 8384448 - bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 - bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA - 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_47 - bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54 - bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45 - bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46 - bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 - -Route120_MapEvents:: @ 83844F0 - map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc deleted file mode 100644 index 7405af540..000000000 --- a/data/maps/events/Route121.inc +++ /dev/null @@ -1,46 +0,0 @@ -Route121_EventObjects:: @ 8384504 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_151B0A, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BDE, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BF9, 0 - object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_151B72, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 17, 0, 0, 1, 3, Route121_EventScript_151B89, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, 15, 0, 0, 1, 4, Route121_EventScript_151BC7, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_151C14, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 - -Route121_MapWarps:: @ 8384714 - warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -Route121_MapCoordEvents:: @ 838471C - coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - -Route121_MapBGEvents:: @ 838475C - bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 - 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, 0, 0, Route121_EventScript_151B1C - bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 - bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 - bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 - -Route121_MapEvents:: @ 83847C8 - map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc deleted file mode 100644 index 6ed6613ec..000000000 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ /dev/null @@ -1,19 +0,0 @@ -Route121_SafariZoneEntrance_EventObjects:: @ 838BA34 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - -Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C - warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST - warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST - warp_def 14, 13, 0, 0, MAP_ROUTE121 - warp_def 15, 13, 0, 0, MAP_ROUTE121 - -Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C - coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 - -Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC - bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 - -Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 - map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/events/Route122.inc b/data/maps/events/Route122.inc deleted file mode 100644 index 3bad2b895..000000000 --- a/data/maps/events/Route122.inc +++ /dev/null @@ -1,5 +0,0 @@ -Route122_MapWarps:: @ 83847DC - warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F - -Route122_MapEvents:: @ 83847E4 - map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc deleted file mode 100644 index b25ec5c64..000000000 --- a/data/maps/events/Route123.inc +++ /dev/null @@ -1,76 +0,0 @@ -Route123_EventObjects:: @ 83847F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_151CD1, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_151CE8, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, S_BerryTree, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, S_BerryTree, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_151C5D, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, S_BerryTree, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, S_BerryTree, 0 - object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, S_BerryTree, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_151CFF, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151DAD, 0 - object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151D92, 0 - object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 6, Route123_EventScript_151D16, 0 - object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_151D54, 0 - object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, 1, 0, 0, 1, 3, Route123_EventScript_151DC8, 0 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3 - object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4 - -Route123_MapWarps:: @ 8384B28 - warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE - -Route123_MapCoordEvents:: @ 8384B30 - 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:: @ 8384C90 - bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF - 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, 0, 0, Route123_EventScript_151CB6 - bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 - bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 - bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 - bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 - bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A - -Route123_MapEvents:: @ 8384CFC - map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc deleted file mode 100644 index ff950e5cb..000000000 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -Route123_BerryMastersHouse_EventObjects:: @ 8392D6C - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0 - -Route123_BerryMastersHouse_MapWarps:: @ 8392D9C - warp_def 3, 7, 0, 0, MAP_ROUTE123 - warp_def 4, 7, 0, 0, MAP_ROUTE123 - -Route123_BerryMastersHouse_MapEvents:: @ 8392DAC - map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc deleted file mode 100644 index 694718fb6..000000000 --- a/data/maps/events/Route124.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route124_EventObjects:: @ 8384D10 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, 1, 5, 0, 1, 3, Route124_EventScript_151DF8, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, 52, 5, 3, 1, 3, Route124_EventScript_151E0F, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, 24, 0, 0, 1, 3, Route124_EventScript_151E26, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 6, 8, 1, 3, Route124_EventScript_151E64, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, 28, 7, 0, 1, 2, Route124_EventScript_151E7B, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151E92, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151ED8, 0 - -Route124_MapWarps:: @ 8384E00 - warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE - -Route124_MapBGEvents:: @ 8384E08 - bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF - -Route124_MapEvents:: @ 8384E14 - map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc deleted file mode 100644 index e165c9da8..000000000 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ /dev/null @@ -1,12 +0,0 @@ -Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0 - -Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 - warp_def 3, 8, 0, 0, MAP_ROUTE124 - warp_def 4, 8, 0, 0, MAP_ROUTE124 - -Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 - -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 - map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc deleted file mode 100644 index 8ad4ce22a..000000000 --- a/data/maps/events/Route125.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route125_EventObjects:: @ 8384E28 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, 23, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, 10, 2, 5, 1, 2, Route125_EventScript_151F45, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, 28, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, 52, 9, 9, 1, 3, Route125_EventScript_151F73, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, 14, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 - -Route125_MapWarps:: @ 8384ED0 - warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM - -Route125_MapBGEvents:: @ 8384ED8 - 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:: @ 8384F08 - map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc deleted file mode 100644 index f90152ea4..000000000 --- a/data/maps/events/Route126.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route126_EventObjects:: @ 8384F1C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, 51, 10, 3, 1, 3, Route126_EventScript_15200E, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, 28, 9, 0, 1, 3, Route126_EventScript_152025, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, 7, 0, 0, 1, 3, Route126_EventScript_15203C, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, 24, 0, 0, 1, 3, Route126_EventScript_152053, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1 - -Route126_MapEvents:: @ 8384F94 - map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc deleted file mode 100644 index 66078b122..000000000 --- a/data/maps/events/Route127.inc +++ /dev/null @@ -1,20 +0,0 @@ -Route127_EventObjects:: @ 8384FA8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, 14, 0, 0, 1, 2, Route127_EventScript_15207A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, 21, 0, 0, 1, 4, Route127_EventScript_152091, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, 7, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, 8, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, 24, 1, 1, 1, 2, Route127_EventScript_152104, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 - -Route127_MapBGEvents:: @ 8385080 - 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:: @ 83850BC - map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc deleted file mode 100644 index 9ea71c52e..000000000 --- a/data/maps/events/Route128.inc +++ /dev/null @@ -1,17 +0,0 @@ -Route128_EventObjects:: @ 83850D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, 48, 5, 5, 1, 3, Route128_EventScript_1522A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, 28, 5, 0, 1, 7, Route128_EventScript_1522E2, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128 - object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128 - object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_15234E, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, 17, 1, 1, 1, 2, Route128_EventScript_152337, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_152320, 0 - -Route128_MapBGEvents:: @ 8385190 - bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C - bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5D - bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E - -Route128_MapEvents:: @ 83851B4 - map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc deleted file mode 100644 index e86dd6ce0..000000000 --- a/data/maps/events/Route129.inc +++ /dev/null @@ -1,8 +0,0 @@ -Route129_EventObjects:: @ 83851C8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, 50, 3, 4, 1, 3, Route129_EventScript_152366, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, 52, 5, 2, 1, 2, Route129_EventScript_15237D, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, 1, 1, 1, 1, 2, Route129_EventScript_1523AB, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 24, 1, 1, 1, 2, Route129_EventScript_152394, 0 - -Route129_MapEvents:: @ 8385228 - map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc deleted file mode 100644 index f6770fa34..000000000 --- a/data/maps/events/Route130.inc +++ /dev/null @@ -1,7 +0,0 @@ -Route130_EventObjects:: @ 838523C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, 29, 3, 6, 1, 3, Route130_EventScript_152410, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, 13, 1, 1, 1, 3, Route130_EventScript_152427, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11 - -Route130_MapEvents:: @ 8385284 - map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc deleted file mode 100644 index 0d61e6f95..000000000 --- a/data/maps/events/Route131.inc +++ /dev/null @@ -1,13 +0,0 @@ -Route131_EventObjects:: @ 8385298 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, 29, 5, 7, 1, 3, Route131_EventScript_152452, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, 8, 0, 0, 1, 3, Route131_EventScript_152469, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, 7, 0, 0, 1, 4, Route131_EventScript_152480, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, 47, 1, 4, 1, 3, Route131_EventScript_152497, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524AE, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524C9, 0 - -Route131_MapWarps:: @ 8385328 - warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE - -Route131_MapEvents:: @ 8385330 - map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc deleted file mode 100644 index 167fbfd4b..000000000 --- a/data/maps/events/Route132.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route132_EventObjects:: @ 8385344 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, 46, 3, 3, 1, 2, Route132_EventScript_1524E5, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, 49, 4, 4, 1, 2, Route132_EventScript_1524FC, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, 10, 0, 0, 1, 4, Route132_EventScript_15252A, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, 8, 0, 0, 1, 1, Route132_EventScript_152513, 0 - -Route132_MapEvents:: @ 83853BC - map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc deleted file mode 100644 index d71755575..000000000 --- a/data/maps/events/Route133.inc +++ /dev/null @@ -1,11 +0,0 @@ -Route133_EventObjects:: @ 83853D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, 1, 0, 0, 1, 3, Route133_EventScript_152542, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152570, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152559, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, 13, 1, 1, 1, 1, Route133_EventScript_15259E, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, 10, 0, 0, 1, 4, Route133_EventScript_152587, 0 - -Route133_MapEvents:: @ 8385478 - map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc deleted file mode 100644 index b167d48b1..000000000 --- a/data/maps/events/Route134.inc +++ /dev/null @@ -1,9 +0,0 @@ -Route134_EventObjects:: @ 838548C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1525C4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, 1, 0, 0, 1, 3, Route134_EventScript_1525DB, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 1, Route134_EventScript_152609, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, 18, 0, 0, 1, 2, Route134_EventScript_1525F2, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, 27, 10, 0, 1, 3, Route134_EventScript_152620, 0 - -Route134_MapEvents:: @ 8385504 - map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc deleted file mode 100644 index bfc6cff77..000000000 --- a/data/maps/events/RustboroCity.inc +++ /dev/null @@ -1,59 +0,0 @@ -RustboroCity_EventObjects:: @ 837FD14 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0 - object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO - -RustboroCity_MapWarps:: @ 837FE64 - 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:: @ 837FEC4 - coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 - coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 - coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF - coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 - coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 - coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D - coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 - -RustboroCity_MapBGEvents:: @ 837FF94 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413 - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 - -RustboroCity_MapEvents:: @ 838000C - map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc deleted file mode 100644 index 6a96e223c..000000000 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_CuttersHouse_EventObjects:: @ 8388D9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0 - -RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC - warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY - -RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC - map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc deleted file mode 100644 index 5cfbd5134..000000000 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_DevonCorp_1F_EventObjects:: @ 838880C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0 - -RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 - 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_MapEvents:: @ 838886C - map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc deleted file mode 100644 index 1babeffd7..000000000 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ /dev/null @@ -1,13 +0,0 @@ -RustboroCity_DevonCorp_2F_EventObjects:: @ 8388880 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0 - -RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 - 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:: @ 8388908 - map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc deleted file mode 100644 index b77f343af..000000000 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_DevonCorp_3F_EventObjects:: @ 838891C - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 - -RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 - warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F - -RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C - bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF - bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF - -RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 - map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc deleted file mode 100644 index 22a262f47..000000000 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_Flat1_1F_EventObjects:: @ 8388CB8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0 - -RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 - 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:: @ 8388D00 - map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc deleted file mode 100644 index e906fe011..000000000 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ /dev/null @@ -1,8 +0,0 @@ -RustboroCity_Flat1_2F_EventObjects:: @ 8388D14 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0 - -RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C - warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F - -RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 - map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc deleted file mode 100644 index 76ed3f04e..000000000 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_Flat2_1F_EventObjects:: @ 8388E44 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0 - -RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 - 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:: @ 8388E8C - map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc deleted file mode 100644 index 3f56e718c..000000000 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_Flat2_2F_EventObjects:: @ 8388EA0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0 - -RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 - 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:: @ 8388EE0 - map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc deleted file mode 100644 index ed3ef80e7..000000000 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ /dev/null @@ -1,9 +0,0 @@ -RustboroCity_Flat2_3F_EventObjects:: @ 8388EF4 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0 - -RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 - warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F - -RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C - map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc deleted file mode 100644 index 97b5a6627..000000000 --- a/data/maps/events/RustboroCity_Gym.inc +++ /dev/null @@ -1,16 +0,0 @@ -RustboroCity_Gym_EventObjects:: @ 8388998 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, 10, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0 - -RustboroCity_Gym_MapWarps:: @ 83889F8 - warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY - warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY - -RustboroCity_Gym_MapBGEvents:: @ 8388A08 - bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD - bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD - -RustboroCity_Gym_MapEvents:: @ 8388A20 - map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc deleted file mode 100644 index 5a8023d2f..000000000 --- a/data/maps/events/RustboroCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_House1_EventObjects:: @ 8388D48 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0 - -RustboroCity_House1_MapWarps:: @ 8388D78 - warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY - warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY - -RustboroCity_House1_MapEvents:: @ 8388D88 - map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc deleted file mode 100644 index 4a7a60f12..000000000 --- a/data/maps/events/RustboroCity_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -RustboroCity_House2_EventObjects:: @ 8388DF0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0 - -RustboroCity_House2_MapWarps:: @ 8388E20 - warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY - -RustboroCity_House2_MapEvents:: @ 8388E30 - map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc deleted file mode 100644 index bdd17333c..000000000 --- a/data/maps/events/RustboroCity_House3.inc +++ /dev/null @@ -1,11 +0,0 @@ -RustboroCity_House3_EventObjects:: @ 8388F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0 - -RustboroCity_House3_MapWarps:: @ 8388F88 - warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY - warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY - -RustboroCity_House3_MapEvents:: @ 8388F98 - map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc deleted file mode 100644 index b39aec815..000000000 --- a/data/maps/events/RustboroCity_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -RustboroCity_Mart_EventObjects:: @ 8388C34 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0 - -RustboroCity_Mart_MapWarps:: @ 8388C94 - warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY - warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY - -RustboroCity_Mart_MapEvents:: @ 8388CA4 - map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc deleted file mode 100644 index 7173fb49c..000000000 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0 - -RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 - 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:: @ 8388B9C - map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc deleted file mode 100644 index bf5737d14..000000000 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 - -RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 - warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 - map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc deleted file mode 100644 index fc3f934fa..000000000 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ /dev/null @@ -1,21 +0,0 @@ -RustboroCity_PokemonSchool_EventObjects:: @ 8388A34 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0 - -RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 - warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY - warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY - -RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 - bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5 - -RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 - map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc deleted file mode 100644 index 9dda724af..000000000 --- a/data/maps/events/RusturfTunnel.inc +++ /dev/null @@ -1,26 +0,0 @@ -RusturfTunnel_EventObjects:: @ 838BD2C - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL - -RusturfTunnel_MapWarps:: @ 838BE1C - 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:: @ 838BE34 - coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 - coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F - coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 - -RusturfTunnel_MapEvents:: @ 838BE84 - map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc deleted file mode 100644 index 0e034da5c..000000000 --- a/data/maps/events/SSTidalCorridor.inc +++ /dev/null @@ -1,33 +0,0 @@ -SSTidalCorridor_EventObjects:: @ 83916F8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL - -SSTidalCorridor_MapWarps:: @ 8391758 - 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:: @ 83917A0 - bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2 - bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB - bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4 - bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD - -SSTidalCorridor_MapEvents:: @ 8391830 - map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc deleted file mode 100644 index c9cbf6715..000000000 --- a/data/maps/events/SSTidalLowerDeck.inc +++ /dev/null @@ -1,12 +0,0 @@ -SSTidalLowerDeck_EventObjects:: @ 8391844 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0 - -SSTidalLowerDeck_MapWarps:: @ 8391874 - warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR - -SSTidalLowerDeck_MapBGEvents:: @ 839187C - bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23 - -SSTidalLowerDeck_MapEvents:: @ 8391888 - map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc deleted file mode 100644 index e86c60ed6..000000000 --- a/data/maps/events/SSTidalRooms.inc +++ /dev/null @@ -1,30 +0,0 @@ -SSTidalRooms_EventObjects:: @ 839189C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL - -SSTidalRooms_MapWarps:: @ 839195C - 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:: @ 83919BC - bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 - -SSTidalRooms_MapEvents:: @ 83919D4 - map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc deleted file mode 100644 index ed750532f..000000000 --- a/data/maps/events/SafariZone_Northeast.inc +++ /dev/null @@ -1,13 +0,0 @@ -SafariZone_Northeast_EventObjects:: @ 8391A2C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 - -SafariZone_Northeast_MapEvents:: @ 8391B04 - map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc deleted file mode 100644 index 18a6db38e..000000000 --- a/data/maps/events/SafariZone_Northwest.inc +++ /dev/null @@ -1,6 +0,0 @@ -SafariZone_Northwest_EventObjects:: @ 83919E8 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 - -SafariZone_Northwest_MapEvents:: @ 8391A18 - map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc deleted file mode 100644 index 8ed841ff1..000000000 --- a/data/maps/events/SafariZone_RestHouse.inc +++ /dev/null @@ -1,11 +0,0 @@ -SafariZone_RestHouse_EventObjects:: @ 8391EC0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0 - -SafariZone_RestHouse_MapWarps:: @ 8391F08 - warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST - -SafariZone_RestHouse_MapEvents:: @ 8391F18 - map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc deleted file mode 100644 index a18b2b394..000000000 --- a/data/maps/events/SafariZone_Southeast.inc +++ /dev/null @@ -1,11 +0,0 @@ -SafariZone_Southeast_EventObjects:: @ 8391B70 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0 - -SafariZone_Southeast_MapWarps:: @ 8391BD0 - warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE - -SafariZone_Southeast_MapEvents:: @ 8391BD8 - map_events SafariZone_Southeast_EventObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc deleted file mode 100644 index 909997d64..000000000 --- a/data/maps/events/SafariZone_Southwest.inc +++ /dev/null @@ -1,12 +0,0 @@ -SafariZone_Southwest_EventObjects:: @ 8391B18 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST - -SafariZone_Southwest_MapWarps:: @ 8391B48 - warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE - -SafariZone_Southwest_MapBGEvents:: @ 8391B50 - bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D - -SafariZone_Southwest_MapEvents:: @ 8391B5C - map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc deleted file mode 100644 index a90403222..000000000 --- a/data/maps/events/ScorchedSlab.inc +++ /dev/null @@ -1,8 +0,0 @@ -ScorchedSlab_EventObjects:: @ 838E988 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1 - -ScorchedSlab_MapWarps:: @ 838E9A0 - warp_def 7, 16, 1, 1, MAP_ROUTE120 - -ScorchedSlab_MapEvents:: @ 838E9A8 - map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc deleted file mode 100644 index 4f6fa0c07..000000000 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ /dev/null @@ -1,6 +0,0 @@ -SeafloorCavern_Entrance_MapWarps:: @ 838D094 - warp_def 10, 18, 3, 0, MAP_UNDERWATER4 - warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 - -SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 - map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc deleted file mode 100644 index cb6442135..000000000 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ /dev/null @@ -1,14 +0,0 @@ -SeafloorCavern_Room1_EventObjects:: @ 838D0B8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN - -SeafloorCavern_Room1_MapWarps:: @ 838D130 - 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:: @ 838D148 - map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc deleted file mode 100644 index eefcffd2e..000000000 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room2_EventObjects:: @ 838D15C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - -SeafloorCavern_Room2_MapWarps:: @ 838D234 - warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 - warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 - warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 - warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 - -SeafloorCavern_Room2_MapEvents:: @ 838D254 - map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc deleted file mode 100644 index 5f8f769d3..000000000 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ /dev/null @@ -1,19 +0,0 @@ -SeafloorCavern_Room3_EventObjects:: @ 838D268 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN - -SeafloorCavern_Room3_MapWarps:: @ 838D358 - warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 - warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 - warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 - -SeafloorCavern_Room3_MapEvents:: @ 838D370 - map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc deleted file mode 100644 index a31f0f5d8..000000000 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ /dev/null @@ -1,11 +0,0 @@ -SeafloorCavern_Room4_EventObjects:: @ 838D384 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, 23, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN - -SeafloorCavern_Room4_MapWarps:: @ 838D39C - 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:: @ 838D3BC - map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc deleted file mode 100644 index 767fa6dc1..000000000 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ /dev/null @@ -1,15 +0,0 @@ -SeafloorCavern_Room5_EventObjects:: @ 838D3D0 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - -SeafloorCavern_Room5_MapWarps:: @ 838D460 - 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:: @ 838D478 - map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/events/SeafloorCavern_Room6.inc deleted file mode 100644 index adf36455a..000000000 --- a/data/maps/events/SeafloorCavern_Room6.inc +++ /dev/null @@ -1,7 +0,0 @@ -SeafloorCavern_Room6_MapWarps:: @ 838D48C - 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:: @ 838D4A4 - map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/events/SeafloorCavern_Room7.inc deleted file mode 100644 index 616376e32..000000000 --- a/data/maps/events/SeafloorCavern_Room7.inc +++ /dev/null @@ -1,6 +0,0 @@ -SeafloorCavern_Room7_MapWarps:: @ 838D4B8 - warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 - warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room7_MapEvents:: @ 838D4C8 - map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc deleted file mode 100644 index 450eb894a..000000000 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ /dev/null @@ -1,20 +0,0 @@ -SeafloorCavern_Room8_EventObjects:: @ 838D4DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C - -SeafloorCavern_Room8_MapWarps:: @ 838D5FC - warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 - warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 - -SeafloorCavern_Room8_MapEvents:: @ 838D60C - map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc deleted file mode 100644 index f4efdbcc0..000000000 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ /dev/null @@ -1,17 +0,0 @@ -SeafloorCavern_Room9_EventObjects:: @ 838D620 - object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN - object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN - object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1 - object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN - -SeafloorCavern_Room9_MapWarps:: @ 838D6C8 - warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 - -SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 - coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA - -SeafloorCavern_Room9_MapEvents:: @ 838D6E0 - map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/events/SealedChamber_InnerRoom.inc deleted file mode 100644 index a457a4e03..000000000 --- a/data/maps/events/SealedChamber_InnerRoom.inc +++ /dev/null @@ -1,16 +0,0 @@ -SealedChamber_InnerRoom_MapWarps:: @ 838E900 - warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM - -SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 - bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F249 - bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F257 - bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F265 - bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F273 - bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F281 - bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F28F - bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - -SealedChamber_InnerRoom_MapEvents:: @ 838E974 - map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/events/SealedChamber_OuterRoom.inc deleted file mode 100644 index 634f41f60..000000000 --- a/data/maps/events/SealedChamber_OuterRoom.inc +++ /dev/null @@ -1,36 +0,0 @@ -SealedChamber_OuterRoom_MapWarps:: @ 838E788 - warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM - -SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 - bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F18E - bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1AA - bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1B8 - bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 - bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 - -SealedChamber_OuterRoom_MapEvents:: @ 838E8EC - map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc deleted file mode 100644 index 7f883e7e9..000000000 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BlueCave1_EventObjects:: @ 838F18C - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BlueCave1_MapWarps:: @ 838F2F4 - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BlueCave1_MapEvents:: @ 838F2FC - map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc deleted file mode 100644 index 93e7b67f8..000000000 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BlueCave2_EventObjects:: @ 838FAA4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BlueCave2_MapWarps:: @ 838FC0C - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_BlueCave2_MapEvents:: @ 838FC14 - map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc deleted file mode 100644 index bb761d2e8..000000000 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BlueCave3_EventObjects:: @ 83903BC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BlueCave3_MapWarps:: @ 8390524 - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave3_MapEvents:: @ 839052C - map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc deleted file mode 100644 index 082600bec..000000000 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BlueCave4_EventObjects:: @ 8390CD4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BlueCave4_MapWarps:: @ 8390E3C - warp_def 4, 15, 0, 126, MAP_NONE - -SecretBase_BlueCave4_MapEvents:: @ 8390E44 - map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc deleted file mode 100644 index c3219bf43..000000000 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BrownCave1_EventObjects:: @ 838F008 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BrownCave1_MapWarps:: @ 838F170 - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave1_MapEvents:: @ 838F178 - map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc deleted file mode 100644 index e57348a00..000000000 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BrownCave2_EventObjects:: @ 838F920 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BrownCave2_MapWarps:: @ 838FA88 - warp_def 1, 7, 0, 126, MAP_NONE - -SecretBase_BrownCave2_MapEvents:: @ 838FA90 - map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc deleted file mode 100644 index c1003816a..000000000 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BrownCave3_EventObjects:: @ 8390238 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BrownCave3_MapWarps:: @ 83903A0 - warp_def 11, 9, 0, 126, MAP_NONE - -SecretBase_BrownCave3_MapEvents:: @ 83903A8 - map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc deleted file mode 100644 index 02afc20c4..000000000 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_BrownCave4_EventObjects:: @ 8390B50 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_BrownCave4_MapWarps:: @ 8390CB8 - warp_def 2, 8, 0, 126, MAP_NONE - -SecretBase_BrownCave4_MapEvents:: @ 8390CC0 - map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc deleted file mode 100644 index 18fea4c40..000000000 --- a/data/maps/events/SecretBase_RedCave1.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_RedCave1_EventObjects:: @ 838EE84 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_RedCave1_MapWarps:: @ 838EFEC - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_RedCave1_MapEvents:: @ 838EFF4 - map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc deleted file mode 100644 index 1d9bdde09..000000000 --- a/data/maps/events/SecretBase_RedCave2.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_RedCave2_EventObjects:: @ 838F79C - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_RedCave2_MapWarps:: @ 838F904 - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_RedCave2_MapEvents:: @ 838F90C - map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc deleted file mode 100644 index 923616945..000000000 --- a/data/maps/events/SecretBase_RedCave3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_RedCave3_EventObjects:: @ 83900B4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_RedCave3_MapWarps:: @ 839021C - warp_def 3, 6, 0, 126, MAP_NONE - -SecretBase_RedCave3_MapEvents:: @ 8390224 - map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc deleted file mode 100644 index 25a0f2ec6..000000000 --- a/data/maps/events/SecretBase_RedCave4.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_RedCave4_EventObjects:: @ 83909CC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_RedCave4_MapWarps:: @ 8390B34 - warp_def 2, 12, 0, 126, MAP_NONE - -SecretBase_RedCave4_MapEvents:: @ 8390B3C - map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc deleted file mode 100644 index e1583e86d..000000000 --- a/data/maps/events/SecretBase_Shrub1.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Shrub1_EventObjects:: @ 838F618 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Shrub1_MapWarps:: @ 838F780 - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Shrub1_MapEvents:: @ 838F788 - map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc deleted file mode 100644 index 72bdcc380..000000000 --- a/data/maps/events/SecretBase_Shrub2.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Shrub2_EventObjects:: @ 838FF30 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Shrub2_MapWarps:: @ 8390098 - warp_def 7, 5, 0, 126, MAP_NONE - -SecretBase_Shrub2_MapEvents:: @ 83900A0 - map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc deleted file mode 100644 index b09c206e7..000000000 --- a/data/maps/events/SecretBase_Shrub3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Shrub3_EventObjects:: @ 8390848 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Shrub3_MapWarps:: @ 83909B0 - warp_def 6, 9, 0, 126, MAP_NONE - -SecretBase_Shrub3_MapEvents:: @ 83909B8 - map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc deleted file mode 100644 index a9f636e54..000000000 --- a/data/maps/events/SecretBase_Shrub4.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Shrub4_EventObjects:: @ 8391160 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Shrub4_MapWarps:: @ 83912C8 - warp_def 11, 8, 0, 126, MAP_NONE - -SecretBase_Shrub4_MapEvents:: @ 83912D0 - map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc deleted file mode 100644 index 467789f32..000000000 --- a/data/maps/events/SecretBase_Tree1.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Tree1_EventObjects:: @ 838F494 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Tree1_MapWarps:: @ 838F5FC - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_Tree1_MapEvents:: @ 838F604 - map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc deleted file mode 100644 index ef2280e01..000000000 --- a/data/maps/events/SecretBase_Tree2.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Tree2_EventObjects:: @ 838FDAC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Tree2_MapWarps:: @ 838FF14 - warp_def 3, 14, 0, 126, MAP_NONE - -SecretBase_Tree2_MapEvents:: @ 838FF1C - map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc deleted file mode 100644 index 25bc95466..000000000 --- a/data/maps/events/SecretBase_Tree3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Tree3_EventObjects:: @ 83906C4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Tree3_MapWarps:: @ 839082C - warp_def 8, 6, 0, 126, MAP_NONE - -SecretBase_Tree3_MapEvents:: @ 8390834 - map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc deleted file mode 100644 index 6f0e5b3b5..000000000 --- a/data/maps/events/SecretBase_Tree4.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_Tree4_EventObjects:: @ 8390FDC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_Tree4_MapWarps:: @ 8391144 - warp_def 7, 12, 0, 126, MAP_NONE - -SecretBase_Tree4_MapEvents:: @ 839114C - map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc deleted file mode 100644 index 930cbc21d..000000000 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_YellowCave1_EventObjects:: @ 838F310 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_YellowCave1_MapWarps:: @ 838F478 - warp_def 5, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave1_MapEvents:: @ 838F480 - map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc deleted file mode 100644 index fd3e265e5..000000000 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_YellowCave2_EventObjects:: @ 838FC28 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_YellowCave2_MapWarps:: @ 838FD90 - warp_def 12, 7, 0, 126, MAP_NONE - -SecretBase_YellowCave2_MapEvents:: @ 838FD98 - map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc deleted file mode 100644 index 99f0ae8b4..000000000 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_YellowCave3_EventObjects:: @ 8390540 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_YellowCave3_MapWarps:: @ 83906A8 - warp_def 5, 9, 0, 126, MAP_NONE - -SecretBase_YellowCave3_MapEvents:: @ 83906B0 - map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc deleted file mode 100644 index af59e0067..000000000 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ /dev/null @@ -1,22 +0,0 @@ -SecretBase_YellowCave4_EventObjects:: @ 8390E58 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 - -SecretBase_YellowCave4_MapWarps:: @ 8390FC0 - warp_def 6, 12, 0, 126, MAP_NONE - -SecretBase_YellowCave4_MapEvents:: @ 8390FC8 - map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/events/ShoalCave_HighTideEntranceRoom.inc deleted file mode 100644 index c7225843f..000000000 --- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc +++ /dev/null @@ -1,2 +0,0 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: @ 838DEAC - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/events/ShoalCave_HighTideInnerRoom.inc deleted file mode 100644 index e7951742a..000000000 --- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc +++ /dev/null @@ -1,2 +0,0 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: @ 838DEC0 - map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc deleted file mode 100644 index fe4a2eae9..000000000 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ /dev/null @@ -1,12 +0,0 @@ -ShoalCave_LowTideEntranceRoom_EventObjects:: @ 838DCDC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0 - -ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C - 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:: @ 838DD2C - map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc deleted file mode 100644 index 87d291c40..000000000 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ /dev/null @@ -1,9 +0,0 @@ -ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 - -ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 - warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM - -ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 - map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc deleted file mode 100644 index 746f36cdc..000000000 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ /dev/null @@ -1,23 +0,0 @@ -ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 - -ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 - 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:: @ 838DD98 - bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 - bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365 - bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257 - bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293 - bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 - bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 - -ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 - map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc deleted file mode 100644 index 6ff9a44b3..000000000 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ /dev/null @@ -1,15 +0,0 @@ -ShoalCave_LowTideLowerRoom_EventObjects:: @ 838DE3C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0 - -ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C - 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:: @ 838DE8C - bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 - -ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 - map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc deleted file mode 100644 index 65570d256..000000000 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ /dev/null @@ -1,12 +0,0 @@ -ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 - -ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C - 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:: @ 838DE1C - bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 - -ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 - map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc deleted file mode 100644 index e6da2e027..000000000 --- a/data/maps/events/SingleBattleColosseum.inc +++ /dev/null @@ -1,13 +0,0 @@ -SingleBattleColosseum_EventObjects:: @ 83912E4 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0 - -SingleBattleColosseum_MapWarps:: @ 83912FC - warp_def 6, 8, 3, 127, MAP_NONE - warp_def 7, 8, 3, 127, MAP_NONE - -SingleBattleColosseum_MapCoordEvents:: @ 839130C - coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 - -SingleBattleColosseum_MapEvents:: @ 839132C - map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/events/SkyPillar_1F.inc deleted file mode 100644 index 2af7aaa76..000000000 --- a/data/maps/events/SkyPillar_1F.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_1F_MapWarps:: @ 838ED38 - 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:: @ 838ED50 - map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/events/SkyPillar_2F.inc deleted file mode 100644 index 48fcb9fec..000000000 --- a/data/maps/events/SkyPillar_2F.inc +++ /dev/null @@ -1,6 +0,0 @@ -SkyPillar_2F_MapWarps:: @ 838ED64 - warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F - warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F - -SkyPillar_2F_MapEvents:: @ 838ED74 - map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/events/SkyPillar_3F.inc deleted file mode 100644 index 4aeda3339..000000000 --- a/data/maps/events/SkyPillar_3F.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_3F_MapWarps:: @ 838ED88 - 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:: @ 838EDA0 - map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/events/SkyPillar_4F.inc deleted file mode 100644 index 3e908ed74..000000000 --- a/data/maps/events/SkyPillar_4F.inc +++ /dev/null @@ -1,7 +0,0 @@ -SkyPillar_4F_MapWarps:: @ 838EDB4 - 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:: @ 838EDCC - map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/events/SkyPillar_5F.inc deleted file mode 100644 index badae77af..000000000 --- a/data/maps/events/SkyPillar_5F.inc +++ /dev/null @@ -1,6 +0,0 @@ -SkyPillar_5F_MapWarps:: @ 838EE2C - warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F - warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP - -SkyPillar_5F_MapEvents:: @ 838EE3C - map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/events/SkyPillar_Entrance.inc deleted file mode 100644 index 904b3b9ae..000000000 --- a/data/maps/events/SkyPillar_Entrance.inc +++ /dev/null @@ -1,6 +0,0 @@ -SkyPillar_Entrance_MapWarps:: @ 838ECF0 - warp_def 6, 16, 3, 0, MAP_ROUTE131 - warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE - -SkyPillar_Entrance_MapEvents:: @ 838ED00 - map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/events/SkyPillar_Outside.inc deleted file mode 100644 index 120cd982b..000000000 --- a/data/maps/events/SkyPillar_Outside.inc +++ /dev/null @@ -1,6 +0,0 @@ -SkyPillar_Outside_MapWarps:: @ 838ED14 - warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE - warp_def 14, 5, 3, 0, MAP_SKY_PILLAR_1F - -SkyPillar_Outside_MapEvents:: @ 838ED24 - map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc deleted file mode 100644 index 9fc989c78..000000000 --- a/data/maps/events/SkyPillar_Top.inc +++ /dev/null @@ -1,8 +0,0 @@ -SkyPillar_Top_EventObjects:: @ 838EE50 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA - -SkyPillar_Top_MapWarps:: @ 838EE68 - warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F - -SkyPillar_Top_MapEvents:: @ 838EE70 - map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc deleted file mode 100644 index 685bc7359..000000000 --- a/data/maps/events/SlateportCity.inc +++ /dev/null @@ -1,62 +0,0 @@ -SlateportCity_EventObjects:: @ 837F7AC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0 - object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0 - object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0 - object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0 - object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0 - object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0 - object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0 - object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT - object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0 - object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT - -SlateportCity_MapWarps:: @ 837FA94 - 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_CONTEST_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_MapBGEvents:: @ 837FAEC - bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF - bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91 - bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88 - bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76 - bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F - bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D - bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33 - bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C - -SlateportCity_MapEvents:: @ 837FB7C - map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc deleted file mode 100644 index b2a57ccc9..000000000 --- a/data/maps/events/SlateportCity_ContestHall.inc +++ /dev/null @@ -1,25 +0,0 @@ -SlateportCity_ContestHall_EventObjects:: @ 83878A4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, 2, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, 2, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0 - object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0 - object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0 - object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, 10, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, 9, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, 2, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0 - -SlateportCity_ContestHall_MapWarps:: @ 83879DC - warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY - warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY - -SlateportCity_ContestHall_MapBGEvents:: @ 83879EC - bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 - bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 - -SlateportCity_ContestHall_MapEvents:: @ 8387A04 - map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc deleted file mode 100644 index 8981bf455..000000000 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ /dev/null @@ -1,23 +0,0 @@ -SlateportCity_ContestLobby_EventObjects:: @ 8387788 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, 3, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, 2, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT - object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0 - -SlateportCity_ContestLobby_MapWarps:: @ 8387848 - warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY - warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY - warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL - -SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 - bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 - bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E - bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F - bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D - -SlateportCity_ContestLobby_MapEvents:: @ 8387890 - map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc deleted file mode 100644 index a7581ab2a..000000000 --- a/data/maps/events/SlateportCity_Harbor.inc +++ /dev/null @@ -1,24 +0,0 @@ -SlateportCity_Harbor_EventObjects:: @ 8387F30 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR - -SlateportCity_Harbor_MapWarps:: @ 8387FF0 - 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:: @ 8388010 - coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B - coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 - coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 - coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF - -SlateportCity_Harbor_MapEvents:: @ 8388050 - map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc deleted file mode 100644 index bc83e91ce..000000000 --- a/data/maps/events/SlateportCity_House1.inc +++ /dev/null @@ -1,9 +0,0 @@ -SlateportCity_House1_EventObjects:: @ 8387A18 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0 - -SlateportCity_House1_MapWarps:: @ 8387A30 - warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY - -SlateportCity_House1_MapEvents:: @ 8387A40 - map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc deleted file mode 100644 index d115e8225..000000000 --- a/data/maps/events/SlateportCity_House2.inc +++ /dev/null @@ -1,10 +0,0 @@ -SlateportCity_House2_EventObjects:: @ 8388064 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0 - -SlateportCity_House2_MapWarps:: @ 8388094 - warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY - -SlateportCity_House2_MapEvents:: @ 83880A4 - map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc deleted file mode 100644 index abf6ebdce..000000000 --- a/data/maps/events/SlateportCity_Mart.inc +++ /dev/null @@ -1,11 +0,0 @@ -SlateportCity_Mart_EventObjects:: @ 83881B0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0 - -SlateportCity_Mart_MapWarps:: @ 83881F8 - warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY - warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY - -SlateportCity_Mart_MapEvents:: @ 8388208 - map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc deleted file mode 100644 index 825c589de..000000000 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ /dev/null @@ -1,42 +0,0 @@ -SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - -SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 - 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:: @ 8387CA0 - coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 - coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 - -SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 - bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 - bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB - bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D - bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D - -SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C - map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc deleted file mode 100644 index bb52f2403..000000000 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ /dev/null @@ -1,37 +0,0 @@ -SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - -SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 - warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F - -SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 - bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - -SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C - map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc deleted file mode 100644 index d4d9ab405..000000000 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -SlateportCity_PokemonCenter_1F_EventObjects:: @ 83880B8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0 - -SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 - 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:: @ 8388118 - map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc deleted file mode 100644 index df2da68bb..000000000 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -SlateportCity_PokemonCenter_2F_EventObjects:: @ 838812C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0 - -SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 - warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C - map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc deleted file mode 100644 index 55b0a693d..000000000 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ /dev/null @@ -1,16 +0,0 @@ -SlateportCity_PokemonFanClub_EventObjects:: @ 8387A54 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0 - -SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 - warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY - warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY - -SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 - map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc deleted file mode 100644 index cd5c7c25b..000000000 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ /dev/null @@ -1,13 +0,0 @@ -SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD - -SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 - 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:: @ 8387710 - map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc deleted file mode 100644 index aa5c02e40..000000000 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ /dev/null @@ -1,10 +0,0 @@ -SlateportCity_SternsShipyard_2F_EventObjects:: @ 8387724 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0 - -SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C - warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F - -SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 - map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc deleted file mode 100644 index cb793ea47..000000000 --- a/data/maps/events/SootopolisCity.inc +++ /dev/null @@ -1,40 +0,0 @@ -SootopolisCity_EventObjects:: @ 8380608 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, 9, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - -SootopolisCity_MapWarps:: @ 8380710 - 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_HOUSE8 - -SootopolisCity_MapCoordEvents:: @ 8380770 - coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 - -SootopolisCity_MapBGEvents:: @ 8380780 - bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED - bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 - -SootopolisCity_MapEvents:: @ 83807C8 - map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc deleted file mode 100644 index 43cd0fe75..000000000 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_1F_EventObjects:: @ 838ACF0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0 - -SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 - 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:: @ 838AD38 - bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 - bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3 - -SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 - map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc deleted file mode 100644 index 9ccf07ef6..000000000 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ /dev/null @@ -1,15 +0,0 @@ -SootopolisCity_Gym_B1F_EventObjects:: @ 838AD64 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, 10, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, 10, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, 9, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 8, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0 - -SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 - warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F - -SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C - map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc deleted file mode 100644 index a4b4c7932..000000000 --- a/data/maps/events/SootopolisCity_House1.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House1_EventObjects:: @ 838AFA4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0 - -SootopolisCity_House1_MapWarps:: @ 838AFD4 - warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House1_MapEvents:: @ 838AFE4 - map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc deleted file mode 100644 index 146a1d871..000000000 --- a/data/maps/events/SootopolisCity_House2.inc +++ /dev/null @@ -1,9 +0,0 @@ -SootopolisCity_House2_EventObjects:: @ 838AFF8 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0 - -SootopolisCity_House2_MapWarps:: @ 838B010 - warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House2_MapEvents:: @ 838B020 - map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc deleted file mode 100644 index d813189e8..000000000 --- a/data/maps/events/SootopolisCity_House3.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House3_EventObjects:: @ 838B034 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0 - -SootopolisCity_House3_MapWarps:: @ 838B064 - warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House3_MapEvents:: @ 838B074 - map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc deleted file mode 100644 index 128d0ff99..000000000 --- a/data/maps/events/SootopolisCity_House4.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_House4_EventObjects:: @ 838B088 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0 - -SootopolisCity_House4_MapWarps:: @ 838B0D0 - warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House4_MapEvents:: @ 838B0E0 - map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc deleted file mode 100644 index 2217f3e0f..000000000 --- a/data/maps/events/SootopolisCity_House5.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House5_EventObjects:: @ 838B0F4 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0 - -SootopolisCity_House5_MapWarps:: @ 838B124 - warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House5_MapEvents:: @ 838B134 - map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc deleted file mode 100644 index a189b98ba..000000000 --- a/data/maps/events/SootopolisCity_House6.inc +++ /dev/null @@ -1,9 +0,0 @@ -SootopolisCity_House6_EventObjects:: @ 838B148 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0 - -SootopolisCity_House6_MapWarps:: @ 838B160 - warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House6_MapEvents:: @ 838B170 - map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc deleted file mode 100644 index 39bc71e79..000000000 --- a/data/maps/events/SootopolisCity_House7.inc +++ /dev/null @@ -1,10 +0,0 @@ -SootopolisCity_House7_EventObjects:: @ 838B184 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0 - -SootopolisCity_House7_MapWarps:: @ 838B1B4 - warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House7_MapEvents:: @ 838B1C4 - map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc deleted file mode 100644 index d6b139f34..000000000 --- a/data/maps/events/SootopolisCity_House8.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_House8_EventObjects:: @ 838B1D8 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0 - -SootopolisCity_House8_MapWarps:: @ 838B208 - warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY - warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY - -SootopolisCity_House8_MapBGEvents:: @ 838B218 - bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 - bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531 - -SootopolisCity_House8_MapEvents:: @ 838B230 - map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc deleted file mode 100644 index 38d3f30f0..000000000 --- a/data/maps/events/SootopolisCity_Mart.inc +++ /dev/null @@ -1,11 +0,0 @@ -SootopolisCity_Mart_EventObjects:: @ 838AF38 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0 - -SootopolisCity_Mart_MapWarps:: @ 838AF80 - warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY - warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY - -SootopolisCity_Mart_MapEvents:: @ 838AF90 - map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc deleted file mode 100644 index 8852ba87c..000000000 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -SootopolisCity_PokemonCenter_1F_EventObjects:: @ 838AE40 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0 - -SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 - 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:: @ 838AEA0 - map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc deleted file mode 100644 index 2b6b7a022..000000000 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -SootopolisCity_PokemonCenter_2F_EventObjects:: @ 838AEB4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0 - -SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC - warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 - map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc deleted file mode 100644 index 38ff07de5..000000000 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ /dev/null @@ -1,13 +0,0 @@ -SouthernIsland_Exterior_EventObjects:: @ 8391E00 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 - -SouthernIsland_Exterior_MapWarps:: @ 8391E30 - warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR - warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR - -SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 - bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A - -SouthernIsland_Exterior_MapEvents:: @ 8391E4C - map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc deleted file mode 100644 index cba468ef7..000000000 --- a/data/maps/events/SouthernIsland_Interior.inc +++ /dev/null @@ -1,13 +0,0 @@ -SouthernIsland_Interior_EventObjects:: @ 8391E60 - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY - -SouthernIsland_Interior_MapWarps:: @ 8391E90 - warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR - warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR - -SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 - bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B - -SouthernIsland_Interior_MapEvents:: @ 8391EAC - map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc deleted file mode 100644 index bb69d402e..000000000 --- a/data/maps/events/TradeCenter.inc +++ /dev/null @@ -1,13 +0,0 @@ -TradeCenter_EventObjects:: @ 8391340 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0 - -TradeCenter_MapWarps:: @ 8391358 - warp_def 5, 8, 3, 127, MAP_NONE - warp_def 6, 8, 3, 127, MAP_NONE - -TradeCenter_MapCoordEvents:: @ 8391368 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA - -TradeCenter_MapEvents:: @ 8391388 - map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/events/Underwater1.inc b/data/maps/events/Underwater1.inc deleted file mode 100644 index 12b3cf72b..000000000 --- a/data/maps/events/Underwater1.inc +++ /dev/null @@ -1,11 +0,0 @@ -Underwater1_MapBGEvents:: @ 8385518 - bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_8 - bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_9 - bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_A - bg_hidden_item_event 64, 54, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_B - bg_hidden_item_event 70, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_D - bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_24 - bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_26 - -Underwater1_MapEvents:: @ 838556C - map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/events/Underwater2.inc b/data/maps/events/Underwater2.inc deleted file mode 100644 index a628cf972..000000000 --- a/data/maps/events/Underwater2.inc +++ /dev/null @@ -1,15 +0,0 @@ -Underwater2_MapWarps:: @ 8385580 - warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY - -Underwater2_MapBGEvents:: @ 8385588 - bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_E - bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_F - bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_10 - bg_hidden_item_event 10, 36, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_11 - bg_hidden_item_event 11, 39, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_13 - bg_hidden_item_event 12, 35, 3, ITEM_YELLOW_SHARD, FLAG_HIDDEN_ITEM_12 - bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_14 - bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_C - -Underwater2_MapEvents:: @ 83855E8 - map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/events/Underwater3.inc b/data/maps/events/Underwater3.inc deleted file mode 100644 index 62518bafa..000000000 --- a/data/maps/events/Underwater3.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater3_MapBGEvents:: @ 83855FC - bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_15 - bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_16 - bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_17 - bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_18 - -Underwater3_MapEvents:: @ 838562C - map_events 0x0, 0x0, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/events/Underwater4.inc b/data/maps/events/Underwater4.inc deleted file mode 100644 index fad99382b..000000000 --- a/data/maps/events/Underwater4.inc +++ /dev/null @@ -1,9 +0,0 @@ -Underwater4_MapWarps:: @ 8385640 - warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN - -Underwater4_MapBGEvents:: @ 8385648 - bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_19 - bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_1A - -Underwater4_MapEvents:: @ 8385660 - map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/events/Underwater_Route134.inc deleted file mode 100644 index 6dc462c80..000000000 --- a/data/maps/events/Underwater_Route134.inc +++ /dev/null @@ -1,5 +0,0 @@ -Underwater_Route134_MapWarps:: @ 838E744 - warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER - -Underwater_Route134_MapEvents:: @ 838E74C - map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc deleted file mode 100644 index 3b1798716..000000000 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ /dev/null @@ -1,11 +0,0 @@ -Underwater_SeafloorCavern_EventObjects:: @ 838D018 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - -Underwater_SeafloorCavern_MapWarps:: @ 838D078 - warp_def 6, 7, 0, 0, MAP_UNDERWATER4 - -Underwater_SeafloorCavern_MapEvents:: @ 838D080 - map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/events/Underwater_SealedChamber.inc deleted file mode 100644 index ede501142..000000000 --- a/data/maps/events/Underwater_SealedChamber.inc +++ /dev/null @@ -1,8 +0,0 @@ -Underwater_SealedChamber_MapWarps:: @ 838E760 - warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 - -Underwater_SealedChamber_MapBGEvents:: @ 838E768 - bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 - -Underwater_SealedChamber_MapEvents:: @ 838E774 - map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/events/Underwater_SootopolisCity.inc deleted file mode 100644 index f745dc557..000000000 --- a/data/maps/events/Underwater_SootopolisCity.inc +++ /dev/null @@ -1,6 +0,0 @@ -Underwater_SootopolisCity_MapWarps:: @ 838BE98 - warp_def 9, 8, 0, 0, MAP_UNDERWATER2 - warp_def 10, 8, 0, 0, MAP_UNDERWATER2 - -Underwater_SootopolisCity_MapEvents:: @ 838BEA8 - map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/events/UnknownMap_25_29.inc deleted file mode 100644 index 5f3412382..000000000 --- a/data/maps/events/UnknownMap_25_29.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_29_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/events/UnknownMap_25_30.inc deleted file mode 100644 index 8ce359a0b..000000000 --- a/data/maps/events/UnknownMap_25_30.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_30_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/events/UnknownMap_25_31.inc deleted file mode 100644 index f2eabe57f..000000000 --- a/data/maps/events/UnknownMap_25_31.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_31_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/events/UnknownMap_25_32.inc deleted file mode 100644 index aa0435850..000000000 --- a/data/maps/events/UnknownMap_25_32.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_32_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/events/UnknownMap_25_33.inc deleted file mode 100644 index db91b6ef5..000000000 --- a/data/maps/events/UnknownMap_25_33.inc +++ /dev/null @@ -1 +0,0 @@ -UnknownMap_25_33_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc deleted file mode 100644 index 7cca882bc..000000000 --- a/data/maps/events/UnknownMap_25_34.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_25_34_MapEvents:: @ 8391604 - map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc deleted file mode 100644 index 920703b72..000000000 --- a/data/maps/events/VerdanturfTown.inc +++ /dev/null @@ -1,27 +0,0 @@ -VerdanturfTown_EventObjects:: @ 8380F00 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0 - -VerdanturfTown_MapWarps:: @ 8380F60 - warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_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:: @ 8380F98 - bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA - bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3 - bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC - bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 - -VerdanturfTown_MapEvents:: @ 8380FF8 - map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc deleted file mode 100644 index 78224364f..000000000 --- a/data/maps/events/VerdanturfTown_ContestHall.inc +++ /dev/null @@ -1,15 +0,0 @@ -VerdanturfTown_ContestHall_EventObjects:: @ 8386AEC - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, 2, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, 2, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, 2, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0 - -VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 - warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY - warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY - -VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 - bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 - bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 - -VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C - map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc deleted file mode 100644 index 3ab316792..000000000 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ /dev/null @@ -1,21 +0,0 @@ -VerdanturfTown_ContestLobby_EventObjects:: @ 8386A00 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF - object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, 3, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0 - -VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 - warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN - warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN - warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL - -VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 - bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F - bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F - bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37 - bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89 - -VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 - map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc deleted file mode 100644 index c03706d90..000000000 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ /dev/null @@ -1,10 +0,0 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects:: @ 8386D88 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0 - -VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 - warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN - -VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 - map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc deleted file mode 100644 index ca7d2a4dd..000000000 --- a/data/maps/events/VerdanturfTown_House.inc +++ /dev/null @@ -1,10 +0,0 @@ -VerdanturfTown_House_EventObjects:: @ 8386DDC - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0 - -VerdanturfTown_House_MapWarps:: @ 8386E0C - warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN - warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN - -VerdanturfTown_House_MapEvents:: @ 8386E1C - map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc deleted file mode 100644 index f4ca8b8f3..000000000 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ /dev/null @@ -1,12 +0,0 @@ -VerdanturfTown_Mart_EventObjects:: @ 8386B70 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0 - -VerdanturfTown_Mart_MapWarps:: @ 8386BD0 - warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN - warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN - -VerdanturfTown_Mart_MapEvents:: @ 8386BE0 - map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc deleted file mode 100644 index 8cf8b1dab..000000000 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ /dev/null @@ -1,12 +0,0 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects:: @ 8386BF4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0 - -VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C - 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:: @ 8386C54 - map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc deleted file mode 100644 index 51fe22275..000000000 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ /dev/null @@ -1,14 +0,0 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects:: @ 8386C68 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0 - -VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 - warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F - warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM - warp_def 8, 1, 0, 0, MAP_TRADE_CENTER - warp_def 11, 1, 0, 0, MAP_RECORD_CORNER - warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM - -VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 - map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc deleted file mode 100644 index 709c5aeb6..000000000 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ /dev/null @@ -1,13 +0,0 @@ -VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE - -VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 - warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN - warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN - -VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 - map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc deleted file mode 100644 index 916e9bfc2..000000000 --- a/data/maps/events/VictoryRoad_1F.inc +++ /dev/null @@ -1,26 +0,0 @@ -VictoryRoad_1F_EventObjects:: @ 838D8E4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, 7, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD - -VictoryRoad_1F_MapWarps:: @ 838D98C - 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:: @ 838D9B4 - coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 - coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB - coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF - -VictoryRoad_1F_MapBGEvents:: @ 838D9E4 - bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 - -VictoryRoad_1F_MapEvents:: @ 838D9F0 - map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc deleted file mode 100644 index af5c86254..000000000 --- a/data/maps/events/VictoryRoad_B1F.inc +++ /dev/null @@ -1,32 +0,0 @@ -VictoryRoad_B1F_EventObjects:: @ 838DA04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2 - -VictoryRoad_B1F_MapWarps:: @ 838DBCC - 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:: @ 838DC04 - map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc deleted file mode 100644 index b482e6f04..000000000 --- a/data/maps/events/VictoryRoad_B2F.inc +++ /dev/null @@ -1,19 +0,0 @@ -VictoryRoad_B2F_EventObjects:: @ 838DC18 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1 - -VictoryRoad_B2F_MapWarps:: @ 838DC90 - 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:: @ 838DCB0 - bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_52 - bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53 - -VictoryRoad_B2F_MapEvents:: @ 838DCC8 - map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/maps/groups.inc b/data/maps/groups.inc new file mode 100644 index 000000000..478f03e86 --- /dev/null +++ b/data/maps/groups.inc @@ -0,0 +1,532 @@ + .align 2 +gMapGroup0:: @ 8307F60 + .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 + + .align 2 +gMapGroup1:: @ 8308038 + .4byte LittlerootTown_BrendansHouse_1F + .4byte LittlerootTown_BrendansHouse_2F + .4byte LittlerootTown_MaysHouse_1F + .4byte LittlerootTown_MaysHouse_2F + .4byte LittlerootTown_ProfessorBirchsLab + + .align 2 +gMapGroup2:: @ 830804C + .4byte OldaleTown_House1 + .4byte OldaleTown_House2 + .4byte OldaleTown_PokemonCenter_1F + .4byte OldaleTown_PokemonCenter_2F + .4byte OldaleTown_Mart + + .align 2 +gMapGroup3:: @ 8308060 + .4byte DewfordTown_House1 + .4byte DewfordTown_PokemonCenter_1F + .4byte DewfordTown_PokemonCenter_2F + .4byte DewfordTown_Gym + .4byte DewfordTown_Hall + .4byte DewfordTown_House2 + + .align 2 +gMapGroup4:: @ 8308078 + .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 + + .align 2 +gMapGroup5:: @ 8308094 + .4byte FallarborTown_Mart + .4byte FallarborTown_ContestLobby + .4byte FallarborTown_ContestHall + .4byte FallarborTown_PokemonCenter_1F + .4byte FallarborTown_PokemonCenter_2F + .4byte FallarborTown_House1 + .4byte FallarborTown_House2 + + .align 2 +gMapGroup6:: @ 83080B0 + .4byte VerdanturfTown_ContestLobby + .4byte VerdanturfTown_ContestHall + .4byte VerdanturfTown_Mart + .4byte VerdanturfTown_PokemonCenter_1F + .4byte VerdanturfTown_PokemonCenter_2F + .4byte VerdanturfTown_WandasHouse + .4byte VerdanturfTown_FriendshipRatersHouse + .4byte VerdanturfTown_House + + .align 2 +gMapGroup7:: @ 83080D0 + .4byte PacifidlogTown_PokemonCenter_1F + .4byte PacifidlogTown_PokemonCenter_2F + .4byte PacifidlogTown_House1 + .4byte PacifidlogTown_House2 + .4byte PacifidlogTown_House3 + .4byte PacifidlogTown_House4 + .4byte PacifidlogTown_House5 + + .align 2 +gMapGroup8:: @ 83080EC + .4byte PetalburgCity_WallysHouse + .4byte PetalburgCity_Gym + .4byte PetalburgCity_House1 + .4byte PetalburgCity_House2 + .4byte PetalburgCity_PokemonCenter_1F + .4byte PetalburgCity_PokemonCenter_2F + .4byte PetalburgCity_Mart + + .align 2 +gMapGroup9:: @ 8308108 + .4byte SlateportCity_SternsShipyard_1F + .4byte SlateportCity_SternsShipyard_2F + .4byte SlateportCity_ContestLobby + .4byte SlateportCity_ContestHall + .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 + + .align 2 +gMapGroup10:: @ 830813C + .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 + + .align 2 +gMapGroup11:: @ 830815C + .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 + + .align 2 +gMapGroup12:: @ 83081A0 + .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 + + .align 2 +gMapGroup13:: @ 83081C8 + .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_EmptyMap + .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 + + .align 2 +gMapGroup14:: @ 8308228 + .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 + + .align 2 +gMapGroup15:: @ 830825C + .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_House8 + + .align 2 +gMapGroup16:: @ 8308290 + .4byte EverGrandeCity_SidneysRoom + .4byte EverGrandeCity_PhoebesRoom + .4byte EverGrandeCity_GlaciasRoom + .4byte EverGrandeCity_DrakesRoom + .4byte EverGrandeCity_ChampionsRoom + .4byte EverGrandeCity_Corridor1 + .4byte EverGrandeCity_Corridor2 + .4byte EverGrandeCity_Corridor3 + .4byte EverGrandeCity_Corridor4 + .4byte EverGrandeCity_Corridor5 + .4byte EverGrandeCity_PokemonLeague + .4byte EverGrandeCity_HallOfFame + .4byte EverGrandeCity_PokemonCenter_1F + .4byte EverGrandeCity_PokemonCenter_2F + + .align 2 +gMapGroup17:: @ 83082C8 + .4byte Route104_MrBrineysHouse + .4byte Route104_PrettyPetalFlowerShop + + .align 2 +gMapGroup18:: @ 83082D0 + .4byte Route111_WinstrateFamilysHouse + .4byte Route111_OldLadysRestStop + + .align 2 +gMapGroup19:: @ 83082D8 + .4byte Route112_CableCarStation + .4byte MtChimney_CableCarStation + + .align 2 +gMapGroup20:: @ 83082E0 + .4byte Route114_FossilManiacsHouse + .4byte Route114_FossilManiacsTunnel + .4byte Route114_LanettesHouse + + .align 2 +gMapGroup21:: @ 83082EC + .4byte Route116_TunnelersRestHouse + + .align 2 +gMapGroup22:: @ 83082F0 + .4byte Route117_PokemonDayCare + + .align 2 +gMapGroup23:: @ 83082F4 + .4byte Route121_SafariZoneEntrance + + .align 2 +gMapGroup24:: @ 83082F8 + .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_B1F + .4byte CaveOfOrigin_B2F + .4byte CaveOfOrigin_B3F + .4byte CaveOfOrigin_B4F + .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 MagmaHideout_1F + .4byte MagmaHideout_B1F + .4byte MagmaHideout_B2F + .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 + + .align 2 +gMapGroup25:: @ 8308450 + .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 + + .align 2 +gMapGroup26:: @ 8308500 + .4byte SafariZone_Northwest + .4byte SafariZone_Northeast + .4byte SafariZone_Southwest + .4byte SafariZone_Southeast + .4byte BattleTower_Outside + .4byte BattleTower_Lobby + .4byte BattleTower_Elevator + .4byte BattleTower_Corridor + .4byte BattleTower_BattleRoom + .4byte SouthernIsland_Exterior + .4byte SouthernIsland_Interior + .4byte SafariZone_RestHouse + + .align 2 +gMapGroup27:: @ 8308530 + .4byte Route104_Prototype + .4byte Route104_PrototypePrettyPetalFlowerShop + + .align 2 +gMapGroup28:: @ 8308538 + .4byte Route109_SeashoreHouse + + .align 2 +gMapGroup29:: @ 830853C + .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_SeasideCyclingRoadSouthEntrance + .4byte Route110_SeasideCyclingRoadNorthEntrance + + .align 2 +gMapGroup30:: @ 8308570 + .4byte Route113_GlassWorkshop + + .align 2 +gMapGroup31:: @ 8308574 + .4byte Route123_BerryMastersHouse + + .align 2 +gMapGroup32:: @ 8308578 + .4byte Route119_WeatherInstitute_1F + .4byte Route119_WeatherInstitute_2F + .4byte Route119_House + + .align 2 +gMapGroup33:: @ 8308584 + .4byte Route124_DivingTreasureHuntersHouse + + .align 2 +gMapGroups:: @ 8308588 + .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 -- cgit v1.2.3